From a5a4b554a5728b273e2c0a1eb556f2907a43c109 Mon Sep 17 00:00:00 2001 From: zacheiss Date: Tue, 9 Oct 2001 14:32:31 +0000 Subject: [PATCH] AC_SUBST the directory webmoira src lives in. --- configure | 261 ++++++++++++++++++++++++++------------------------- configure.in | 1 + 2 files changed, 133 insertions(+), 129 deletions(-) diff --git a/configure b/configure index 3d573da4..0d81bebe 100755 --- a/configure +++ b/configure @@ -595,6 +595,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 # SO_LDFLAGS setting below is a great big ick. +# But it beats sucking in libtool for one small part of the source tree. case $host_os in solaris*) short_os=solaris @@ -620,7 +621,7 @@ esac # 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 @@ -650,7 +651,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:654: checking for $ac_word" >&5 +echo "configure:655: 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 +702,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:705: checking for $ac_word" >&5 +echo "configure:706: 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 @@ -733,7 +734,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:737: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:738: 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. @@ -744,12 +745,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 748 "configure" +#line 749 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 @@ -775,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:779: 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:784: 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 @@ -789,7 +790,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:793: \"$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 @@ -808,7 +809,7 @@ 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:812: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:813: 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 @@ -851,7 +852,7 @@ fi # 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:855: checking for a BSD compatible install" >&5 +echo "configure:856: 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 @@ -906,7 +907,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:910: checking for $ac_word" >&5 +echo "configure:911: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -934,7 +935,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:938: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:939: 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 @@ -1008,7 +1009,7 @@ mrbindir=/moira/bin # Athena-local policy decisions echo $ac_n "checking for Athena""... $ac_c" 1>&6 -echo "configure:1012: checking for Athena" >&5 +echo "configure:1013: checking for Athena" >&5 # Check whether --enable-athena or --disable-athena was given. if test "${enable_athena+set}" = set; then enableval="$enable_athena" @@ -1039,14 +1040,14 @@ fi # Networking libraries echo "checking network libraries..." 1>&6 -echo "configure:1043: checking network libraries..." >&5 +echo "configure:1044: checking network libraries..." >&5 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1045: checking for gethostbyname" >&5 +echo "configure:1046: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+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${ac_exeext}; then +if { (eval echo configure:1074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1087,7 +1088,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1091: checking for gethostbyname in -lnsl" >&5 +echo "configure:1092: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1095,7 +1096,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1132,7 +1133,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6 -echo "configure:1136: checking for gethostbyname in -lresolv" >&5 +echo "configure:1137: checking for gethostbyname in -lresolv" >&5 ac_lib_var=`echo resolv'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1140,7 +1141,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1183,12 +1184,12 @@ fi fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:1187: checking for socket" >&5 +echo "configure:1188: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+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${ac_exeext}; then +if { (eval echo configure:1216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -1229,7 +1230,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:1233: checking for socket in -lsocket" >&5 +echo "configure:1234: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1237,7 +1238,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1274,7 +1275,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:1278: checking for socket in -lsocket" >&5 +echo "configure:1279: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1282,7 +1283,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket -lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1321,7 +1322,7 @@ fi # com_err (required, but can be built) echo $ac_n "checking for com_err""... $ac_c" 1>&6 -echo "configure:1325: checking for com_err" >&5 +echo "configure:1326: checking for com_err" >&5 # Check whether --with-com_err or --without-com_err was given. if test "${with_com_err+set}" = set; then withval="$with_com_err" @@ -1385,7 +1386,7 @@ fi # Kerberos (Kerberos 4 required, Kerberos 5 optional for reg_svr) echo $ac_n "checking for Kerberos 4""... $ac_c" 1>&6 -echo "configure:1389: checking for Kerberos 4" >&5 +echo "configure:1390: checking for Kerberos 4" >&5 # Check whether --with-krb4 or --without-krb4 was given. if test "${with_krb4+set}" = set; then withval="$with_krb4" @@ -1452,7 +1453,7 @@ elif test -d /usr/include/kerberosIV; then fi echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6 -echo "configure:1456: checking for main in -lcrypto" >&5 +echo "configure:1457: checking for main in -lcrypto" >&5 ac_lib_var=`echo crypto'_'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 @@ -1460,14 +1461,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1486,7 +1487,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lk5crypto""... $ac_c" 1>&6 -echo "configure:1490: checking for main in -lk5crypto" >&5 +echo "configure:1491: checking for main in -lk5crypto" >&5 ac_lib_var=`echo k5crypto'_'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 @@ -1494,14 +1495,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lk5crypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1524,7 +1525,7 @@ fi fi echo $ac_n "checking for krb_rd_req in -lkrb4""... $ac_c" 1>&6 -echo "configure:1528: checking for krb_rd_req in -lkrb4" >&5 +echo "configure:1529: checking for krb_rd_req in -lkrb4" >&5 ac_lib_var=`echo krb4'_'krb_rd_req | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1532,7 +1533,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb4 $LIBPATH -ldes425 -lkrb5 -l${crypto} -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1562,7 +1563,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for krb_rd_req in -lkrb""... $ac_c" 1>&6 -echo "configure:1566: checking for krb_rd_req in -lkrb" >&5 +echo "configure:1567: checking for krb_rd_req in -lkrb" >&5 ac_lib_var=`echo krb'_'krb_rd_req | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1570,7 +1571,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb $LIBPATH -ldes $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1606,7 +1607,7 @@ fi echo $ac_n "checking for Kerberos 5""... $ac_c" 1>&6 -echo "configure:1610: checking for Kerberos 5" >&5 +echo "configure:1611: checking for Kerberos 5" >&5 # Check whether --with-krb5 or --without-krb5 was given. if test "${with_krb5+set}" = set; then withval="$with_krb5" @@ -1633,7 +1634,7 @@ fi # Hesiod support echo $ac_n "checking for Hesiod""... $ac_c" 1>&6 -echo "configure:1637: checking for Hesiod" >&5 +echo "configure:1638: checking for Hesiod" >&5 # Check whether --with-hesiod or --without-hesiod was given. if test "${with_hesiod+set}" = set; then withval="$with_hesiod" @@ -1667,12 +1668,12 @@ if test "$hesiod" != no; then fi echo $ac_n "checking for res_send""... $ac_c" 1>&6 -echo "configure:1671: checking for res_send" >&5 +echo "configure:1672: checking for res_send" >&5 if eval "test \"`echo '$''{'ac_cv_func_res_send'+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${ac_exeext}; then +if { (eval echo configure:1700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_res_send=yes" else @@ -1713,7 +1714,7 @@ if eval "test \"`echo '$ac_cv_func_'res_send`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for res_send in -lresolv""... $ac_c" 1>&6 -echo "configure:1717: checking for res_send in -lresolv" >&5 +echo "configure:1718: checking for res_send in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_send | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1721,7 +1722,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1762,7 +1763,7 @@ fi fi echo $ac_n "checking for hes_resolve in -lhesiod""... $ac_c" 1>&6 -echo "configure:1766: checking for hes_resolve in -lhesiod" >&5 +echo "configure:1767: checking for hes_resolve in -lhesiod" >&5 ac_lib_var=`echo hesiod'_'hes_resolve | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1770,7 +1771,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lhesiod $LIBPATH $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1818,7 +1819,7 @@ fi # Zephyr support echo $ac_n "checking for Zephyr""... $ac_c" 1>&6 -echo "configure:1822: checking for Zephyr" >&5 +echo "configure:1823: checking for Zephyr" >&5 # Check whether --with-zephyr or --without-zephyr was given. if test "${with_zephyr+set}" = set; then withval="$with_zephyr" @@ -1852,7 +1853,7 @@ if test "$zephyr" != no; then fi echo $ac_n "checking for ZInitialize in -lzephyr""... $ac_c" 1>&6 -echo "configure:1856: checking for ZInitialize in -lzephyr" >&5 +echo "configure:1857: checking for ZInitialize in -lzephyr" >&5 ac_lib_var=`echo zephyr'_'ZInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1860,7 +1861,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lzephyr $LIBPATH $KRB4_LIBS -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1908,7 +1909,7 @@ fi # RSAREF support (default: build util/rsaref if present) echo $ac_n "checking for RSAREF""... $ac_c" 1>&6 -echo "configure:1912: checking for RSAREF" >&5 +echo "configure:1913: checking for RSAREF" >&5 # Check whether --with-rsaref or --without-rsaref was given. if test "${with_rsaref+set}" = set; then withval="$with_rsaref" @@ -1955,7 +1956,7 @@ fi # Oracle (default: yes, if $ORACLE_HOME is set) echo $ac_n "checking for Oracle""... $ac_c" 1>&6 -echo "configure:1959: checking for Oracle" >&5 +echo "configure:1960: checking for Oracle" >&5 # Check whether --with-oracle or --without-oracle was given. if test "${with_oracle+set}" = set; then withval="$with_oracle" @@ -1971,7 +1972,7 @@ fi echo "$ac_t""$oracle" 1>&6 if test "$oracle" != no; then echo $ac_n "checking Pro*C version""... $ac_c" 1>&6 -echo "configure:1975: checking Pro*C version" >&5 +echo "configure:1976: checking Pro*C version" >&5 ORACLE_HOME=$oracle release=`$ORACLE_HOME/bin/proc | awk '/Release/ {print $3;}'` echo "$ac_t""$release" 1>&6 case $release in @@ -1997,7 +1998,7 @@ fi # Java support, for webmoira echo $ac_n "checking for Java""... $ac_c" 1>&6 -echo "configure:2001: checking for Java" >&5 +echo "configure:2002: checking for Java" >&5 # Check whether --with-java or --without-java was given. if test "${with_java+set}" = set; then withval="$with_java" @@ -2033,9 +2034,10 @@ EOF fi + # LDAP support echo $ac_n "checking for LDAP""... $ac_c" 1>&6 -echo "configure:2039: checking for LDAP" >&5 +echo "configure:2041: checking for LDAP" >&5 # Check whether --with-ldap or --without-ldap was given. if test "${with_ldap+set}" = set; then withval="$with_ldap" @@ -2076,7 +2078,7 @@ fi # AFS support echo $ac_n "checking for AFS""... $ac_c" 1>&6 -echo "configure:2080: checking for AFS" >&5 +echo "configure:2082: checking for AFS" >&5 # Check whether --with-afs or --without-afs was given. if test "${with_afs+set}" = set; then withval="$with_afs" @@ -2094,12 +2096,12 @@ if test "$afs" != no -a "$oracle" != no; then AFS_DIR=$afs fi echo $ac_n "checking for insque""... $ac_c" 1>&6 -echo "configure:2098: checking for insque" >&5 +echo "configure:2100: checking for insque" >&5 if eval "test \"`echo '$''{'ac_cv_func_insque'+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${ac_exeext}; then +if { (eval echo configure:2128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_insque=yes" else @@ -2140,7 +2142,7 @@ if eval "test \"`echo '$ac_cv_func_'insque`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for insque in -lcompat""... $ac_c" 1>&6 -echo "configure:2144: checking for insque in -lcompat" >&5 +echo "configure:2146: checking for insque in -lcompat" >&5 ac_lib_var=`echo compat'_'insque | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2148,7 +2150,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcompat $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2183,12 +2185,12 @@ fi fi echo $ac_n "checking for sigvec""... $ac_c" 1>&6 -echo "configure:2187: checking for sigvec" >&5 +echo "configure:2189: checking for sigvec" >&5 if eval "test \"`echo '$''{'ac_cv_func_sigvec'+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${ac_exeext}; then +if { (eval echo configure:2217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sigvec=yes" else @@ -2229,7 +2231,7 @@ if eval "test \"`echo '$ac_cv_func_'sigvec`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sigvec in -lucb""... $ac_c" 1>&6 -echo "configure:2233: checking for sigvec in -lucb" >&5 +echo "configure:2235: checking for sigvec in -lucb" >&5 ac_lib_var=`echo ucb'_'sigvec | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2237,7 +2239,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lucb -L/usr/ucblib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2272,7 +2274,7 @@ fi fi echo $ac_n "checking for pioctl in -lsys""... $ac_c" 1>&6 -echo "configure:2276: checking for pioctl in -lsys" >&5 +echo "configure:2278: checking for pioctl in -lsys" >&5 ac_lib_var=`echo sys'_'pioctl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2280,7 +2282,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsys $AFS_LIBS -lrx -llwp -lsys $AFS_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2342,14 +2344,14 @@ fi # GNU readline echo "checking for GNU readline..." 1>&6 -echo "configure:2346: checking for GNU readline..." >&5 +echo "configure:2348: checking for GNU readline..." >&5 # Check whether --with-readline or --without-readline was given. if test "${with_readline+set}" = set; then withval="$with_readline" readline="$withval"; echo "$ac_t""$withval" 1>&6 else echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:2353: checking for readline in -lreadline" >&5 +echo "configure:2355: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2357,7 +2359,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline -ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2389,7 +2391,7 @@ else if test "$athena" = true; then unset ac_cv_lib_readline_readline echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:2393: checking for readline in -lreadline" >&5 +echo "configure:2395: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2397,7 +2399,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline -L/mit/gnu/lib -ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2448,9 +2450,9 @@ fi # Curses curses=curses echo "checking for curses" 1>&6 -echo "configure:2452: checking for curses" >&5 +echo "configure:2454: checking for curses" >&5 echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 -echo "configure:2454: checking for main in -lcurses" >&5 +echo "configure:2456: checking for main in -lcurses" >&5 ac_lib_var=`echo curses'_'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 @@ -2458,14 +2460,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2484,7 +2486,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6 -echo "configure:2488: checking for main in -lncurses" >&5 +echo "configure:2490: checking for main in -lncurses" >&5 ac_lib_var=`echo ncurses'_'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 @@ -2492,14 +2494,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2525,12 +2527,12 @@ if test -n "$curses"; then OLDLIBS=$LIBS LIBS=-l$curses echo "checking if curses needs termcap" 1>&6 -echo "configure:2529: checking if curses needs termcap" >&5 +echo "configure:2531: checking if curses needs termcap" >&5 if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < main(int argc, char **argv) @@ -2540,7 +2542,7 @@ else return 0; } EOF -if { (eval echo configure:2544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then CURSES_LIBS="-l$curses" else @@ -2552,7 +2554,7 @@ else : else cat > conftest.$ac_ext < main(int argc, char **argv) @@ -2562,7 +2564,7 @@ else return 0; } EOF -if { (eval echo configure:2566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then CURSES_LIBS="-l$curses -ltermcap" else @@ -2584,14 +2586,14 @@ if test -n "$CURSES_LIBS"; then OLDLIBS=$LIBS LIBS=$CURSES_LIBS cat > conftest.$ac_ext < int main() { WINDOW *w; getmaxx(w); ; return 0; } EOF -if { (eval echo configure:2595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* : else @@ -2599,14 +2601,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { WINDOW *w; w->_maxx; ; return 0; } EOF -if { (eval echo configure:2610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* CURSES_CPPFLAGS="-D'getmaxx(w)=w->_maxx'" else @@ -2619,14 +2621,14 @@ rm -f conftest* fi rm -f conftest* cat > conftest.$ac_ext < int main() { newterm(NULL, NULL, NULL); ; return 0; } EOF -if { (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CURSES_CPPFLAGS="$CURSES_CPPFLAGS -DCURSES_HAS_NEWTERM" else @@ -2648,12 +2650,12 @@ fi for ac_func in getusershell strlcpy strlcat uname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2652: checking for $ac_func" >&5 +echo "configure:2654: 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${ac_exeext}; then +if { (eval echo configure:2682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2702,12 +2704,12 @@ done echo $ac_n "checking for sigaction""... $ac_c" 1>&6 -echo "configure:2706: checking for sigaction" >&5 +echo "configure:2708: checking for sigaction" >&5 if eval "test \"`echo '$''{'ac_cv_func_sigaction'+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${ac_exeext}; then +if { (eval echo configure:2736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sigaction=yes" else @@ -2754,7 +2756,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2758: checking how to run the C preprocessor" >&5 +echo "configure:2760: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2769,13 +2771,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:2779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2786,13 +2788,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:2796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2803,13 +2805,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2837,17 +2839,17 @@ for ac_hdr in unistd.h getopt.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2841: checking for $ac_hdr" >&5 +echo "configure:2843: 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:2851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2876,17 +2878,17 @@ done ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6 -echo "configure:2880: checking for netinet/in.h" >&5 +echo "configure:2882: checking for netinet/in.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:2890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2914,9 +2916,9 @@ fi if test "$no_netinet_in" != "yes"; then echo $ac_n "checking for in_addr_t defined in netinet/in.h""... $ac_c" 1>&6 -echo "configure:2918: checking for in_addr_t defined in netinet/in.h" >&5 +echo "configure:2920: checking for in_addr_t defined in netinet/in.h" >&5 cat > conftest.$ac_ext < EOF @@ -3208,6 +3210,7 @@ s%@PRO_C_OPTS@%$PRO_C_OPTS%g s%@SQL_LIBS@%$SQL_LIBS%g s%@SVRSUBDIRS@%$SVRSUBDIRS%g s%@JAVA_CPPFLAGS@%$JAVA_CPPFLAGS%g +s%@WEBMOIRA_SUBDIRS@%$WEBMOIRA_SUBDIRS%g s%@LDAP_CPPFLAGS@%$LDAP_CPPFLAGS%g s%@LDAP_LIBS@%$LDAP_LIBS%g s%@WINAD_SUBDIRS@%$WINAD_SUBDIRS%g diff --git a/configure.in b/configure.in index beda316f..6de8128a 100755 --- a/configure.in +++ b/configure.in @@ -282,6 +282,7 @@ if test "$java" != no; then WEBMOIRA_OUTPUT_FILES="webmoira/Makefile" fi AC_SUBST(JAVA_CPPFLAGS) +AC_SUBST(WEBMOIRA_SUBDIRS) # LDAP support AC_MSG_CHECKING(for LDAP) -- 2.45.2