From e3a1cf85c087daa2268e80ccb4627e4eaa9528cd Mon Sep 17 00:00:00 2001 From: keil Date: Tue, 13 Oct 1998 22:35:05 +0000 Subject: [PATCH] Fixed autoconfig for 2.0.36 version is 2.3 now --- Makefile | 4 +- act2000/aclocal.m4 | 42 +--- act2000/configure | 6 +- avmb1/aclocal.m4 | 42 +--- avmb1/configure | 6 +- capi20/aclocal.m4 | 42 +--- capi20/configure | 6 +- diehl/aclocal.m4 | 42 +--- diehl/configure | 6 +- etc/ackernel.m4 | 42 ++++ icn/aclocal.m4 | 42 +--- icn/configure | 111 +++++----- imon/aclocal.m4 | 42 +--- imon/configure | 6 +- ipppd/aclocal.m4 | 42 +--- ipppd/configure | 466 +++++++++++++++++++++++++++--------------- ipppstats/aclocal.m4 | 42 +--- ipppstats/configure | 6 +- iprofd/aclocal.m4 | 42 +--- iprofd/configure | 87 ++++---- isdnctrl/aclocal.m4 | 42 +--- isdnctrl/configure | 129 ++++++------ isdnlog/aclocal.m4 | 41 +--- isdnlog/configure | 223 ++++++++++---------- isdnlog/configure.in | 1 + loop/aclocal.m4 | 43 +--- loop/configure | 58 +++--- pcbit/Makefile.in | 4 +- pcbit/aclocal.m4 | 42 +--- pcbit/configure | 112 +++++----- pcbit/configure.in | 11 +- pcbit/pcbitctl.man.in | 24 +++ rcapid/aclocal.m4 | 42 +--- rcapid/configure | 411 ++++++++++++++++++++++++++----------- teles/aclocal.m4 | 42 +--- teles/configure | 6 +- 36 files changed, 1085 insertions(+), 1270 deletions(-) create mode 100644 etc/ackernel.m4 create mode 100644 pcbit/pcbitctl.man.in diff --git a/Makefile b/Makefile index 5a6c9a66..03ff6043 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ -# $Id: Makefile,v 1.25 1998/10/13 12:54:44 paul Exp $ +# $Id: Makefile,v 1.26 1998/10/13 22:35:05 keil Exp $ # # Toplevel Makefile for isdn4k-utils # .EXPORT_ALL_VARIABLES: -export I4LVERSION = 2.2b1 +export I4LVERSION = 2.3 all: do-it-all diff --git a/act2000/aclocal.m4 b/act2000/aclocal.m4 index eeca1b77..83a78be9 100644 --- a/act2000/aclocal.m4 +++ b/act2000/aclocal.m4 @@ -1,41 +1 @@ -dnl -dnl Try finding linux sourcetree -dnl - -AC_DEFUN(AC_FIND_KERNEL, [ - OLD_CPPFLAGS="$CPPFLAGS" - lxdir="no" - eval tst_kerneldir=$CONFIG_KERNELDIR - - AC_ARG_WITH(kernel, - [ --with-kernel=DIR Set kernel source directory [/usr/src/linux]], - DOTEST="y"; tst_kerneldir="${withval}") - - if test "$DOTEST" = "y" || test "$CONFIG_KERNELDIR" != "" ; then - AC_MSG_CHECKING([for linux kernel source in ${tst_kerneldir}]) - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=${tst_kerneldir}, - AC_MSG_RESULT("no")) - fi - if test "$lxdir" = "no" ; then - AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/src/linux) - fi - if test "$lxdir" = "no" ; then - AC_MSG_RESULT("$lxdir") - AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) - fi - if test "$lxdir" != "no" ; then - AC_MSG_RESULT("yes") - else - lxdir="" - AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") - fi - CONFIG_KERNELDIR="$lxdir" - CPPFLAGS="$OLD_CPPFLAGS" - AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir") - AC_SUBST(CONFIG_KERNELDIR) -]) +sinclude(../etc/ackernel.m4)dnl diff --git a/act2000/configure b/act2000/configure index edb6ac89..d04f7dd8 100755 --- a/act2000/configure +++ b/act2000/configure @@ -1009,7 +1009,7 @@ 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:1012: checking for linux kernel source in ${tst_kerneldir}" >&5 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" + CPPFLAGS="-nostdinc -I${tst_kerneldir}/include -I${tst_kerneldir}/drivers/isdn" cat > conftest.$ac_ext <&6 echo "configure:1036: checking for linux kernel source in /usr/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" + CPPFLAGS="-nostdinc -I/usr/src/linux/include -I/usr/src/linux/drivers/isdn" cat > conftest.$ac_ext <&6 echo $ac_n "checking for linux kernel source in /usr/local/src/linux""... $ac_c" 1>&6 echo "configure:1059: checking for linux kernel source in /usr/local/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" + CPPFLAGS="-nostdinc -I/usr/local/src/linux/include -I/usr/local/src/linux/drivers/isdn" cat > conftest.$ac_ext <], lxdir=${tst_kerneldir}, - AC_MSG_RESULT("no")) - fi - if test "$lxdir" = "no" ; then - AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/src/linux) - fi - if test "$lxdir" = "no" ; then - AC_MSG_RESULT("$lxdir") - AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) - fi - if test "$lxdir" != "no" ; then - AC_MSG_RESULT("yes") - else - lxdir="" - AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") - fi - CONFIG_KERNELDIR="$lxdir" - CPPFLAGS="$OLD_CPPFLAGS" - AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir") - AC_SUBST(CONFIG_KERNELDIR) -]) +sinclude(../etc/ackernel.m4)dnl diff --git a/avmb1/configure b/avmb1/configure index 9e97401a..eb5cf32a 100755 --- a/avmb1/configure +++ b/avmb1/configure @@ -1008,7 +1008,7 @@ 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:1011: checking for linux kernel source in ${tst_kerneldir}" >&5 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" + CPPFLAGS="-nostdinc -I${tst_kerneldir}/include -I${tst_kerneldir}/drivers/isdn" cat > conftest.$ac_ext <&6 echo "configure:1035: checking for linux kernel source in /usr/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" + CPPFLAGS="-nostdinc -I/usr/src/linux/include -I/usr/src/linux/drivers/isdn" cat > conftest.$ac_ext <&6 echo $ac_n "checking for linux kernel source in /usr/local/src/linux""... $ac_c" 1>&6 echo "configure:1058: checking for linux kernel source in /usr/local/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" + CPPFLAGS="-nostdinc -I/usr/local/src/linux/include -I/usr/local/src/linux/drivers/isdn" cat > conftest.$ac_ext <], lxdir=${tst_kerneldir}, - AC_MSG_RESULT("no")) - fi - if test "$lxdir" = "no" ; then - AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/src/linux) - fi - if test "$lxdir" = "no" ; then - AC_MSG_RESULT("$lxdir") - AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) - fi - if test "$lxdir" != "no" ; then - AC_MSG_RESULT("yes") - else - lxdir="" - AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") - fi - CONFIG_KERNELDIR="$lxdir" - CPPFLAGS="$OLD_CPPFLAGS" - AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir") - AC_SUBST(CONFIG_KERNELDIR) -]) +sinclude(../etc/ackernel.m4)dnl diff --git a/capi20/configure b/capi20/configure index a0eaab09..6ad5172e 100755 --- a/capi20/configure +++ b/capi20/configure @@ -1001,7 +1001,7 @@ 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:1004: checking for linux kernel source in ${tst_kerneldir}" >&5 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" + CPPFLAGS="-nostdinc -I${tst_kerneldir}/include -I${tst_kerneldir}/drivers/isdn" cat > conftest.$ac_ext <&6 echo "configure:1028: checking for linux kernel source in /usr/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" + CPPFLAGS="-nostdinc -I/usr/src/linux/include -I/usr/src/linux/drivers/isdn" cat > conftest.$ac_ext <&6 echo $ac_n "checking for linux kernel source in /usr/local/src/linux""... $ac_c" 1>&6 echo "configure:1051: checking for linux kernel source in /usr/local/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" + CPPFLAGS="-nostdinc -I/usr/local/src/linux/include -I/usr/local/src/linux/drivers/isdn" cat > conftest.$ac_ext <], lxdir=${tst_kerneldir}, - AC_MSG_RESULT("no")) - fi - if test "$lxdir" = "no" ; then - AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/src/linux) - fi - if test "$lxdir" = "no" ; then - AC_MSG_RESULT("$lxdir") - AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) - fi - if test "$lxdir" != "no" ; then - AC_MSG_RESULT("yes") - else - lxdir="" - AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") - fi - CONFIG_KERNELDIR="$lxdir" - CPPFLAGS="$OLD_CPPFLAGS" - AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir") - AC_SUBST(CONFIG_KERNELDIR) -]) +sinclude(../etc/ackernel.m4)dnl diff --git a/diehl/configure b/diehl/configure index 6454a039..133f764e 100755 --- a/diehl/configure +++ b/diehl/configure @@ -1011,7 +1011,7 @@ 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:1014: checking for linux kernel source in ${tst_kerneldir}" >&5 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" + CPPFLAGS="-nostdinc -I${tst_kerneldir}/include -I${tst_kerneldir}/drivers/isdn" cat > conftest.$ac_ext <&6 echo "configure:1038: checking for linux kernel source in /usr/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" + CPPFLAGS="-nostdinc -I/usr/src/linux/include -I/usr/src/linux/drivers/isdn" cat > conftest.$ac_ext <&6 echo $ac_n "checking for linux kernel source in /usr/local/src/linux""... $ac_c" 1>&6 echo "configure:1061: checking for linux kernel source in /usr/local/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" + CPPFLAGS="-nostdinc -I/usr/local/src/linux/include -I/usr/local/src/linux/drivers/isdn" cat > conftest.$ac_ext <], lxdir=${tst_kerneldir}, + AC_MSG_RESULT("no")) + fi + if test "$lxdir" = "no" ; then + AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) + CPPFLAGS="-nostdinc -I/usr/src/linux/include -I/usr/src/linux/drivers/isdn" + AC_TRY_CPP([#include ], lxdir=/usr/src/linux) + fi + if test "$lxdir" = "no" ; then + AC_MSG_RESULT("$lxdir") + AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) + CPPFLAGS="-nostdinc -I/usr/local/src/linux/include -I/usr/local/src/linux/drivers/isdn" + AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) + fi + if test "$lxdir" != "no" ; then + AC_MSG_RESULT("yes") + else + lxdir="" + AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") + fi + CONFIG_KERNELDIR="$lxdir" + CPPFLAGS="$OLD_CPPFLAGS" + AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir") + AC_SUBST(CONFIG_KERNELDIR) +]) + diff --git a/icn/aclocal.m4 b/icn/aclocal.m4 index eeca1b77..83a78be9 100644 --- a/icn/aclocal.m4 +++ b/icn/aclocal.m4 @@ -1,41 +1 @@ -dnl -dnl Try finding linux sourcetree -dnl - -AC_DEFUN(AC_FIND_KERNEL, [ - OLD_CPPFLAGS="$CPPFLAGS" - lxdir="no" - eval tst_kerneldir=$CONFIG_KERNELDIR - - AC_ARG_WITH(kernel, - [ --with-kernel=DIR Set kernel source directory [/usr/src/linux]], - DOTEST="y"; tst_kerneldir="${withval}") - - if test "$DOTEST" = "y" || test "$CONFIG_KERNELDIR" != "" ; then - AC_MSG_CHECKING([for linux kernel source in ${tst_kerneldir}]) - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=${tst_kerneldir}, - AC_MSG_RESULT("no")) - fi - if test "$lxdir" = "no" ; then - AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/src/linux) - fi - if test "$lxdir" = "no" ; then - AC_MSG_RESULT("$lxdir") - AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) - fi - if test "$lxdir" != "no" ; then - AC_MSG_RESULT("yes") - else - lxdir="" - AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") - fi - CONFIG_KERNELDIR="$lxdir" - CPPFLAGS="$OLD_CPPFLAGS" - AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir") - AC_SUBST(CONFIG_KERNELDIR) -]) +sinclude(../etc/ackernel.m4)dnl diff --git a/icn/configure b/icn/configure index c39efbbe..1fd62b72 100755 --- a/icn/configure +++ b/icn/configure @@ -536,6 +536,7 @@ CONFIG_DATADIR=${CONFIG_DATADIR:-"/usr/lib/isdn"} CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"} CONFIG_ICNCTRL_DEBUG=${CONFIG_ICNCTRL_DEBUG:-"n"} +CONFIG_KERNELDIR=`eval echo ${CONFIG_KERNELDIR:-"/usr/src/linux"}` MANDATE=`grep CHECKIN icnctrl.man.in | awk '{print $4}'` ac_aux_dir= @@ -568,7 +569,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:572: checking for a BSD compatible install" >&5 +echo "configure:573: 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 @@ -620,7 +621,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # 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:624: checking for $ac_word" >&5 +echo "configure:625: 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 @@ -649,7 +650,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:653: checking for $ac_word" >&5 +echo "configure:654: 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 @@ -697,7 +698,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:701: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:702: 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. @@ -707,11 +708,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:716: \"$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 @@ -731,12 +732,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:735: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:736: 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:740: checking whether we are using GNU C" >&5 +echo "configure:741: 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 @@ -745,7 +746,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:749: \"$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:750: \"$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 @@ -760,7 +761,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:764: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:765: 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 @@ -790,7 +791,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:794: checking how to run the C preprocessor" >&5 +echo "configure:795: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -805,13 +806,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:815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -822,13 +823,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:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -851,12 +852,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:855: checking for ANSI C header files" >&5 +echo "configure:856: 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 @@ -864,7 +865,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -881,7 +882,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 @@ -899,7 +900,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 @@ -920,7 +921,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -931,7 +932,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -958,17 +959,17 @@ for ac_hdr in fcntl.h sys/ioctl.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:962: checking for $ac_hdr" >&5 +echo "configure:963: 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:972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1009,15 +1010,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:1013: checking for linux kernel source in ${tst_kerneldir}" >&5 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" +echo "configure:1014: 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:1021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1033,15 +1034,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:1037: checking for linux kernel source in /usr/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" +echo "configure:1038: 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:1045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1056,15 +1057,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:1060: checking for linux kernel source in /usr/local/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" +echo "configure:1061: 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:1068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1094,17 +1095,17 @@ for ac_hdr in $CONFIG_KERNELDIR/include/linux/isdn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1098: checking for $ac_hdr" >&5 +echo "configure:1099: 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:1108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1136,17 +1137,17 @@ for ac_hdr in $CONFIG_KERNELDIR/drivers/isdn/icn/icn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1140: checking for $ac_hdr" >&5 +echo "configure:1141: 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:1150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1178,13 +1179,13 @@ done if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1182: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1183: 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 @@ -1202,7 +1203,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1227,17 +1228,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1231: checking for $ac_hdr" >&5 +echo "configure:1232: 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:1241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1266,12 +1267,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1270: checking for $ac_func" >&5 +echo "configure:1271: 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:1299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1319,7 +1320,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:1323: checking for working mmap" >&5 +echo "configure:1324: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1327,7 +1328,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else diff --git a/imon/aclocal.m4 b/imon/aclocal.m4 index eeca1b77..83a78be9 100644 --- a/imon/aclocal.m4 +++ b/imon/aclocal.m4 @@ -1,41 +1 @@ -dnl -dnl Try finding linux sourcetree -dnl - -AC_DEFUN(AC_FIND_KERNEL, [ - OLD_CPPFLAGS="$CPPFLAGS" - lxdir="no" - eval tst_kerneldir=$CONFIG_KERNELDIR - - AC_ARG_WITH(kernel, - [ --with-kernel=DIR Set kernel source directory [/usr/src/linux]], - DOTEST="y"; tst_kerneldir="${withval}") - - if test "$DOTEST" = "y" || test "$CONFIG_KERNELDIR" != "" ; then - AC_MSG_CHECKING([for linux kernel source in ${tst_kerneldir}]) - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=${tst_kerneldir}, - AC_MSG_RESULT("no")) - fi - if test "$lxdir" = "no" ; then - AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/src/linux) - fi - if test "$lxdir" = "no" ; then - AC_MSG_RESULT("$lxdir") - AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) - fi - if test "$lxdir" != "no" ; then - AC_MSG_RESULT("yes") - else - lxdir="" - AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") - fi - CONFIG_KERNELDIR="$lxdir" - CPPFLAGS="$OLD_CPPFLAGS" - AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir") - AC_SUBST(CONFIG_KERNELDIR) -]) +sinclude(../etc/ackernel.m4)dnl diff --git a/imon/configure b/imon/configure index 98925162..c373a997 100755 --- a/imon/configure +++ b/imon/configure @@ -1262,7 +1262,7 @@ 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:1265: checking for linux kernel source in ${tst_kerneldir}" >&5 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" + CPPFLAGS="-nostdinc -I${tst_kerneldir}/include -I${tst_kerneldir}/drivers/isdn" cat > conftest.$ac_ext <&6 echo "configure:1289: checking for linux kernel source in /usr/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" + CPPFLAGS="-nostdinc -I/usr/src/linux/include -I/usr/src/linux/drivers/isdn" cat > conftest.$ac_ext <&6 echo $ac_n "checking for linux kernel source in /usr/local/src/linux""... $ac_c" 1>&6 echo "configure:1312: checking for linux kernel source in /usr/local/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" + CPPFLAGS="-nostdinc -I/usr/local/src/linux/include -I/usr/local/src/linux/drivers/isdn" cat > conftest.$ac_ext <], lxdir=${tst_kerneldir}, - AC_MSG_RESULT("no")) - fi - if test "$lxdir" = "no" ; then - AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/src/linux) - fi - if test "$lxdir" = "no" ; then - AC_MSG_RESULT("$lxdir") - AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) - fi - if test "$lxdir" != "no" ; then - AC_MSG_RESULT("yes") - else - lxdir="" - AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") - fi - CONFIG_KERNELDIR="$lxdir" - CPPFLAGS="$OLD_CPPFLAGS" - AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir") - AC_SUBST(CONFIG_KERNELDIR) -]) +sinclude(../etc/ackernel.m4)dnl diff --git a/ipppd/configure b/ipppd/configure index 757b3856..abaf1f6b 100755 --- a/ipppd/configure +++ b/ipppd/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.10 +# Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -69,6 +69,8 @@ mandir='${prefix}/man' # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= +# Maximum number of lines to put in a shell here document. +ac_max_here_lines=12 ac_prev= for ac_option @@ -350,7 +352,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.10" + echo "configure generated by autoconf version 2.12" exit 0 ;; -with-* | --with-*) @@ -452,11 +454,14 @@ do done # NLS nuisances. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -rf conftest* confdefs.h @@ -518,6 +523,7 @@ ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. @@ -573,11 +579,12 @@ 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:583: 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 else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in @@ -600,7 +607,7 @@ else ;; esac done - IFS="$ac_save_ifs" + IFS="$ac_save_IFS" fi if test "${ac_cv_path_install+set}" = set; then @@ -624,6 +631,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # 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:635: 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 @@ -652,6 +660,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:664: 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 @@ -698,7 +707,47 @@ fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:712: 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. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +cat > conftest.$ac_ext <&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 + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +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:746: 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:751: 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 @@ -707,7 +756,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:711: \"$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:760: \"$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 @@ -715,29 +764,34 @@ fi fi echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + if test $ac_cv_prog_gcc = yes; then GCC=yes - if test "${CFLAGS+set}" != set; then - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then + ac_test_CFLAGS="${CFLAGS+set}" + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:775: 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 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_gcc_g=yes + ac_cv_prog_cc_g=yes else - ac_cv_prog_gcc_g=no + ac_cv_prog_cc_g=no fi rm -f conftest* fi -echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 - if test $ac_cv_prog_gcc_g = yes; then - CFLAGS="-g -O" - else - CFLAGS="-O" - fi +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 + if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" + elif test $ac_cv_prog_cc_g = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-O2" fi else GCC= @@ -746,6 +800,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:804: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -760,33 +815,37 @@ 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:770: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 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:785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* CPP=/lib/cpp fi @@ -813,22 +872,25 @@ if test "${with_kernel+set}" = set; then fi - if test "$DOTEST" = "y" || test $CONFIG_KERNELDIR != "" ; then + if test "$DOTEST" = "y" || test "$CONFIG_KERNELDIR" != "" ; then echo $ac_n "checking for linux kernel source in ${tst_kerneldir}""... $ac_c" 1>&6 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" +echo "configure:878: 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:826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* lxdir=${tst_kerneldir} else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t"""no"" 1>&6 fi @@ -836,40 +898,46 @@ 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 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" +echo "configure:902: 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:847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* lxdir=/usr/src/linux else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi rm -f conftest* fi 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 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" +echo "configure:925: 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:867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* lxdir=/usr/local/src/linux else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi rm -f conftest* fi @@ -888,30 +956,32 @@ EOF -echo $ac_n "checking for -lbsd""... $ac_c" 1>&6 -ac_lib_var=`echo bsd'_'daemon | tr './+\055' '__p_'` +echo $ac_n "checking for daemon in -lbsd""... $ac_c" 1>&6 +echo "configure:961: checking for daemon in -lbsd" >&5 +ac_lib_var=`echo bsd'_'daemon | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:980: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=no" fi @@ -930,26 +1000,28 @@ else echo "configure: warning: Could not find libbsd" 1>&2 fi -echo $ac_n "checking for -lcrypt""... $ac_c" 1>&6 -ac_lib_var=`echo crypt'_'main | tr './+\055' '__p_'` +echo $ac_n "checking for main in -lcrypt""... $ac_c" 1>&6 +echo "configure:1005: checking for main in -lcrypt" >&5 +ac_lib_var=`echo crypt'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1020: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=no" fi @@ -967,30 +1039,32 @@ else echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for -ldes""... $ac_c" 1>&6 -ac_lib_var=`echo des'_'des_ecb_encrypt | tr './+\055' '__p_'` +echo $ac_n "checking for des_ecb_encrypt in -ldes""... $ac_c" 1>&6 +echo "configure:1044: checking for des_ecb_encrypt in -ldes" >&5 +ac_lib_var=`echo des'_'des_ecb_encrypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldes $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1063: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=no" fi @@ -1009,38 +1083,13 @@ else fi -# If we cannot run a trivial program, we must be cross compiling. -echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_c_cross=yes -else -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then - ac_cv_c_cross=no -else - ac_cv_c_cross=yes -fi -fi -rm -fr conftest* -fi - -echo "$ac_t""$ac_cv_c_cross" 1>&6 -cross_compiling=$ac_cv_c_cross - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +echo "configure:1088: 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 @@ -1048,13 +1097,15 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_header_stdc=no fi @@ -1063,7 +1114,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 @@ -1081,7 +1132,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 @@ -1101,8 +1152,8 @@ if test $ac_cv_header_stdc = yes; then if test "$cross_compiling" = yes; then : else -cat > conftest.$ac_ext < conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1113,14 +1164,18 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -{ (eval echo configure:1117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if { (eval echo configure:1168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then : else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* ac_cv_header_stdc=no fi -fi rm -fr conftest* +fi + fi fi @@ -1133,11 +1188,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 +echo "configure:1192: 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 @@ -1147,22 +1203,22 @@ else #ifndef WIFEXITED #define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif -int main() { return 0; } -int t() { +int main() { int s; wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_header_sys_wait_h=no fi rm -f conftest* - fi echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6 @@ -1175,24 +1231,27 @@ fi for ac_hdr in fcntl.h limits.h paths.h sys/file.h sys/ioctl.h sys/time.h syslog.h unistd.h do -ac_safe=`echo "$ac_hdr" | tr './\055' '___'` +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:1237: 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:1190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_header_$ac_safe=no" fi @@ -1200,7 +1259,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` cat >> confdefs.h <&6 +echo "configure:1275: checking for shadow.h" >&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:1225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_header_$ac_safe=no" fi @@ -1245,15 +1307,15 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 +echo "configure:1311: 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:1365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_c_const=no fi rm -f conftest* - fi echo "$ac_t""$ac_cv_c_const" 1>&6 @@ -1319,19 +1382,21 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +echo "configure:1386: 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 #include +#include #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "pid_t" >/dev/null 2>&1; then + egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_pid_t=yes else @@ -1350,29 +1415,30 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +echo "configure:1419: 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 #include -int main() { return 0; } -int t() { +int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_header_time=no fi rm -f conftest* - fi echo "$ac_t""$ac_cv_header_time" 1>&6 @@ -1384,11 +1450,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 +echo "configure:1454: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -1418,14 +1485,15 @@ fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 +echo "configure:1489: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then ac_cv_type_getgroups=cross else -cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if { (eval echo configure:1522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then ac_cv_type_getgroups=gid_t else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* ac_cv_type_getgroups=int fi -fi rm -fr conftest* +fi + if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -1485,12 +1557,13 @@ EOF if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 +echo "configure:1561: 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 @@ -1508,7 +1581,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1530,14 +1603,15 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_func_memcmp'+set}'`\" = set"; then +echo "configure:1607: 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 if test "$cross_compiling" = yes; then - ac_cv_func_memcmp=no + ac_cv_func_memcmp_clean=no else -cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then - ac_cv_func_memcmp=yes +if { (eval echo configure:1625: \"$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 - ac_cv_func_memcmp=no -fi + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_func_memcmp_clean=no fi rm -fr conftest* fi -echo "$ac_t""$ac_cv_func_memcmp" 1>&6 -test $ac_cv_func_memcmp = no && LIBOBJS="$LIBOBJS memcmp.o" +fi + +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 for vprintf""... $ac_c" 1>&6 +echo "configure:1643: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func_vprintf=no" fi rm -f conftest* - fi + if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -1611,11 +1691,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 +echo "configure:1695: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func__doprnt=no" fi rm -f conftest* - fi + if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -1664,11 +1746,12 @@ fi for ac_func in gethostname gettimeofday select socket strdup strerror strtol strtoul uname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1750: 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; }; then +if { (eval echo configure:1778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func_$ac_func=no" fi rm -f conftest* - fi + if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` @@ -1844,11 +1928,25 @@ cat > confcache <<\EOF # --recheck option to rerun configure. # EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \ - >> confcache + case `(ac_space=' '; set) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache if cmp -s $cache_file confcache; then : else @@ -1903,7 +2001,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.10" + echo "$CONFIG_STATUS generated by autoconf version 2.12" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1966,20 +2064,56 @@ s%@CONFIG_IPPPD_DEBUGFLAGS@%$CONFIG_IPPPD_DEBUGFLAGS%g CEOF EOF + +cat >> $CONFIG_STATUS <<\EOF + +# Split the substitutions into bite-sized pieces for seds with +# small command number limits, like on Digital OSF/1 and HP-UX. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # Line after last line for current file. +ac_more_lines=: +ac_sed_cmds="" +while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" + else + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + fi + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` + fi +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi +EOF + cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile]", defaulting infile="outfile.in". + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; *) ac_file_in="${ac_file}.in" ;; esac - # Adjust relative srcdir, etc. for subdirectories. + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. # Remove last slash and all that follows it. Not all systems have dirname. ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` @@ -2007,6 +2141,7 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then [/$]*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac + echo creating "$ac_file" rm -f "$ac_file" configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." @@ -2015,14 +2150,16 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then # $configure_input" ;; *) ac_comsub= ;; esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g s%@top_srcdir@%$top_srcdir%g s%@INSTALL@%$INSTALL%g -" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file fi; done -rm -f conftest.subs +rm -f conftest.s* # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where # NAME is the cpp macro being defined and VALUE is the value it is being given. @@ -2043,11 +2180,17 @@ ac_eB='$%\1#\2define\3' ac_eC=' ' ac_eD='%g' -CONFIG_HEADERS=${CONFIG_HEADERS-"config.h"} +if test "${CONFIG_HEADERS+set}" != set; then +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +fi for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then - # Support "outfile[:infile]", defaulting infile="outfile.in". + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; *) ac_file_in="${ac_file}.in" ;; esac @@ -2055,7 +2198,8 @@ for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then echo creating $ac_file rm -f conftest.frag conftest.in conftest.out - cp $ac_given_srcdir/$ac_file_in conftest.in + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + cat $ac_file_inputs > conftest.in EOF @@ -2083,8 +2227,6 @@ EOF # Break up conftest.vals because some shells have a limit on # the size of here documents, and old seds have small limits too. -# Maximum number of lines to put in a single here document. -ac_max_here_lines=12 rm -f conftest.tail while : @@ -2126,7 +2268,11 @@ cat >> $CONFIG_STATUS <<\EOF fi fi; done +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF exit 0 EOF diff --git a/ipppstats/aclocal.m4 b/ipppstats/aclocal.m4 index eeca1b77..83a78be9 100644 --- a/ipppstats/aclocal.m4 +++ b/ipppstats/aclocal.m4 @@ -1,41 +1 @@ -dnl -dnl Try finding linux sourcetree -dnl - -AC_DEFUN(AC_FIND_KERNEL, [ - OLD_CPPFLAGS="$CPPFLAGS" - lxdir="no" - eval tst_kerneldir=$CONFIG_KERNELDIR - - AC_ARG_WITH(kernel, - [ --with-kernel=DIR Set kernel source directory [/usr/src/linux]], - DOTEST="y"; tst_kerneldir="${withval}") - - if test "$DOTEST" = "y" || test "$CONFIG_KERNELDIR" != "" ; then - AC_MSG_CHECKING([for linux kernel source in ${tst_kerneldir}]) - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=${tst_kerneldir}, - AC_MSG_RESULT("no")) - fi - if test "$lxdir" = "no" ; then - AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/src/linux) - fi - if test "$lxdir" = "no" ; then - AC_MSG_RESULT("$lxdir") - AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) - fi - if test "$lxdir" != "no" ; then - AC_MSG_RESULT("yes") - else - lxdir="" - AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") - fi - CONFIG_KERNELDIR="$lxdir" - CPPFLAGS="$OLD_CPPFLAGS" - AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir") - AC_SUBST(CONFIG_KERNELDIR) -]) +sinclude(../etc/ackernel.m4)dnl diff --git a/ipppstats/configure b/ipppstats/configure index d5c041f2..e762d81d 100755 --- a/ipppstats/configure +++ b/ipppstats/configure @@ -899,7 +899,7 @@ 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:902: checking for linux kernel source in ${tst_kerneldir}" >&5 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" + CPPFLAGS="-nostdinc -I${tst_kerneldir}/include -I${tst_kerneldir}/drivers/isdn" cat > conftest.$ac_ext <&6 echo "configure:926: checking for linux kernel source in /usr/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" + CPPFLAGS="-nostdinc -I/usr/src/linux/include -I/usr/src/linux/drivers/isdn" cat > conftest.$ac_ext <&6 echo $ac_n "checking for linux kernel source in /usr/local/src/linux""... $ac_c" 1>&6 echo "configure:949: checking for linux kernel source in /usr/local/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" + CPPFLAGS="-nostdinc -I/usr/local/src/linux/include -I/usr/local/src/linux/drivers/isdn" cat > conftest.$ac_ext <], lxdir=${tst_kerneldir}, - AC_MSG_RESULT("no")) - fi - if test "$lxdir" = "no" ; then - AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/src/linux) - fi - if test "$lxdir" = "no" ; then - AC_MSG_RESULT("$lxdir") - AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) - fi - if test "$lxdir" != "no" ; then - AC_MSG_RESULT("yes") - else - lxdir="" - AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") - fi - CONFIG_KERNELDIR="$lxdir" - CPPFLAGS="$OLD_CPPFLAGS" - AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir") - AC_SUBST(CONFIG_KERNELDIR) -]) +sinclude(../etc/ackernel.m4)dnl diff --git a/iprofd/configure b/iprofd/configure index e55d2202..bfefbdc4 100755 --- a/iprofd/configure +++ b/iprofd/configure @@ -530,6 +530,7 @@ fi I4LVERSION=${I4LVERSION:-"?.?"} CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"} +CONFIG_KERNELDIR=`eval echo ${CONFIG_KERNELDIR:-"/usr/src/linux"}` MANDATE=`grep CHECKIN iprofd.man.in | awk '{print $4}'` ac_aux_dir= @@ -562,7 +563,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:566: checking for a BSD compatible install" >&5 +echo "configure:567: 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 @@ -614,7 +615,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # 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:618: checking for $ac_word" >&5 +echo "configure:619: 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 @@ -643,7 +644,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:647: checking for $ac_word" >&5 +echo "configure:648: 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 @@ -691,7 +692,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:695: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:696: 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. @@ -701,11 +702,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:710: \"$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 @@ -725,12 +726,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:729: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:730: 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:734: checking whether we are using GNU C" >&5 +echo "configure:735: 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 @@ -739,7 +740,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:743: \"$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:744: \"$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 @@ -754,7 +755,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:758: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:759: 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 @@ -784,7 +785,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:788: checking how to run the C preprocessor" >&5 +echo "configure:789: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -799,13 +800,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:809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -816,13 +817,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:826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -845,12 +846,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:849: checking for ANSI C header files" >&5 +echo "configure:850: 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 @@ -858,7 +859,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -875,7 +876,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 @@ -893,7 +894,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 @@ -914,7 +915,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -925,7 +926,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -952,17 +953,17 @@ for ac_hdr in sys/ioctl.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:956: checking for $ac_hdr" >&5 +echo "configure:957: 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:966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1003,15 +1004,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:1007: checking for linux kernel source in ${tst_kerneldir}" >&5 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" +echo "configure:1008: 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:1015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1027,15 +1028,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:1031: checking for linux kernel source in /usr/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" +echo "configure:1032: 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:1039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1050,15 +1051,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:1054: checking for linux kernel source in /usr/local/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" +echo "configure:1055: 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:1062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1088,17 +1089,17 @@ for ac_hdr in $CONFIG_KERNELDIR/include/linux/isdn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1092: checking for $ac_hdr" >&5 +echo "configure:1093: 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:1102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1129,12 +1130,12 @@ done echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1133: checking return type of signal handlers" >&5 +echo "configure:1134: 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 @@ -1151,7 +1152,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else diff --git a/isdnctrl/aclocal.m4 b/isdnctrl/aclocal.m4 index f0c56e97..1e5b73c6 100644 --- a/isdnctrl/aclocal.m4 +++ b/isdnctrl/aclocal.m4 @@ -1,44 +1,4 @@ -dnl -dnl Try finding linux sourcetree -dnl - -AC_DEFUN(AC_FIND_KERNEL, [ - OLD_CPPFLAGS="$CPPFLAGS" - lxdir="no" - eval tst_kerneldir=$CONFIG_KERNELDIR - - AC_ARG_WITH(kernel, - [ --with-kernel=DIR Set kernel source directory [/usr/src/linux]], - DOTEST="y"; tst_kerneldir="${withval}") - - if test "$DOTEST" = "y" || test "$CONFIG_KERNELDIR" != "" ; then - AC_MSG_CHECKING([for linux kernel source in ${tst_kerneldir}]) - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=${tst_kerneldir}, - AC_MSG_RESULT("no")) - fi - if test "$lxdir" = "no" ; then - AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/src/linux) - fi - if test "$lxdir" = "no" ; then - AC_MSG_RESULT("$lxdir") - AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) - fi - if test "$lxdir" != "no" ; then - AC_MSG_RESULT("yes") - else - lxdir="" - AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") - fi - CONFIG_KERNELDIR="$lxdir" - CPPFLAGS="$OLD_CPPFLAGS" - AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir") - AC_SUBST(CONFIG_KERNELDIR) -]) +sinclude(../etc/ackernel.m4)dnl dnl dnl Check for definition of triggercps diff --git a/isdnctrl/configure b/isdnctrl/configure index ac947d78..9d33fbc9 100755 --- a/isdnctrl/configure +++ b/isdnctrl/configure @@ -539,7 +539,6 @@ CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"} CONFIG_ISDNCTRL_CONF=${CONFIG_ISDNCTRL_CONF:-"n"} CONFIG_ISDNCTRL_TIMRU=${CONFIG_ISDNCTRL_TIMRU:-"n"} -CONFIG_ISDN_WITH_ABC=${CONFIG_ISDN_WITH_ABC:-"n"} MANDATE=`grep CHECKIN isdnctrl.man.in | awk '{print $4}'` ac_aux_dir= @@ -572,7 +571,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:576: checking for a BSD compatible install" >&5 +echo "configure:575: 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 @@ -624,7 +623,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # 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:628: checking for $ac_word" >&5 +echo "configure:627: 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 @@ -653,7 +652,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:657: checking for $ac_word" >&5 +echo "configure:656: 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 @@ -701,7 +700,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:705: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:704: 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. @@ -711,11 +710,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:718: \"$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 @@ -735,12 +734,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:739: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:738: 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:744: checking whether we are using GNU C" >&5 +echo "configure:743: 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 @@ -749,7 +748,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:753: \"$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:752: \"$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 @@ -764,7 +763,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:768: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:767: 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 @@ -794,7 +793,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:798: checking how to run the C preprocessor" >&5 +echo "configure:797: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -809,13 +808,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:819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -826,13 +825,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:836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:835: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -855,12 +854,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:859: checking for ANSI C header files" >&5 +echo "configure:858: 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 @@ -868,7 +867,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -885,7 +884,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 @@ -903,7 +902,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 @@ -924,7 +923,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -935,7 +934,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -962,17 +961,17 @@ for ac_hdr in sys/ioctl.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:966: checking for $ac_hdr" >&5 +echo "configure:965: 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:976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1013,15 +1012,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:1017: checking for linux kernel source in ${tst_kerneldir}" >&5 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" +echo "configure:1016: 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:1025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1037,15 +1036,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:1041: checking for linux kernel source in /usr/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" +echo "configure:1040: 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:1049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1060,15 +1059,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:1064: checking for linux kernel source in /usr/local/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" +echo "configure:1063: 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:1072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1098,17 +1097,17 @@ for ac_hdr in $CONFIG_KERNELDIR/include/linux/isdn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1102: checking for $ac_hdr" >&5 +echo "configure:1101: 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:1112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1140,17 +1139,17 @@ for ac_hdr in $CONFIG_KERNELDIR/include/linux/isdnif.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1144: checking for $ac_hdr" >&5 +echo "configure:1143: 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:1154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1183,16 +1182,16 @@ done CPPFLAGS="-nostdinc -I${CONFIG_KERNELDIR}/include" have_triggercps="no" echo $ac_n "checking for triggercps in ${CONFIG_KERNELDIR}/include/linux/isdn.h""... $ac_c" 1>&6 -echo "configure:1187: checking for triggercps in ${CONFIG_KERNELDIR}/include/linux/isdn.h" >&5 +echo "configure:1186: checking for triggercps in ${CONFIG_KERNELDIR}/include/linux/isdn.h" >&5 cat > conftest.$ac_ext < int main() { isdn_net_ioctl_cfg x; int i = x.triggercps; ; return 0; } EOF -if { (eval echo configure:1196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_triggercps="yes" else @@ -1215,16 +1214,16 @@ EOF CPPFLAGS="-nostdinc -I${CONFIG_KERNELDIR}/include" have_ciscokeepalive="no" echo $ac_n "checking for Cisco-Keepalive in ${CONFIG_KERNELDIR}/include/linux/isdn.h""... $ac_c" 1>&6 -echo "configure:1219: checking for Cisco-Keepalive in ${CONFIG_KERNELDIR}/include/linux/isdn.h" >&5 +echo "configure:1218: checking for Cisco-Keepalive in ${CONFIG_KERNELDIR}/include/linux/isdn.h" >&5 cat > conftest.$ac_ext < int main() { int x = ISDN_NET_ENCAP_CISCOHDLCK; ; return 0; } EOF -if { (eval echo configure:1228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_ciscokeepalive="yes" else @@ -1247,16 +1246,16 @@ EOF CPPFLAGS="-nostdinc -I${CONFIG_KERNELDIR}/include" have_timru="no" echo $ac_n "checking for TIMRU in ${CONFIG_KERNELDIR}/include/linux/isdn.h""... $ac_c" 1>&6 -echo "configure:1251: checking for TIMRU in ${CONFIG_KERNELDIR}/include/linux/isdn.h" >&5 +echo "configure:1250: checking for TIMRU in ${CONFIG_KERNELDIR}/include/linux/isdn.h" >&5 cat > conftest.$ac_ext < int main() { int x = IIOCNETARU; ; return 0; } EOF -if { (eval echo configure:1260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_timru="yes" else @@ -1277,7 +1276,7 @@ EOF echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:1281: checking for dbm_open in -ldbm" >&5 +echo "configure:1280: 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 @@ -1285,7 +1284,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:1299: \"$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 @@ -1318,7 +1317,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:1322: checking for gdbm_open in -lgdbm" >&5 +echo "configure:1321: 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 @@ -1326,7 +1325,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:1340: \"$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 @@ -1359,7 +1358,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldb""... $ac_c" 1>&6 -echo "configure:1363: checking for dbm_open in -ldb" >&5 +echo "configure:1362: 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 @@ -1367,7 +1366,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:1381: \"$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 @@ -1406,12 +1405,12 @@ fi fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1410: checking return type of signal handlers" >&5 +echo "configure:1409: 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 @@ -1428,7 +1427,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else diff --git a/isdnlog/aclocal.m4 b/isdnlog/aclocal.m4 index bba0adc3..ad8adfa8 100644 --- a/isdnlog/aclocal.m4 +++ b/isdnlog/aclocal.m4 @@ -112,44 +112,5 @@ AC_DEFUN(AC_CHECK_MYSQLDB, [ AC_SUBST(MYSQLDB) AC_SUBST(MYSQLDIR) ]) -dnl -dnl Try finding linux sourcetree -dnl -AC_DEFUN(AC_FIND_KERNEL, [ - OLD_CPPFLAGS="$CPPFLAGS" - lxdir="no" - eval tst_kerneldir=$CONFIG_KERNELDIR - - AC_ARG_WITH(kernel, - [ --with-kernel=DIR Set kernel source directory [/usr/src/linux]], - DOTEST="y"; tst_kerneldir="${withval}") - - if test "$DOTEST" = "y" || test "$CONFIG_KERNELDIR" != "" ; then - AC_MSG_CHECKING([for linux kernel source in ${tst_kerneldir}]) - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=${tst_kerneldir}, - AC_MSG_RESULT("no")) - fi - if test "$lxdir" = "no" ; then - AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/src/linux) - fi - if test "$lxdir" = "no" ; then - AC_MSG_RESULT("$lxdir") - AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) - fi - if test "$lxdir" != "no" ; then - AC_MSG_RESULT("yes") - else - lxdir="" - AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") - fi - CONFIG_KERNELDIR="$lxdir" - CPPFLAGS="$OLD_CPPFLAGS" - AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir") - AC_SUBST(CONFIG_KERNELDIR) -]) +sinclude(../etc/ackernel.m4)dnl diff --git a/isdnlog/configure b/isdnlog/configure index f61dcfec..2b9553a0 100755 --- a/isdnlog/configure +++ b/isdnlog/configure @@ -640,7 +640,7 @@ if test "$CONFIG_ISDN_LOG_DE" = "y" ; then EOF fi -if test "$CONFIG_ISDN_LOG_AT" = "y" ; then +if test "$CONFIG_ISDNLOG_AT" = "y" ; then NATION="at" cat >> confdefs.h <<\EOF #define ISDN_AT 1 @@ -665,7 +665,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:653: checking for $ac_word" >&5 +echo "configure:669: 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 @@ -694,7 +694,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:682: checking for $ac_word" >&5 +echo "configure:698: 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 @@ -742,7 +742,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:730: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:746: 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. @@ -752,11 +752,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:760: \"$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 @@ -776,12 +776,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:764: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:780: 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:769: checking whether we are using GNU C" >&5 +echo "configure:785: 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 @@ -790,7 +790,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:778: \"$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:794: \"$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 @@ -805,7 +805,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:793: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:809: 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 @@ -862,7 +862,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:850: checking for a BSD compatible install" >&5 +echo "configure:866: 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 @@ -912,7 +912,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:900: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:916: 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 @@ -940,7 +940,7 @@ fi echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:928: checking for dbm_open in -ldbm" >&5 +echo "configure:944: 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 @@ -948,7 +948,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:963: \"$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 @@ -981,7 +981,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:969: checking for gdbm_open in -lgdbm" >&5 +echo "configure:985: 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 @@ -989,7 +989,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:1004: \"$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 @@ -1022,7 +1022,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldb""... $ac_c" 1>&6 -echo "configure:1010: checking for dbm_open in -ldb" >&5 +echo "configure:1026: 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 @@ -1030,7 +1030,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:1045: \"$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 @@ -1069,7 +1069,7 @@ fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1057: checking how to run the C preprocessor" >&5 +echo "configure:1073: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1084,13 +1084,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:1078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1101,13 +1101,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:1095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1143,10 +1143,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:1131: checking for postgres in ${tst_postgresdir}" >&5 +echo "configure:1147: checking for postgres in ${tst_postgresdir}" >&5 if test "${tst_postgresdir}" != "" ; then cat > conftest.$ac_ext < EOF @@ -1161,9 +1161,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:1149: checking for postgres in /lib/postgres95" >&5 +echo "configure:1165: checking for postgres in /lib/postgres95" >&5 cat > conftest.$ac_ext < EOF @@ -1178,9 +1178,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:1166: checking for postgres in /usr/lib/postgres95" >&5 +echo "configure:1182: checking for postgres in /usr/lib/postgres95" >&5 cat > conftest.$ac_ext < EOF @@ -1195,9 +1195,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:1183: checking for postgres in /usr/local/postgres95" >&5 +echo "configure:1199: checking for postgres in /usr/local/postgres95" >&5 cat > conftest.$ac_ext < EOF @@ -1212,9 +1212,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:1200: checking for postgres in /usr/local/lib/postgres95" >&5 +echo "configure:1216: checking for postgres in /usr/local/lib/postgres95" >&5 cat > conftest.$ac_ext < EOF @@ -1260,10 +1260,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:1248: checking for mysql in ${tst_mysqldir}" >&5 +echo "configure:1264: checking for mysql in ${tst_mysqldir}" >&5 if test "${tst_mysqldir}" != "" ; then cat > conftest.$ac_ext < EOF @@ -1278,9 +1278,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:1266: checking for mysql in /lib/mysql" >&5 +echo "configure:1282: checking for mysql in /lib/mysql" >&5 cat > conftest.$ac_ext < EOF @@ -1295,9 +1295,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:1283: checking for mysql in /usr/lib/mysql" >&5 +echo "configure:1299: checking for mysql in /usr/lib/mysql" >&5 cat > conftest.$ac_ext < EOF @@ -1312,9 +1312,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:1300: checking for mysql in /usr/local/mysql" >&5 +echo "configure:1316: checking for mysql in /usr/local/mysql" >&5 cat > conftest.$ac_ext < EOF @@ -1329,9 +1329,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:1317: checking for mysql in /usr/local/lib/mysql" >&5 +echo "configure:1333: checking for mysql in /usr/local/lib/mysql" >&5 cat > conftest.$ac_ext < EOF @@ -1380,15 +1380,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:1368: checking for linux kernel source in ${tst_kerneldir}" >&5 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" +echo "configure:1384: 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:1376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1404,15 +1404,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:1392: checking for linux kernel source in /usr/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" +echo "configure:1408: 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:1400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1427,15 +1427,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:1415: checking for linux kernel source in /usr/local/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" +echo "configure:1431: 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:1423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1463,12 +1463,12 @@ EOF echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1451: checking for ANSI C header files" >&5 +echo "configure:1467: 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 @@ -1476,7 +1476,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1493,7 +1493,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 @@ -1511,7 +1511,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 @@ -1532,7 +1532,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1543,7 +1543,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1567,12 +1567,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1555: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1571: 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 @@ -1588,7 +1588,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1612,17 +1612,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:1600: checking for $ac_hdr" >&5 +echo "configure:1616: 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:1610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1699,12 +1699,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1687: checking for working const" >&5 +echo "configure:1703: 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:1757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1774,12 +1774,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1762: checking for pid_t" >&5 +echo "configure:1778: 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 @@ -1807,12 +1807,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1795: checking for size_t" >&5 +echo "configure:1811: 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 @@ -1840,12 +1840,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1828: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1844: 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 @@ -1854,7 +1854,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1875,12 +1875,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:1863: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:1879: 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 @@ -1888,7 +1888,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -1923,15 +1923,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:1911: checking for linux kernel source in ${tst_kerneldir}" >&5 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" +echo "configure:1927: 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:1919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1947,15 +1947,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:1935: checking for linux kernel source in /usr/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" +echo "configure:1951: 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:1943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1970,15 +1970,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:1958: checking for linux kernel source in /usr/local/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" +echo "configure:1974: 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:1966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2007,13 +2007,13 @@ EOF if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1995: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:2011: 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 @@ -2031,7 +2031,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -2053,7 +2053,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:2041: checking for 8-bit clean memcmp" >&5 +echo "configure:2057: 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 @@ -2061,7 +2061,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:2075: \"$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 @@ -2089,12 +2089,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:2077: checking return type of signal handlers" >&5 +echo "configure:2093: 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 @@ -2111,7 +2111,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2130,7 +2130,7 @@ EOF echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 -echo "configure:2118: checking whether utime accepts a null argument" >&5 +echo "configure:2134: 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 @@ -2140,7 +2140,7 @@ if test "$cross_compiling" = yes; then ac_cv_func_utime_null=no else cat > conftest.$ac_ext < #include @@ -2151,7 +2151,7 @@ exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0 && t.st_mtime - s.st_mtime < 120)); } EOF -if { (eval echo configure:2139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2155: \"$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 @@ -2177,12 +2177,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:2165: checking for $ac_func" >&5 +echo "configure:2181: 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:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2273,6 +2273,7 @@ esac + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure diff --git a/isdnlog/configure.in b/isdnlog/configure.in index 27f46f25..fe756528 100644 --- a/isdnlog/configure.in +++ b/isdnlog/configure.in @@ -185,5 +185,6 @@ AC_SUBST(COUNTRYPREFIX) AC_SUBST(AREACODE) AC_SUBST(AREAPREFIX) AC_SUBST(AREACODE) +AC_SUBST(NATION) AC_SUBST(CONFIG_KERNELDIR) AC_OUTPUT(Makefile) diff --git a/loop/aclocal.m4 b/loop/aclocal.m4 index 2239204b..83a78be9 100644 --- a/loop/aclocal.m4 +++ b/loop/aclocal.m4 @@ -1,42 +1 @@ -dnl -dnl Try finding linux sourcetree -dnl - -AC_DEFUN(AC_FIND_KERNEL, [ - KERNELDIR="" - OLD_CPPFLAGS="$CPPFLAGS" - lxdir="no" - eval tst_kerneldir=$CONFIG_KERNELDIR - - AC_ARG_WITH(kernel, - [ --with-kernel=DIR Set kernel source directory [/usr/src/linux]], - DOTEST="y"; tst_kerneldir="${withval}") - - if test "$DOTEST" = "y" || test $CONFIG_KERNELDIR != "" ; then - AC_MSG_CHECKING([for linux kernel source in ${tst_kerneldir}]) - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=${tst_kerneldir}, - AC_MSG_RESULT("no")) - fi - if test "$lxdir" = "no" ; then - AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/src/linux) - fi - if test "$lxdir" = "no" ; then - AC_MSG_RESULT("$lxdir") - AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) - fi - if test "$lxdir" != "no" ; then - AC_MSG_RESULT("yes") - else - lxdir="" - AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") - fi - KERNELDIR="$lxdir" - CPPFLAGS="$OLD_CPPFLAGS" - AC_DEFINE_UNQUOTED(KERNELDIR,"$lxdir") - AC_SUBST(KERNELDIR) -]) +sinclude(../etc/ackernel.m4)dnl diff --git a/loop/configure b/loop/configure index 5ab0af8a..d5b21bb2 100755 --- a/loop/configure +++ b/loop/configure @@ -1027,7 +1027,6 @@ fi done - KERNELDIR="" OLD_CPPFLAGS="$CPPFLAGS" lxdir="no" eval tst_kerneldir=$CONFIG_KERNELDIR @@ -1039,17 +1038,17 @@ if test "${with_kernel+set}" = set; then fi - if test "$DOTEST" = "y" || test $CONFIG_KERNELDIR != "" ; then + 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:1045: checking for linux kernel source in ${tst_kerneldir}" >&5 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" +echo "configure:1044: 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:1053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1065,15 +1064,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:1069: checking for linux kernel source in /usr/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" +echo "configure:1068: 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:1077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1088,15 +1087,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:1092: checking for linux kernel source in /usr/local/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" +echo "configure:1091: 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:1100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1114,10 +1113,10 @@ rm -f conftest* lxdir="" { echo "configure: error: "Kernel source not found. You MUST specify a correct path to the linux source in the configuration."" 1>&2; exit 1; } fi - KERNELDIR="$lxdir" + CONFIG_KERNELDIR="$lxdir" CPPFLAGS="$OLD_CPPFLAGS" cat >> confdefs.h <&6 -echo "configure:1130: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1129: 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 @@ -1150,7 +1149,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1175,17 +1174,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1179: checking for $ac_hdr" >&5 +echo "configure:1178: 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:1189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1214,12 +1213,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1218: checking for $ac_func" >&5 +echo "configure:1217: 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:1245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1267,7 +1266,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:1271: checking for working mmap" >&5 +echo "configure:1270: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1275,7 +1274,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -1602,13 +1601,12 @@ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@CC@%$CC%g s%@CPP@%$CPP%g -s%@KERNELDIR@%$KERNELDIR%g +s%@CONFIG_KERNELDIR@%$CONFIG_KERNELDIR%g s%@INSTALL@%$INSTALL%g s%@DEBUGVAR@%$DEBUGVAR%g s%@MANDATE@%$MANDATE%g s%@I4LCONFDIR@%$I4LCONFDIR%g s%@I4LVERSION@%$I4LVERSION%g -s%@CONFIG_KERNELDIR@%$CONFIG_KERNELDIR%g s%@CONFIG_SBINDIR@%$CONFIG_SBINDIR%g s%@CONFIG_MANDIR@%$CONFIG_MANDIR%g diff --git a/pcbit/Makefile.in b/pcbit/Makefile.in index f6d278ae..49534eb8 100644 --- a/pcbit/Makefile.in +++ b/pcbit/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.8 1998/09/26 18:30:48 akool Exp $ +# $Id: Makefile.in,v 1.9 1998/10/13 22:36:53 keil Exp $ # # Makefile for pcbitctl # (C) 1997 Fritz Elfert @@ -54,7 +54,7 @@ uninstall: rm -f $(DESTDIR)$(SBINDIR)/$(PROGRAM) $(DESTDIR)$(MAN8DIR)/$(MANPAGE) clean: - rm -f *.o *~ $(PROGRAM) + rm -f *.o *~ $(PROGRAM) *.man distclean: clean rm -f config.status config.cache config.log Makefile diff --git a/pcbit/aclocal.m4 b/pcbit/aclocal.m4 index eeca1b77..83a78be9 100644 --- a/pcbit/aclocal.m4 +++ b/pcbit/aclocal.m4 @@ -1,41 +1 @@ -dnl -dnl Try finding linux sourcetree -dnl - -AC_DEFUN(AC_FIND_KERNEL, [ - OLD_CPPFLAGS="$CPPFLAGS" - lxdir="no" - eval tst_kerneldir=$CONFIG_KERNELDIR - - AC_ARG_WITH(kernel, - [ --with-kernel=DIR Set kernel source directory [/usr/src/linux]], - DOTEST="y"; tst_kerneldir="${withval}") - - if test "$DOTEST" = "y" || test "$CONFIG_KERNELDIR" != "" ; then - AC_MSG_CHECKING([for linux kernel source in ${tst_kerneldir}]) - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=${tst_kerneldir}, - AC_MSG_RESULT("no")) - fi - if test "$lxdir" = "no" ; then - AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/src/linux) - fi - if test "$lxdir" = "no" ; then - AC_MSG_RESULT("$lxdir") - AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) - fi - if test "$lxdir" != "no" ; then - AC_MSG_RESULT("yes") - else - lxdir="" - AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") - fi - CONFIG_KERNELDIR="$lxdir" - CPPFLAGS="$OLD_CPPFLAGS" - AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir") - AC_SUBST(CONFIG_KERNELDIR) -]) +sinclude(../etc/ackernel.m4)dnl diff --git a/pcbit/configure b/pcbit/configure index 6357ed8b..d5a97e78 100755 --- a/pcbit/configure +++ b/pcbit/configure @@ -16,6 +16,8 @@ ac_help="$ac_help --with-kernel=DIR Set kernel source directory [/usr/src/linux]" ac_help="$ac_help --with-sbin=DIR Set dir where binary is istalled. [/sbin]" +ac_help="$ac_help + --with-man=DIR Set manpage dir. [/usr/man]" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -532,7 +534,7 @@ MANDATE=`grep CHECKIN icnctrl.man.in | awk '{print $4}'` # 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:536: checking for $ac_word" >&5 +echo "configure:538: 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 @@ -561,7 +563,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:565: checking for $ac_word" >&5 +echo "configure:567: 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 @@ -609,7 +611,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:613: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:615: 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. @@ -619,11 +621,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:629: \"$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 @@ -643,12 +645,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:647: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:649: 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:652: checking whether we are using GNU C" >&5 +echo "configure:654: 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 @@ -657,7 +659,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:661: \"$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:663: \"$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 @@ -672,7 +674,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:676: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:678: 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 @@ -729,7 +731,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:733: checking for a BSD compatible install" >&5 +echo "configure:735: 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 @@ -781,7 +783,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:785: checking how to run the C preprocessor" >&5 +echo "configure:787: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -796,13 +798,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:806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -813,13 +815,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:823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -842,12 +844,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:846: checking for ANSI C header files" >&5 +echo "configure:848: 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 @@ -855,7 +857,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -872,7 +874,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 @@ -890,7 +892,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 @@ -911,7 +913,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -922,7 +924,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -949,17 +951,17 @@ for ac_hdr in fcntl.h sys/ioctl.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:953: checking for $ac_hdr" >&5 +echo "configure:955: 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:963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1000,15 +1002,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:1004: checking for linux kernel source in ${tst_kerneldir}" >&5 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" +echo "configure:1006: 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:1012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1024,15 +1026,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:1028: checking for linux kernel source in /usr/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" +echo "configure:1030: 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:1036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1047,15 +1049,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:1051: checking for linux kernel source in /usr/local/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" +echo "configure:1053: 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:1059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1061: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1085,17 +1087,17 @@ for ac_hdr in $CONFIG_KERNELDIR/include/linux/isdn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1089: checking for $ac_hdr" >&5 +echo "configure:1091: 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:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1127,13 +1129,13 @@ done if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1131: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1133: 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 @@ -1151,7 +1153,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1175,12 +1177,12 @@ fi for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1179: checking for $ac_func" >&5 +echo "configure:1181: 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:1209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1239,6 +1241,19 @@ EOF fi +# Check whether --with-man or --without-man was given. +if test "${with_man+set}" = set; then + withval="$with_man" + CONFIG_MANDIR="${withval}" + cat >> confdefs.h <<\EOF +#define CONFIG_MANDIR "${withval}" +EOF + +fi + + + + @@ -1356,7 +1371,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile pcbitctl.man" | 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/pcbit/configure.in b/pcbit/configure.in index 641df9bf..4adb1a0e 100644 --- a/pcbit/configure.in +++ b/pcbit/configure.in @@ -35,8 +35,17 @@ AC_ARG_WITH(sbin, AC_DEFINE(CONFIG_SBINDIR,"${withval}"), ) +dnl Optional man directory +AC_ARG_WITH(man, + [ --with-man=DIR Set manpage dir. [/usr/man]], + CONFIG_MANDIR="${withval}" + AC_DEFINE(CONFIG_MANDIR,"${withval}"), +) + AC_SUBST(INSTALL) AC_SUBST(CONFIG_MANDIR) AC_SUBST(CONFIG_KERNELDIR) AC_SUBST(CONFIG_SBINDIR) -AC_OUTPUT(Makefile) +AC_SUBST(MANDATE) +AC_SUBST(CONFIG_MANDIR) +AC_OUTPUT(Makefile pcbitctl.man) diff --git a/pcbit/pcbitctl.man.in b/pcbit/pcbitctl.man.in new file mode 100644 index 00000000..163e8b40 --- /dev/null +++ b/pcbit/pcbitctl.man.in @@ -0,0 +1,24 @@ +.\" $Id: pcbitctl.man.in,v 1.1 1998/10/13 22:36:58 keil Exp $ +.\" +.\" CHECKIN $Date: 1998/10/13 22:36:58 $ +.\" +.\" Process this file with +.\" groff -man -Tascii pcbitctl.8 for ASCII output, or +.\" groff -man -Tps pcbitctl.8 for PostScript output +.\" +.TH PCBITCTL 8 "@MANDATE@" isdn4k-utils-@I4LVERSION@ "Linux System Administration" +.SH NAME +pcbitctl \- PCBIT-D firmware loader +.SH SYNOPSIS +.BI "pcbitctl load [-f] " +.br +.SH DESCRIPTION +.I pcbitctl +is a programm to load PCBIT-D firmware +.LP +.SH AUTHOR +Pedro Roque Marques (roque@di.fc.ul.pt) +.LP +.SH SEE ALSO +.I isdnctrl\c +\&(8). diff --git a/rcapid/aclocal.m4 b/rcapid/aclocal.m4 index b801d962..83a78be9 100644 --- a/rcapid/aclocal.m4 +++ b/rcapid/aclocal.m4 @@ -1,41 +1 @@ -dnl -dnl Try finding linux sourcetree -dnl - -AC_DEFUN(AC_FIND_KERNEL, [ - OLD_CPPFLAGS="$CPPFLAGS" - lxdir="no" - eval tst_kerneldir=$CONFIG_KERNELDIR - - AC_ARG_WITH(kernel, - [ --with-kernel=DIR Set kernel source directory [/usr/src/linux]], - DOTEST="y"; tst_kerneldir="${withval}") - - if test "$DOTEST" = "y" || test $CONFIG_KERNELDIR != "" ; then - AC_MSG_CHECKING([for linux kernel source in ${tst_kerneldir}]) - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=${tst_kerneldir}, - AC_MSG_RESULT("no")) - fi - if test "$lxdir" = "no" ; then - AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/src/linux) - fi - if test "$lxdir" = "no" ; then - AC_MSG_RESULT("$lxdir") - AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) - fi - if test "$lxdir" != "no" ; then - AC_MSG_RESULT("yes") - else - lxdir="" - AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") - fi - CONFIG_KERNELDIR="$lxdir" - CPPFLAGS="$OLD_CPPFLAGS" - AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir") - AC_SUBST(CONFIG_KERNELDIR) -]) +sinclude(../etc/ackernel.m4)dnl diff --git a/rcapid/configure b/rcapid/configure index e9f99a82..455a0934 100755 --- a/rcapid/configure +++ b/rcapid/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.4.2 -# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. +# Generated automatically using autoconf version 2.12 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -15,7 +15,7 @@ ac_default_prefix=/usr ac_help="$ac_help --with-kernel=DIR Set kernel source directory [/usr/src/linux]" ac_help="$ac_help - --with-sbin=DIR Set dir where binary is istalled. [/sbin]" + --with-sbin=DIR Set dir where binary is installed. [/sbin]" ac_help="$ac_help --with-man=DIR Set manpage dir. [/usr/man]" ac_help="$ac_help @@ -57,6 +57,9 @@ mandir='${prefix}/man' # Initialize some other variables. subdirs= +MFLAGS= MAKEFLAGS= +# Maximum number of lines to put in a shell here document. +ac_max_here_lines=12 ac_prev= for ac_option @@ -156,9 +159,11 @@ Directory and file names: --bindir=DIR user executables in DIR [EPREFIX/bin] --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR [PREFIX/share] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR [PREFIX/com] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] --libdir=DIR object code libraries in DIR [EPREFIX/lib] --includedir=DIR C header files in DIR [PREFIX/include] @@ -168,7 +173,8 @@ Directory and file names: --srcdir=DIR find the sources in DIR [configure dir or ..] --program-prefix=PREFIX prepend PREFIX to installed program names --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names EOF cat << EOF Host type: @@ -182,8 +188,10 @@ Features and packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR ---enable and --with options recognized:$ac_help EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi exit 0 ;; -host | --host | --hos | --ho) @@ -333,7 +341,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.4.2" + echo "configure generated by autoconf version 2.12" exit 0 ;; -with-* | --with-*) @@ -379,7 +387,7 @@ EOF -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ;; - *) + *) if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then echo "configure: warning: $ac_option: invalid host type" 1>&2 fi @@ -435,11 +443,14 @@ do done # NLS nuisances. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -rf conftest* confdefs.h @@ -498,12 +509,10 @@ fi ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='echo $CPP $CPPFLAGS 1>&5; -$CPP $CPPFLAGS' -ac_compile='echo ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5; -${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='echo ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5; -${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. @@ -529,6 +538,7 @@ CONFIG_C20LIBDIR=`eval echo ${CONFIG_C20LIBDIR:-"/usr/src/capi-adk/c20lib"}` # 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:542: 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 @@ -536,7 +546,7 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in cc; do + for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" @@ -544,7 +554,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc" fi fi CC="$ac_cv_prog_CC" @@ -554,8 +563,98 @@ else echo "$ac_t""no" 1>&6 fi +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:571: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + ac_prog_rejected=no + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi + +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:619: 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. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +cat > conftest.$ac_ext <&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 + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +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:653: 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:658: 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 @@ -564,7 +663,7 @@ else yes; #endif EOF -if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:667: \"$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 @@ -572,29 +671,34 @@ fi fi echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + if test $ac_cv_prog_gcc = yes; then GCC=yes - if test "${CFLAGS+set}" != set; then - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then + ac_test_CFLAGS="${CFLAGS+set}" + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:682: 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 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_gcc_g=yes + ac_cv_prog_cc_g=yes else - ac_cv_prog_gcc_g=no + ac_cv_prog_cc_g=no fi rm -f conftest* fi -echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 - if test $ac_cv_prog_gcc_g = yes; then - CFLAGS="-g -O" - else - CFLAGS="-O" - fi +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 + if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" + elif test $ac_cv_prog_cc_g = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-O2" fi else GCC= @@ -602,6 +706,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:710: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -616,31 +721,37 @@ 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 -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* CPP=/lib/cpp fi @@ -685,11 +796,12 @@ 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:800: 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 else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in @@ -712,7 +824,7 @@ else ;; esac done - IFS="$ac_save_ifs" + IFS="$ac_save_IFS" fi if test "${ac_cv_path_install+set}" = set; then @@ -737,23 +849,27 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' for ac_hdr in fcntl.h sys/ioctl.h do -ac_safe=`echo "$ac_hdr" | tr './\055' '___'` +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:855: 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 -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_header_$ac_safe=no" fi @@ -761,7 +877,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdedfghijklmnopqrstuvwxyz./\055' 'ABCDEDFGHIJKLMNOPQRSTUVWXYZ___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` cat >> confdefs.h <&6 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" +echo "configure:906: 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 -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* lxdir=${tst_kerneldir} else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t"""no"" 1>&6 fi @@ -806,38 +926,46 @@ 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 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" +echo "configure:930: 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 -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* lxdir=/usr/src/linux else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi rm -f conftest* fi 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 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" +echo "configure:953: 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 -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* lxdir=/usr/local/src/linux else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi rm -f conftest* fi @@ -859,12 +987,13 @@ EOF if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 +echo "configure:991: 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 @@ -882,7 +1011,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -903,51 +1032,29 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi fi -# If we cannot run a trivial program, we must be cross compiling. -echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_c_cross=yes -else -cat > conftest.$ac_ext </dev/null; then - ac_cv_c_cross=no -else - ac_cv_c_cross=yes -fi -fi -rm -fr conftest* -fi - -echo "$ac_t""$ac_cv_c_cross" 1>&6 -cross_compiling=$ac_cv_c_cross - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +echo "configure:1037: 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 #include #include EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_header_stdc=no fi @@ -956,7 +1063,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 @@ -974,7 +1081,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 @@ -992,10 +1099,10 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. if test "$cross_compiling" = yes; then - ac_cv_header_stdc=no + : else -cat > conftest.$ac_ext < conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1006,14 +1113,18 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -eval $ac_link -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if { (eval echo configure:1117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then : else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* ac_cv_header_stdc=no fi -fi rm -fr conftest* +fi + fi fi @@ -1026,11 +1137,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 +echo "configure:1141: 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 @@ -1038,23 +1150,25 @@ else #undef signal #endif #ifdef __cplusplus -extern "C" -#endif +extern "C" void (*signal (int, void (*)(int)))(int); +#else void (*signal ()) (); -int main() { return 0; } -int t() { +#endif + +int main() { int i; ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_type_signal=int fi rm -f conftest* - fi echo "$ac_t""$ac_cv_type_signal" 1>&6 @@ -1066,20 +1180,22 @@ EOF for ac_func in socket do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1184: 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 < /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); -int main() { return 0; } -int t() { +int main() { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named @@ -1092,19 +1208,21 @@ $ac_func(); ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:1212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func_$ac_func=no" fi rm -f conftest* - fi + if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdedfghijklmnopqrstuvwxyz' 'ABCDEDFGHIJKLMNOPQRSTUVWXYZ'` + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h < confcache <<\EOF # --recheck option to rerun configure. # EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \ - >> confcache + case `(ac_space=' '; set) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache if cmp -s $cache_file confcache; then : else @@ -1208,7 +1340,7 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g s%\[%\\&%g s%\]%\\&%g @@ -1243,7 +1375,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.4.2" + echo "$CONFIG_STATUS generated by autoconf version 2.12" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1255,10 +1387,12 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS < conftest.subs <<\CEOF +# Protect against being on the right side of a sed subst in config.status. +sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub s%@CFLAGS@%$CFLAGS%g @@ -1296,20 +1430,56 @@ s%@INSTALL@%$INSTALL%g CEOF EOF + +cat >> $CONFIG_STATUS <<\EOF + +# Split the substitutions into bite-sized pieces for seds with +# small command number limits, like on Digital OSF/1 and HP-UX. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # Line after last line for current file. +ac_more_lines=: +ac_sed_cmds="" +while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" + else + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + fi + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` + fi +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi +EOF + cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile]", defaulting infile="outfile.in". + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; *) ac_file_in="${ac_file}.in" ;; esac - # Adjust relative srcdir, etc. for subdirectories. + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. # Remove last slash and all that follows it. Not all systems have dirname. ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` @@ -1337,6 +1507,7 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then [/$]*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac + echo creating "$ac_file" rm -f "$ac_file" configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." @@ -1345,16 +1516,22 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then # $configure_input" ;; *) ac_comsub= ;; esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g s%@top_srcdir@%$top_srcdir%g s%@INSTALL@%$INSTALL%g -" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file fi; done -rm -f conftest.subs +rm -f conftest.s* +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF exit 0 EOF diff --git a/teles/aclocal.m4 b/teles/aclocal.m4 index eeca1b77..83a78be9 100644 --- a/teles/aclocal.m4 +++ b/teles/aclocal.m4 @@ -1,41 +1 @@ -dnl -dnl Try finding linux sourcetree -dnl - -AC_DEFUN(AC_FIND_KERNEL, [ - OLD_CPPFLAGS="$CPPFLAGS" - lxdir="no" - eval tst_kerneldir=$CONFIG_KERNELDIR - - AC_ARG_WITH(kernel, - [ --with-kernel=DIR Set kernel source directory [/usr/src/linux]], - DOTEST="y"; tst_kerneldir="${withval}") - - if test "$DOTEST" = "y" || test "$CONFIG_KERNELDIR" != "" ; then - AC_MSG_CHECKING([for linux kernel source in ${tst_kerneldir}]) - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=${tst_kerneldir}, - AC_MSG_RESULT("no")) - fi - if test "$lxdir" = "no" ; then - AC_MSG_CHECKING([for linux kernel source in /usr/src/linux]) - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/src/linux) - fi - if test "$lxdir" = "no" ; then - AC_MSG_RESULT("$lxdir") - AC_MSG_CHECKING([for linux kernel source in /usr/local/src/linux]) - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" - AC_TRY_CPP([#include ], lxdir=/usr/local/src/linux) - fi - if test "$lxdir" != "no" ; then - AC_MSG_RESULT("yes") - else - lxdir="" - AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") - fi - CONFIG_KERNELDIR="$lxdir" - CPPFLAGS="$OLD_CPPFLAGS" - AC_DEFINE_UNQUOTED(CONFIG_KERNELDIR,"$lxdir") - AC_SUBST(CONFIG_KERNELDIR) -]) +sinclude(../etc/ackernel.m4)dnl diff --git a/teles/configure b/teles/configure index fc83d524..548b6e56 100755 --- a/teles/configure +++ b/teles/configure @@ -1012,7 +1012,7 @@ 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:1015: checking for linux kernel source in ${tst_kerneldir}" >&5 - CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" + CPPFLAGS="-nostdinc -I${tst_kerneldir}/include -I${tst_kerneldir}/drivers/isdn" cat > conftest.$ac_ext <&6 echo "configure:1039: checking for linux kernel source in /usr/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" + CPPFLAGS="-nostdinc -I/usr/src/linux/include -I/usr/src/linux/drivers/isdn" cat > conftest.$ac_ext <&6 echo $ac_n "checking for linux kernel source in /usr/local/src/linux""... $ac_c" 1>&6 echo "configure:1062: checking for linux kernel source in /usr/local/src/linux" >&5 - CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" + CPPFLAGS="-nostdinc -I/usr/local/src/linux/include -I/usr/local/src/linux/drivers/isdn" cat > conftest.$ac_ext <