From 9b1f5e48f9174922df44c102639e75a5db58a65d Mon Sep 17 00:00:00 2001 From: zacheiss Date: Tue, 6 Jun 2000 04:41:14 +0000 Subject: [PATCH] Deal with new organization of incremental. Provide support for building --with-ldap, needed for winad.incr. --- Makefile.in | 2 +- configure | 294 ++++++++++++++++++++++++++++++--------------------- configure.in | 37 ++++++- 3 files changed, 205 insertions(+), 128 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2ea4bcef..02bc32bb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,7 +13,7 @@ mandir=@mandir@ mrbindir=@mrbindir@ CLIENTDIRS=include lib clients update man -SVRDIRS=db server backup dbck dcm gen regtape @AFS_SUBDIRS@ @RSAREF_SUBDIRS@ +SVRDIRS=db server backup dbck dcm gen regtape incremental @AFS_SYNCDIR@ @RSAREF_SUBDIRS@ DEPDIRS=@COM_ERR_SUBDIR@ SUBDIRS=$(CLIENTDIRS) @SVRSUBDIRS@ diff --git a/configure b/configure index de4a329c..3141d741 100755 --- a/configure +++ b/configure @@ -27,6 +27,8 @@ ac_help="$ac_help --with-rsaref=PREFIX Specify location of RSAREF" ac_help="$ac_help --with-oracle=PREFIX Specify location of Oracle (for server)" +ac_help="$ac_help + --with-ldap=PREFIX Specify location of LDAP libs (for server)" ac_help="$ac_help --with-afs=PREFIX Specify location of AFS libs (for server)" ac_help="$ac_help @@ -553,7 +555,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:557: checking for $ac_word" >&5 +echo "configure:559: 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 @@ -583,7 +585,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:587: checking for $ac_word" >&5 +echo "configure:589: 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 @@ -634,7 +636,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:638: checking for $ac_word" >&5 +echo "configure:640: 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 @@ -666,7 +668,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:670: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:672: 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. @@ -677,12 +679,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 681 "configure" +#line 683 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:688: \"$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 @@ -708,12 +710,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:712: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:714: 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:717: checking whether we are using GNU C" >&5 +echo "configure:719: 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 @@ -722,7 +724,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:726: \"$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:728: \"$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 @@ -741,7 +743,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:745: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:747: 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 @@ -803,7 +805,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:807: checking for a BSD compatible install" >&5 +echo "configure:809: 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 @@ -858,7 +860,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:862: checking for $ac_word" >&5 +echo "configure:864: 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 @@ -886,7 +888,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:890: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:892: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -960,7 +962,7 @@ mrbindir=/moira/bin # Athena-local policy decisions echo $ac_n "checking for Athena""... $ac_c" 1>&6 -echo "configure:964: checking for Athena" >&5 +echo "configure:966: checking for Athena" >&5 # Check whether --enable-athena or --disable-athena was given. if test "${enable_athena+set}" = set; then enableval="$enable_athena" @@ -991,14 +993,14 @@ fi # Networking libraries echo "checking network libraries..." 1>&6 -echo "configure:995: checking network libraries..." >&5 +echo "configure:997: checking network libraries..." >&5 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:997: checking for gethostbyname" >&5 +echo "configure:999: 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:1027: \"$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 @@ -1039,7 +1041,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:1043: checking for gethostbyname in -lnsl" >&5 +echo "configure:1045: 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 @@ -1047,7 +1049,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:1064: \"$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 @@ -1084,7 +1086,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6 -echo "configure:1088: checking for gethostbyname in -lresolv" >&5 +echo "configure:1090: 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 @@ -1092,7 +1094,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:1109: \"$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 @@ -1135,12 +1137,12 @@ fi fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:1139: checking for socket" >&5 +echo "configure:1141: 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:1169: \"$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 @@ -1181,7 +1183,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:1185: checking for socket in -lsocket" >&5 +echo "configure:1187: 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 @@ -1189,7 +1191,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:1206: \"$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 @@ -1226,7 +1228,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:1230: checking for socket in -lsocket" >&5 +echo "configure:1232: 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 @@ -1234,7 +1236,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:1251: \"$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 @@ -1273,7 +1275,7 @@ fi # com_err (required, but can be built) echo $ac_n "checking for com_err""... $ac_c" 1>&6 -echo "configure:1277: checking for com_err" >&5 +echo "configure:1279: 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" @@ -1337,7 +1339,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:1341: checking for Kerberos 4" >&5 +echo "configure:1343: checking for Kerberos 4" >&5 # Check whether --with-krb4 or --without-krb4 was given. if test "${with_krb4+set}" = set; then withval="$with_krb4" @@ -1404,7 +1406,7 @@ elif test -d /usr/include/kerberosIV; then fi echo $ac_n "checking for krb_rd_req in -lkrb4""... $ac_c" 1>&6 -echo "configure:1408: checking for krb_rd_req in -lkrb4" >&5 +echo "configure:1410: 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 @@ -1412,7 +1414,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb4 $LIBPATH -ldes425 -lkrb5 -lcrypto -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1429: \"$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 @@ -1442,7 +1444,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:1446: checking for krb_rd_req in -lkrb" >&5 +echo "configure:1448: 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 @@ -1450,7 +1452,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:1467: \"$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 +1488,7 @@ fi echo $ac_n "checking for Kerberos 5""... $ac_c" 1>&6 -echo "configure:1490: checking for Kerberos 5" >&5 +echo "configure:1492: checking for Kerberos 5" >&5 # Check whether --with-krb5 or --without-krb5 was given. if test "${with_krb5+set}" = set; then withval="$with_krb5" @@ -1513,7 +1515,7 @@ fi # Hesiod support echo $ac_n "checking for Hesiod""... $ac_c" 1>&6 -echo "configure:1517: checking for Hesiod" >&5 +echo "configure:1519: checking for Hesiod" >&5 # Check whether --with-hesiod or --without-hesiod was given. if test "${with_hesiod+set}" = set; then withval="$with_hesiod" @@ -1547,12 +1549,12 @@ if test "$hesiod" != no; then fi echo $ac_n "checking for res_send""... $ac_c" 1>&6 -echo "configure:1551: checking for res_send" >&5 +echo "configure:1553: 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:1581: \"$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 @@ -1593,7 +1595,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:1597: checking for res_send in -lresolv" >&5 +echo "configure:1599: 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 @@ -1601,7 +1603,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:1618: \"$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 @@ -1642,7 +1644,7 @@ fi fi echo $ac_n "checking for hes_resolve in -lhesiod""... $ac_c" 1>&6 -echo "configure:1646: checking for hes_resolve in -lhesiod" >&5 +echo "configure:1648: 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 @@ -1650,7 +1652,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:1667: \"$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 @@ -1698,7 +1700,7 @@ fi # Zephyr support echo $ac_n "checking for Zephyr""... $ac_c" 1>&6 -echo "configure:1702: checking for Zephyr" >&5 +echo "configure:1704: checking for Zephyr" >&5 # Check whether --with-zephyr or --without-zephyr was given. if test "${with_zephyr+set}" = set; then withval="$with_zephyr" @@ -1732,7 +1734,7 @@ if test "$zephyr" != no; then fi echo $ac_n "checking for ZInitialize in -lzephyr""... $ac_c" 1>&6 -echo "configure:1736: checking for ZInitialize in -lzephyr" >&5 +echo "configure:1738: 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 @@ -1740,7 +1742,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:1757: \"$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 @@ -1788,7 +1790,7 @@ fi # RSAREF support (default: build util/rsaref if present) echo $ac_n "checking for RSAREF""... $ac_c" 1>&6 -echo "configure:1792: checking for RSAREF" >&5 +echo "configure:1794: checking for RSAREF" >&5 # Check whether --with-rsaref or --without-rsaref was given. if test "${with_rsaref+set}" = set; then withval="$with_rsaref" @@ -1835,7 +1837,7 @@ fi # Oracle (default: yes, if $ORACLE_HOME is set) echo $ac_n "checking for Oracle""... $ac_c" 1>&6 -echo "configure:1839: checking for Oracle" >&5 +echo "configure:1841: checking for Oracle" >&5 # Check whether --with-oracle or --without-oracle was given. if test "${with_oracle+set}" = set; then withval="$with_oracle" @@ -1851,7 +1853,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:1855: checking Pro*C version" >&5 +echo "configure:1857: 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 @@ -1863,7 +1865,7 @@ echo "configure:1855: checking Pro*C version" >&5 ;; esac SVRSUBDIRS='$(SVRDIRS)' - SERVER_OUTPUT_FILES="db/Makefile server/Makefile backup/Makefile dbck/Makefile dcm/Makefile gen/Makefile reg_svr/Makefile regtape/Makefile" + SERVER_OUTPUT_FILES="db/Makefile server/Makefile backup/Makefile dbck/Makefile dcm/Makefile gen/Makefile incremental/Makefile reg_svr/Makefile regtape/Makefile" PRO_C=$oracle/bin/proc PRO_C_OPTS=CODE=ANSI_C PRO_C_DEFS="DEFINE=_PROC_ $PRO_C_DEFS" @@ -1875,9 +1877,50 @@ fi +# LDAP support +echo $ac_n "checking for LDAP""... $ac_c" 1>&6 +echo "configure:1883: checking for LDAP" >&5 +# Check whether --with-ldap or --without-ldap was given. +if test "${with_ldap+set}" = set; then + withval="$with_ldap" + ldap="$withval" +else + if test -n "$LDAP_HOME" -a -d "$LDAP_HOME"; then + ldap=$LDAP_HOME + else + ldap=no + fi +fi + +echo "$ac_t""$ldap" 1>&6 +if test "$ldap" != no -a "$oracle" != no; then + if test "$ldap" != yes; then + LDAP_CPPFLAGS="-I$ldap/include" + LDAP_LIBS="-L$ldap/lib" + fi + + cat >> confdefs.h <<\EOF +#define HAVE_LDAP 1 +EOF + + + case $PRO_C_DEFS in + *DEFINE=HAVE_LDAP*) ;; + *) PRO_C_DEFS=DEFINE=HAVE_LDAP\ $PRO_C_DEFS ;; + esac + + + + WINAD_SUBDIRS="winad" + WINAD_OUTPUT_FILES="incremental/winad/Makefile" +fi + + + + # AFS support echo $ac_n "checking for AFS""... $ac_c" 1>&6 -echo "configure:1881: checking for AFS" >&5 +echo "configure:1924: checking for AFS" >&5 # Check whether --with-afs or --without-afs was given. if test "${with_afs+set}" = set; then withval="$with_afs" @@ -1895,12 +1938,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:1899: checking for insque" >&5 +echo "configure:1942: 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:1970: \"$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 @@ -1941,7 +1984,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:1945: checking for insque in -lcompat" >&5 +echo "configure:1988: 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 @@ -1949,7 +1992,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:2007: \"$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 @@ -1984,12 +2027,12 @@ fi fi echo $ac_n "checking for sigvec""... $ac_c" 1>&6 -echo "configure:1988: checking for sigvec" >&5 +echo "configure:2031: 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:2059: \"$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 @@ -2030,7 +2073,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:2034: checking for sigvec in -lucb" >&5 +echo "configure:2077: 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 @@ -2038,7 +2081,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:2096: \"$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 @@ -2073,7 +2116,7 @@ fi fi echo $ac_n "checking for pioctl in -lsys""... $ac_c" 1>&6 -echo "configure:2077: checking for pioctl in -lsys" >&5 +echo "configure:2120: 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 @@ -2081,7 +2124,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:2139: \"$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 @@ -2126,10 +2169,10 @@ EOF - AFS_SUBDIRS="incremental" - AFS_OUTPUT_FILES="incremental/Makefile" + AFS_SUBDIRS="afs" + AFS_OUTPUT_FILES="incremental/afs/Makefile" if test -d $srcdir/afssync; then - AFS_SUBDIRS="$AFS_SUBDIRS afssync" + AFS_SYNCDIR="afssync" AFS_OUTPUT_FILES="$AFS_OUTPUT_FILES afssync/Makefile" fi fi @@ -2140,16 +2183,17 @@ fi + # GNU readline echo "checking for GNU readline..." 1>&6 -echo "configure:2146: checking for GNU readline..." >&5 +echo "configure:2190: 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:2153: checking for readline in -lreadline" >&5 +echo "configure:2197: 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 @@ -2157,7 +2201,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:2216: \"$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 @@ -2189,7 +2233,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:2193: checking for readline in -lreadline" >&5 +echo "configure:2237: 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 @@ -2197,7 +2241,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:2256: \"$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 @@ -2248,9 +2292,9 @@ fi # Curses curses=curses echo "checking for curses" 1>&6 -echo "configure:2252: checking for curses" >&5 +echo "configure:2296: checking for curses" >&5 echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 -echo "configure:2254: checking for main in -lcurses" >&5 +echo "configure:2298: 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 @@ -2258,14 +2302,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:2313: \"$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 @@ -2284,7 +2328,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:2288: checking for main in -lncurses" >&5 +echo "configure:2332: 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 @@ -2292,14 +2336,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:2347: \"$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 @@ -2325,12 +2369,12 @@ if test -n "$curses"; then OLDLIBS=$LIBS LIBS=-l$curses echo "checking if curses needs termcap" 1>&6 -echo "configure:2329: checking if curses needs termcap" >&5 +echo "configure:2373: checking if curses needs termcap" >&5 if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < main(int argc, char **argv) @@ -2340,7 +2384,7 @@ else return 0; } EOF -if { (eval echo configure:2344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2388: \"$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 @@ -2352,7 +2396,7 @@ else : else cat > conftest.$ac_ext < main(int argc, char **argv) @@ -2362,7 +2406,7 @@ else return 0; } EOF -if { (eval echo configure:2366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2410: \"$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 @@ -2384,14 +2428,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:2395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* : else @@ -2399,14 +2443,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:2410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* CURSES_CPPFLAGS="-D'getmaxx(w)=w->_maxx'" else @@ -2419,14 +2463,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:2430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2474: \"$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 @@ -2448,12 +2492,12 @@ fi for ac_func in getusershell strlcpy strlcat uname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2452: checking for $ac_func" >&5 +echo "configure:2496: 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:2524: \"$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 @@ -2502,12 +2546,12 @@ done echo $ac_n "checking for sigaction""... $ac_c" 1>&6 -echo "configure:2506: checking for sigaction" >&5 +echo "configure:2550: 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:2578: \"$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 @@ -2554,7 +2598,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2558: checking how to run the C preprocessor" >&5 +echo "configure:2602: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2569,13 +2613,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:2579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2623: \"$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 : @@ -2586,13 +2630,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:2596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2640: \"$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 : @@ -2603,13 +2647,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:2613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2657: \"$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 : @@ -2637,17 +2681,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:2641: checking for $ac_hdr" >&5 +echo "configure:2685: 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:2651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2695: \"$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* @@ -2878,7 +2922,8 @@ trap 'rm -fr `echo "Makefile lib/Makefile include/Makefile clients/Makefile \ clients/mailmaint/Makefile clients/moira/Makefile \ clients/mrcheck/Makefile clients/mrtest/Makefile \ clients/stella/Makefile update/Makefile man/Makefile \ - $SERVER_OUTPUT_FILES $AFS_OUTPUT_FILES $RSAREF_OUTPUT_FILES" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + $SERVER_OUTPUT_FILES $WINAD_OUTPUT_FILES $AFS_OUTPUT_FILES \ + $RSAREF_OUTPUT_FILES" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/configure.in b/configure.in index 8c787fed..caead914 100755 --- a/configure.in +++ b/configure.in @@ -228,7 +228,7 @@ if test "$oracle" != no; then ;; esac SVRSUBDIRS='$(SVRDIRS)' - SERVER_OUTPUT_FILES="db/Makefile server/Makefile backup/Makefile dbck/Makefile dcm/Makefile gen/Makefile reg_svr/Makefile regtape/Makefile" + SERVER_OUTPUT_FILES="db/Makefile server/Makefile backup/Makefile dbck/Makefile dcm/Makefile gen/Makefile incremental/Makefile reg_svr/Makefile regtape/Makefile" PRO_C=$oracle/bin/proc PRO_C_OPTS=CODE=ANSI_C PRO_C_DEFS="DEFINE=_PROC_ $PRO_C_DEFS" @@ -240,6 +240,31 @@ AC_SUBST(PRO_C_OPTS) AC_SUBST(SQL_LIBS) AC_SUBST(SVRSUBDIRS) +# LDAP support +AC_MSG_CHECKING(for LDAP) +AC_ARG_WITH(ldap, + [ --with-ldap=PREFIX Specify location of LDAP libs (for server)], + [ ldap="$withval"], + [if test -n "$LDAP_HOME" -a -d "$LDAP_HOME"; then + ldap=$LDAP_HOME + else + ldap=no + fi]) +AC_MSG_RESULT($ldap) +if test "$ldap" != no -a "$oracle" != no; then + if test "$ldap" != yes; then + LDAP_CPPFLAGS="-I$ldap/include" + LDAP_LIBS="-L$ldap/lib" + fi + MR_DEFINE(HAVE_LDAP) + + WINAD_SUBDIRS="winad" + WINAD_OUTPUT_FILES="incremental/winad/Makefile" +fi +AC_SUBST(LDAP_CPPFLAGS) +AC_SUBST(LDAP_LIBS) +AC_SUBST(WINAD_SUBDIRS) + # AFS support AC_MSG_CHECKING(for AFS) AC_ARG_WITH(afs, @@ -264,10 +289,10 @@ if test "$afs" != no -a "$oracle" != no; then $AFS_LIBS -lrx -llwp -lsys $AFS_EXTRA_LIBS) MR_DEFINE(HAVE_AFS) - AFS_SUBDIRS="incremental" - AFS_OUTPUT_FILES="incremental/Makefile" + AFS_SUBDIRS="afs" + AFS_OUTPUT_FILES="incremental/afs/Makefile" if test -d $srcdir/afssync; then - AFS_SUBDIRS="$AFS_SUBDIRS afssync" + AFS_SYNCDIR="afssync" AFS_OUTPUT_FILES="$AFS_OUTPUT_FILES afssync/Makefile" fi fi @@ -277,6 +302,7 @@ AC_SUBST(AFS_LIBS) AC_SUBST(AFS_EXTRA_LIBS) AC_SUBST(AFS_DIR) AC_SUBST(AFS_SUBDIRS) +AC_SUBST(AFS_SYNCDIR) # GNU readline AC_CHECKING(for GNU readline...) @@ -379,4 +405,5 @@ AC_OUTPUT(Makefile lib/Makefile include/Makefile clients/Makefile \ clients/mailmaint/Makefile clients/moira/Makefile \ clients/mrcheck/Makefile clients/mrtest/Makefile \ clients/stella/Makefile update/Makefile man/Makefile \ - $SERVER_OUTPUT_FILES $AFS_OUTPUT_FILES $RSAREF_OUTPUT_FILES) + $SERVER_OUTPUT_FILES $WINAD_OUTPUT_FILES $AFS_OUTPUT_FILES \ + $RSAREF_OUTPUT_FILES) -- 2.45.2