From b6073da10badcec58b85cfad72d3aa581952a1af Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 10 Mar 1999 08:35:48 +0000 Subject: [PATCH] use DATADIR from "make config" phase instead of hardcoded /usr/lib/isdn --- isdnlog/Makefile.in | 9 +- isdnlog/configure | 204 +++++++++++++++++--------------- isdnlog/configure.in | 8 +- isdnlog/isdnlog/sondernummern.c | 10 +- isdnlog/isdnlog/takt_de.c | 11 +- isdnlog/isdnlog/takt_nl.c | 10 +- 6 files changed, 135 insertions(+), 117 deletions(-) diff --git a/isdnlog/Makefile.in b/isdnlog/Makefile.in index 98e91427..b0775a03 100644 --- a/isdnlog/Makefile.in +++ b/isdnlog/Makefile.in @@ -1,4 +1,4 @@ -## $Id: Makefile.in,v 1.54 1999/03/07 18:18:21 akool Exp $ +## $Id: Makefile.in,v 1.55 1999/03/10 08:35:48 paul Exp $ ## ## ISDN accounting for isdn4linux. ## @@ -19,6 +19,9 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## ## $Log: Makefile.in,v $ +## Revision 1.55 1999/03/10 08:35:48 paul +## use DATADIR from "make config" phase instead of hardcoded /usr/lib/isdn +## ## Revision 1.54 1999/03/07 18:18:21 akool ## - new 01805 tarif of DTAG ## - new March 1999 tarife @@ -432,7 +435,7 @@ SERVICEFILE = /etc/services VERSION = 3.03 -MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 isdnlog/isdnlog.users.5 isdnrep/isdnrep.1 isdnconf/isdnconf.1 +MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 isdnlog/isdnlog.users.5 isdnrep/isdnrep.1 isdnconf/isdnconf.1 ifeq ($(POSTGRES),1) DEFS += -DPOSTGRES @@ -455,6 +458,8 @@ DEFS += \ -DVERSION=\"$(VERSION)\" \ -DI4LVERSION=\"$(I4LVERSION)\" \ -D@NATION_MACRO@=1 \ + -DDATADIR=\"$(DATADIR)\" \ + -DI4LCONFDIR=\"$(I4LCONFDIR)\" \ $(INCLUDE) %.o: %.c diff --git a/isdnlog/configure b/isdnlog/configure index 039c95ae..110b43ac 100755 --- a/isdnlog/configure +++ b/isdnlog/configure @@ -570,6 +570,7 @@ datadir=${CONFIG_DATADIR:-"/usr/lib/isdn"} bindir=${CONFIG_BINDIR:-"/usr/bin"} sbindir=${CONFIG_SBINDIR:-"/sbin"} mandir=${CONFIG_MANDIR:-"/usr/man"} +datadir=${CONFIG_DATADIR:-"/usr/lib/isdn"} I4LCONFDIR=`eval echo $I4LCONFDIR` OLDCONFDIR=`eval echo $OLDCONFDIR` @@ -595,7 +596,10 @@ datadir=`eval echo $datadir` bindir=`eval echo $bindir` sbindir=`eval echo $sbindir` mandir=`eval echo $mandir` +datadir=`eval echo $datadir` MANDATE_CALLERID=`grep CHECKIN isdnlog/callerid.conf.5.in | awk '{print $4}'` +MANDATE_ISDN_CONF=`grep CHECKIN isdnlog/isdn.conf.5.in | awk '{print $4}'` +MANDATE_ISDNFORMAT=`grep CHECKIN isdnlog/isdnformat.5.in | awk '{print $4}'` MANDATE_ISDNLOG5=`grep CHECKIN isdnlog/isdnlog.5.in | awk '{print $4}'` MANDATE_ISDNLOG8=`grep CHECKIN isdnlog/isdnlog.8.in | awk '{print $4}'` MANDATE_ISDNLOG_USERS=`grep CHECKIN isdnlog/isdnlog.users.5.in | awk '{print $4}'` @@ -682,7 +686,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:686: checking for $ac_word" >&5 +echo "configure:690: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -711,7 +715,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:715: checking for $ac_word" >&5 +echo "configure:719: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -759,7 +763,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:763: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:767: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -769,11 +773,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -793,12 +797,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:797: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:801: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:802: checking whether we are using GNU C" >&5 +echo "configure:806: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -807,7 +811,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -822,7 +826,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:826: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:830: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -879,7 +883,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:883: checking for a BSD compatible install" >&5 +echo "configure:887: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -929,7 +933,7 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:933: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:937: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -960,7 +964,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:964: checking for $ac_word" >&5 +echo "configure:968: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BZIP2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -994,7 +998,7 @@ test -n "$BZIP2" || BZIP2="/usr/bin/bzip2" echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:998: checking for dbm_open in -ldbm" >&5 +echo "configure:1002: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1002,7 +1006,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1035,7 +1039,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:1039: checking for gdbm_open in -lgdbm" >&5 +echo "configure:1043: checking for gdbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1043,7 +1047,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1076,7 +1080,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldb""... $ac_c" 1>&6 -echo "configure:1080: checking for dbm_open in -ldb" >&5 +echo "configure:1084: checking for dbm_open in -ldb" >&5 ac_lib_var=`echo db'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1084,7 +1088,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1123,7 +1127,7 @@ fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1127: checking how to run the C preprocessor" >&5 +echo "configure:1131: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1138,13 +1142,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1155,13 +1159,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1197,10 +1201,10 @@ fi if test "$tst_postgresdir" != "" || test "$CONFIG_ISDNLOG_POSTGRES" = "y" ; then echo $ac_n "checking for postgres in ${tst_postgresdir}""... $ac_c" 1>&6 -echo "configure:1201: checking for postgres in ${tst_postgresdir}" >&5 +echo "configure:1205: checking for postgres in ${tst_postgresdir}" >&5 if test "${tst_postgresdir}" != "" ; then cat > conftest.$ac_ext < EOF @@ -1215,9 +1219,9 @@ rm -f conftest* if test "$pqdir" = "no" ; then echo "$ac_t"""$pqdir"" 1>&6 echo $ac_n "checking for postgres in /lib/postgres95""... $ac_c" 1>&6 -echo "configure:1219: checking for postgres in /lib/postgres95" >&5 +echo "configure:1223: checking for postgres in /lib/postgres95" >&5 cat > conftest.$ac_ext < EOF @@ -1232,9 +1236,9 @@ rm -f conftest* if test "$pqdir" = "no" ; then echo "$ac_t"""$pqdir"" 1>&6 echo $ac_n "checking for postgres in /usr/lib/postgres95""... $ac_c" 1>&6 -echo "configure:1236: checking for postgres in /usr/lib/postgres95" >&5 +echo "configure:1240: checking for postgres in /usr/lib/postgres95" >&5 cat > conftest.$ac_ext < EOF @@ -1249,9 +1253,9 @@ rm -f conftest* if test "$pqdir" = "no" ; then echo "$ac_t"""$pqdir"" 1>&6 echo $ac_n "checking for postgres in /usr/local/postgres95""... $ac_c" 1>&6 -echo "configure:1253: checking for postgres in /usr/local/postgres95" >&5 +echo "configure:1257: checking for postgres in /usr/local/postgres95" >&5 cat > conftest.$ac_ext < EOF @@ -1266,9 +1270,9 @@ rm -f conftest* if test "$pqdir" = "no" ; then echo "$ac_t"""$pqdir"" 1>&6 echo $ac_n "checking for postgres in /usr/local/lib/postgres95""... $ac_c" 1>&6 -echo "configure:1270: checking for postgres in /usr/local/lib/postgres95" >&5 +echo "configure:1274: checking for postgres in /usr/local/lib/postgres95" >&5 cat > conftest.$ac_ext < EOF @@ -1314,10 +1318,10 @@ fi if test "$tst_mysqldir" != "" || test "$CONFIG_ISDNLOG_MYSQLDB" = "y" ; then echo $ac_n "checking for mysql in ${tst_mysqldir}""... $ac_c" 1>&6 -echo "configure:1318: checking for mysql in ${tst_mysqldir}" >&5 +echo "configure:1322: checking for mysql in ${tst_mysqldir}" >&5 if test "${tst_mysqldir}" != "" ; then cat > conftest.$ac_ext < EOF @@ -1332,9 +1336,9 @@ rm -f conftest* if test "$mydir" = "no" ; then echo "$ac_t"""$mydir"" 1>&6 echo $ac_n "checking for mysql in /lib/mysql""... $ac_c" 1>&6 -echo "configure:1336: checking for mysql in /lib/mysql" >&5 +echo "configure:1340: checking for mysql in /lib/mysql" >&5 cat > conftest.$ac_ext < EOF @@ -1349,9 +1353,9 @@ rm -f conftest* if test "$mydir" = "no" ; then echo "$ac_t"""$mydir"" 1>&6 echo $ac_n "checking for mysql in /usr/lib/mysql""... $ac_c" 1>&6 -echo "configure:1353: checking for mysql in /usr/lib/mysql" >&5 +echo "configure:1357: checking for mysql in /usr/lib/mysql" >&5 cat > conftest.$ac_ext < EOF @@ -1366,9 +1370,9 @@ rm -f conftest* if test "$mydir" = "no" ; then echo "$ac_t"""$mydir"" 1>&6 echo $ac_n "checking for mysql in /usr/local/mysql""... $ac_c" 1>&6 -echo "configure:1370: checking for mysql in /usr/local/mysql" >&5 +echo "configure:1374: checking for mysql in /usr/local/mysql" >&5 cat > conftest.$ac_ext < EOF @@ -1383,9 +1387,9 @@ rm -f conftest* if test "$mydir" = "no" ; then echo "$ac_t"""$mydir"" 1>&6 echo $ac_n "checking for mysql in /usr/local/lib/mysql""... $ac_c" 1>&6 -echo "configure:1387: checking for mysql in /usr/local/lib/mysql" >&5 +echo "configure:1391: checking for mysql in /usr/local/lib/mysql" >&5 cat > conftest.$ac_ext < EOF @@ -1434,15 +1438,15 @@ fi if test "$DOTEST" = "y" || test "$CONFIG_KERNELDIR" != "" ; then echo $ac_n "checking for linux kernel source in ${tst_kerneldir}""... $ac_c" 1>&6 -echo "configure:1438: checking for linux kernel source in ${tst_kerneldir}" >&5 +echo "configure:1442: checking for linux kernel source in ${tst_kerneldir}" >&5 CPPFLAGS="-nostdinc -I${tst_kerneldir}/include -I${tst_kerneldir}/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1458,15 +1462,15 @@ rm -f conftest* fi if test "$lxdir" = "no" ; then echo $ac_n "checking for linux kernel source in /usr/src/linux""... $ac_c" 1>&6 -echo "configure:1462: checking for linux kernel source in /usr/src/linux" >&5 +echo "configure:1466: checking for linux kernel source in /usr/src/linux" >&5 CPPFLAGS="-nostdinc -I/usr/src/linux/include -I/usr/src/linux/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1481,15 +1485,15 @@ rm -f conftest* if test "$lxdir" = "no" ; then echo "$ac_t"""$lxdir"" 1>&6 echo $ac_n "checking for linux kernel source in /usr/local/src/linux""... $ac_c" 1>&6 -echo "configure:1485: checking for linux kernel source in /usr/local/src/linux" >&5 +echo "configure:1489: checking for linux kernel source in /usr/local/src/linux" >&5 CPPFLAGS="-nostdinc -I/usr/local/src/linux/include -I/usr/local/src/linux/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1517,12 +1521,12 @@ EOF echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1521: checking for ANSI C header files" >&5 +echo "configure:1525: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1530,7 +1534,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1547,7 +1551,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1565,7 +1569,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1586,7 +1590,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1597,7 +1601,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1621,12 +1625,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1625: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1629: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1642,7 +1646,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1666,17 +1670,17 @@ for ac_hdr in fcntl.h limits.h sys/ioctl.h sys/time.h syslog.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1670: checking for $ac_hdr" >&5 +echo "configure:1674: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1762,12 +1766,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1766: checking for working const" >&5 +echo "configure:1770: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1837,12 +1841,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1841: checking for pid_t" >&5 +echo "configure:1845: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1870,12 +1874,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1874: checking for size_t" >&5 +echo "configure:1878: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1903,12 +1907,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1907: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1911: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1917,7 +1921,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1938,12 +1942,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:1942: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:1946: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1951,7 +1955,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -1975,13 +1979,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1979: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1983: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1999,7 +2003,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -2021,7 +2025,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2025: checking for 8-bit clean memcmp" >&5 +echo "configure:2029: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2029,7 +2033,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2057,12 +2061,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o" echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2061: checking return type of signal handlers" >&5 +echo "configure:2065: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2079,7 +2083,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2098,7 +2102,7 @@ EOF echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 -echo "configure:2102: checking whether utime accepts a null argument" >&5 +echo "configure:2106: checking whether utime accepts a null argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2108,7 +2112,7 @@ if test "$cross_compiling" = yes; then ac_cv_func_utime_null=no else cat > conftest.$ac_ext < #include @@ -2119,7 +2123,7 @@ exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0 && t.st_mtime - s.st_mtime < 120)); } EOF -if { (eval echo configure:2123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_utime_null=yes else @@ -2145,12 +2149,12 @@ fi for ac_func in mktime select socket stime strdup strerror strftime strstr strtod strtol do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2149: checking for $ac_func" >&5 +echo "configure:2153: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2265,6 +2269,8 @@ esac + + @@ -2369,7 +2375,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile isdnlog/callerid.conf.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 isdnlog/isdnlog.users.5 isdnrep/isdnrep.1 isdnconf/isdnconf.1 policy.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 isdnlog/isdnformat.5 isdnlog/isdnlog.8 isdnlog/isdnlog.users.5 isdnrep/isdnrep.1 isdnconf/isdnconf.1 policy.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/isdnlog/configure.in b/isdnlog/configure.in index 24a74b53..8a49a3d8 100644 --- a/isdnlog/configure.in +++ b/isdnlog/configure.in @@ -35,6 +35,7 @@ datadir=${CONFIG_DATADIR:-"/usr/lib/isdn"} bindir=${CONFIG_BINDIR:-"/usr/bin"} sbindir=${CONFIG_SBINDIR:-"/sbin"} mandir=${CONFIG_MANDIR:-"/usr/man"} +datadir=${CONFIG_DATADIR:-"/usr/lib/isdn"} I4LCONFDIR=`eval echo $I4LCONFDIR` OLDCONFDIR=`eval echo $OLDCONFDIR` @@ -60,7 +61,10 @@ datadir=`eval echo $datadir` bindir=`eval echo $bindir` sbindir=`eval echo $sbindir` mandir=`eval echo $mandir` +datadir=`eval echo $datadir` MANDATE_CALLERID=`grep CHECKIN isdnlog/callerid.conf.5.in | awk '{print $4}'` +MANDATE_ISDN_CONF=`grep CHECKIN isdnlog/isdn.conf.5.in | awk '{print $4}'` +MANDATE_ISDNFORMAT=`grep CHECKIN isdnlog/isdnformat.5.in | awk '{print $4}'` MANDATE_ISDNLOG5=`grep CHECKIN isdnlog/isdnlog.5.in | awk '{print $4}'` MANDATE_ISDNLOG8=`grep CHECKIN isdnlog/isdnlog.8.in | awk '{print $4}'` MANDATE_ISDNLOG_USERS=`grep CHECKIN isdnlog/isdnlog.users.5.in | awk '{print $4}'` @@ -220,9 +224,11 @@ AC_SUBST(NATION_MACRO) AC_SUBST(CONFIG_KERNELDIR) AC_SUBST(I4LVERSION) AC_SUBST(MANDATE_CALLERID) +AC_SUBST(MANDATE_ISDN_CONF) +AC_SUBST(MANDATE_ISDNFORMAT) AC_SUBST(MANDATE_ISDNLOG5) AC_SUBST(MANDATE_ISDNLOG8) AC_SUBST(MANDATE_ISDNLOG_USERS) AC_SUBST(MANDATE_ISDNREP) AC_SUBST(MANDATE_ISDNCONF) -AC_OUTPUT(Makefile isdnlog/callerid.conf.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 isdnlog/isdnlog.users.5 isdnrep/isdnrep.1 isdnconf/isdnconf.1) +AC_OUTPUT(Makefile isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 isdnlog/isdnformat.5 isdnlog/isdnlog.8 isdnlog/isdnlog.users.5 isdnrep/isdnrep.1 isdnconf/isdnconf.1) diff --git a/isdnlog/isdnlog/sondernummern.c b/isdnlog/isdnlog/sondernummern.c index 1ffdf68f..4023fc5c 100644 --- a/isdnlog/isdnlog/sondernummern.c +++ b/isdnlog/isdnlog/sondernummern.c @@ -1,4 +1,4 @@ -/* $Id: sondernummern.c,v 1.2 1999/03/07 18:19:02 akool Exp $ +/* $Id: sondernummern.c,v 1.3 1999/03/10 08:35:57 paul Exp $ * * Gebuehrenberechnung fuer Sonderrufnummern * @@ -19,6 +19,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * $Log: sondernummern.c,v $ + * Revision 1.3 1999/03/10 08:35:57 paul + * use DATADIR from "make config" phase instead of hardcoded /usr/lib/isdn + * * Revision 1.2 1999/03/07 18:19:02 akool * - new 01805 tarif of DTAG * - new March 1999 tarife @@ -95,12 +98,9 @@ #include "isdnlog.h" #endif -#ifndef DATADIR -#define DATADIR "/usr/lib/isdn" -#endif - #ifdef STANDALONE +#undef DATADIR /* already defined via -DDATADIR=... */ #define DATADIR ".." #define SO_FAIL -3 diff --git a/isdnlog/isdnlog/takt_de.c b/isdnlog/isdnlog/takt_de.c index 6e5361ce..cb3c52f5 100644 --- a/isdnlog/isdnlog/takt_de.c +++ b/isdnlog/isdnlog/takt_de.c @@ -1,4 +1,4 @@ -/* $Id: takt_de.c,v 1.10 1999/03/07 18:19:40 akool Exp $ +/* $Id: takt_de.c,v 1.11 1999/03/10 08:35:59 paul Exp $ * * ISDN accounting for isdn4linux. (log-module) * @@ -19,6 +19,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * $Log: takt_de.c,v $ + * Revision 1.11 1999/03/10 08:35:59 paul + * use DATADIR from "make config" phase instead of hardcoded /usr/lib/isdn + * * Revision 1.10 1999/03/07 18:19:40 akool * - new 01805 tarif of DTAG * - new March 1999 tarife @@ -113,11 +116,7 @@ #include "isdnlog.h" #endif -#define SPARBUCH "/etc/isdn/sparbuch" - -#ifndef DATADIR -#define DATADIR "/usr/lib/isdn" -#endif +#define SPARBUCH I4LCONFDIR "/sparbuch" #define TEST 181 /* Sekunden Verbindung kostet? */ diff --git a/isdnlog/isdnlog/takt_nl.c b/isdnlog/isdnlog/takt_nl.c index 32e2337b..b6082c32 100644 --- a/isdnlog/isdnlog/takt_nl.c +++ b/isdnlog/isdnlog/takt_nl.c @@ -1,4 +1,4 @@ -/* $Id: takt_nl.c,v 1.6 1999/01/24 19:02:09 akool Exp $ +/* $Id: takt_nl.c,v 1.7 1999/03/10 08:36:03 paul Exp $ * * ISDN accounting for isdn4linux. (log-module) * @@ -240,8 +240,8 @@ static int tarifzeit(struct tm *tm, char *why) */ static int zeit[24] = { 4, 4, 5, 5, 5, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4 }; -static char *zeiten[6] = { "vrijetijd", "ochtend", "middag", "vrijetijd", "avond", "nacht" }; -static char *zonen[4] = { "CityCall", "RegioCall", "GermanCall", "GlobalCall" }; +static char *zeiten[] = { "vrijetijd", "ochtend", "middag", "vrijetijd", "avond", "nacht" }; +static char *zonen[] = { "lokaal-0", "lokaal", "interlokaal", "internationaal" }; static float gebuehr[2][6][4][3] = @@ -356,7 +356,7 @@ float taktlaenge(int chan, char *description) if (call[chan].sondernummer[CALLED] != -1) { switch (SN[call[chan].sondernummer[CALLED]].tarif) { - case 0 : if (description) sprintf(description, "FreeCall"); /* Free of charge */ + case 0 : if (why) sprintf(why, "FreeCall"); /* Free of charge */ return(60 * 60 * 24); /* one day should be enough ;-) */ case 1 : zone = 1; /* CityCall */ @@ -371,7 +371,7 @@ float taktlaenge(int chan, char *description) else takt = SN[call[chan].sondernummer[CALLED]].takt2; - if (description) strcpy(description, SN[call[chan].sondernummer[CALLED]].sinfo); + if (why) strcpy(why, SN[call[chan].sondernummer[CALLED]].sinfo); return(takt); break;