X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/9976f5e915e89650600dffc628b8f05f8bf4ef59..b227bf97b48044debde6ef0d192ae1611830ca42:/configure diff --git a/configure b/configure index a1cf1b24..5098aea6 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -17,14 +17,20 @@ ac_help="$ac_help --with-com_err=PREFIX Specify location of com_err" ac_help="$ac_help --with-krb4=PREFIX Specify location of krb4" +ac_help="$ac_help + --with-krb5=PREFIX Specify location of krb5 (for reg_svr)" ac_help="$ac_help --with-hesiod=PREFIX Specify location of Hesiod" ac_help="$ac_help --with-zephyr=PREFIX Specify location of Zephyr" ac_help="$ac_help - --with-gdss=PREFIX Specify location of GDSS" + --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-java=PREFIX Specify location of Java libs and headers" +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 @@ -67,6 +73,7 @@ mandir='${prefix}/man' # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 @@ -350,7 +357,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -520,9 +527,11 @@ 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' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross +ac_exeext= +ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -539,6 +548,70 @@ fi +ac_aux_dir= +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + + +# Make sure we can run config.sub. +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +fi + +echo $ac_n "checking host system type""... $ac_c" 1>&6 +echo "configure:578: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +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 + SO_LDFLAGS="-G" + ;; +irix*) + short_os=irix + SO_LDFLAGS="-shared" + ;; +linux*) + short_os=linux + SO_LDFLAGS="-shared" + ;; +esac + + @@ -548,15 +621,16 @@ 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:552: 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 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}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" @@ -577,16 +651,17 @@ 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:581: 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 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}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - for ac_dir in $PATH; do + ac_dummy="$PATH" + for ac_dir in $ac_dummy; 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 @@ -621,25 +696,61 @@ else echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # 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: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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +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 + ;; + esac + 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:629: 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. 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' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -cat > conftest.$ac_ext < conftest.$ac_ext << EOF + +#line 749 "configure" #include "confdefs.h" + main(){return(0);} EOF -if { (eval echo configure:643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 @@ -653,18 +764,24 @@ else ac_cv_prog_cc_works=no fi rm -fr conftest* +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${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross 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:663: 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:668: 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 @@ -673,7 +790,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:677: \"$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 @@ -684,11 +801,15 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6 if test $ac_cv_prog_gcc = yes; then GCC=yes - 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:692: checking whether ${CC-cc} accepts -g" >&5 +else + GCC= +fi + +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: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 @@ -703,36 +824,21 @@ rm -f conftest* 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 +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then CFLAGS="-g -O2" else - CFLAGS="-O2" + CFLAGS="-g" fi else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" -fi - -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -741,28 +847,30 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # 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:749: 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 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. - for ac_prog in ginstall installbsd scoinst install; do + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. - # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" @@ -792,20 +900,23 @@ echo "$ac_t""$INSTALL" 1>&6 # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + 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:801: 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 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" @@ -824,7 +935,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:828: 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 @@ -853,11 +964,43 @@ fi if test "$athena" = true; then enable_athena=yes - with_readline=/mit/gnu - unset with_com_err - prefix=/afs/athena.mit.edu/system/moira + prefix=/afs/.athena.mit.edu/system/moira bindir=$prefix/arch/$ATHENA_SYS/bin sbindir=$bindir + + + case $CPPFLAGS in + *-I/usr/athena/include*) ;; + *) CPPFLAGS=-I/usr/athena/include\ $CPPFLAGS ;; + esac + + + case $PRO_C_INCLUDES in + *INCLUDE=/usr/athena/include*) ;; + *) PRO_C_INCLUDES=INCLUDE=/usr/athena/include\ $PRO_C_INCLUDES ;; + esac + + + + + case $CPPFLAGS in + *-I/usr/athena/include/kerberosIV*) ;; + *) CPPFLAGS=-I/usr/athena/include/kerberosIV\ $CPPFLAGS ;; + esac + + + case $PRO_C_INCLUDES in + *INCLUDE=/usr/athena/include/kerberosIV*) ;; + *) PRO_C_INCLUDES=INCLUDE=/usr/athena/include/kerberosIV\ $PRO_C_INCLUDES ;; + esac + + + + case $LIBPATH in + *-L/usr/athena/lib*) ;; + *) LIBPATH=-L/usr/athena/lib\ $LIBPATH ;; + esac + fi # We currently just don't support changing this @@ -866,7 +1009,7 @@ mrbindir=/moira/bin # Athena-local policy decisions echo $ac_n "checking for Athena""... $ac_c" 1>&6 -echo "configure:870: 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" @@ -897,14 +1040,14 @@ fi # Networking libraries echo "checking network libraries..." 1>&6 -echo "configure:901: checking network libraries..." >&5 +echo "configure:1044: checking network libraries..." >&5 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:903: 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; 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 @@ -945,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:949: 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 @@ -953,7 +1096,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 @@ -990,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:994: 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 @@ -998,7 +1141,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 @@ -1041,12 +1184,12 @@ fi fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:1045: 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; 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 @@ -1087,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:1091: 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 @@ -1095,7 +1238,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 @@ -1132,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:1136: 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 @@ -1140,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; 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 @@ -1179,7 +1322,7 @@ fi # com_err (required, but can be built) echo $ac_n "checking for com_err""... $ac_c" 1>&6 -echo "configure:1183: 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" @@ -1241,9 +1384,9 @@ fi -# Kerberos (required) +# Kerberos (Kerberos 4 required, Kerberos 5 optional for reg_svr) echo $ac_n "checking for Kerberos 4""... $ac_c" 1>&6 -echo "configure:1247: 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" @@ -1309,16 +1452,88 @@ elif test -d /usr/include/kerberosIV; then fi +echo $ac_n "checking for main in -lk5crypto""... $ac_c" 1>&6 +echo "configure:1457: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lk5crypto $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + crypto="k5crypto" +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6 +echo "configure:1491: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lcrypto $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + crypto="crypto" +else + echo "$ac_t""no" 1>&6 +fi + +fi + echo $ac_n "checking for krb_rd_req in -lkrb4""... $ac_c" 1>&6 -echo "configure:1314: 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 else ac_save_LIBS="$LIBS" -LIBS="-lkrb4 $LIBPATH -ldes425 -lkrb5 -lcrypto $LIBS" +LIBS="-lkrb4 $LIBPATH -ldes425 -lkrb5 -l${crypto} -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 @@ -1344,11 +1559,11 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lcrypto" + KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -l${crypto}" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for krb_rd_req in -lkrb""... $ac_c" 1>&6 -echo "configure:1352: 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 @@ -1356,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; 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 @@ -1391,9 +1606,35 @@ fi fi +echo $ac_n "checking for Kerberos 5""... $ac_c" 1>&6 +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" + krb5="$withval" +else + krb5=no +fi + +echo "$ac_t""$krb5" 1>&6 +if test "$krb5" != no; then + REG_SVR_DEFS=-DKRB5 + if test "$krb5" != yes; then + REG_SVR_INCLUDES=-I$krb5/include + REG_SVR_LIBS=-L$krb5/lib + fi + REG_SVR_LIBS="$REG_SVR_LIBS -lkadm5clnt -lgssapi_krb5 -lgssrpc -ldyn -lkrb4 -ldes425 -lkrb5 -l${crypto}" +else + REG_SVR_DEFS=-DKRB4 + REG_SVR_LIBS=-lkadm +fi + + + + # Hesiod support echo $ac_n "checking for Hesiod""... $ac_c" 1>&6 -echo "configure:1397: 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" @@ -1427,12 +1668,12 @@ if test "$hesiod" != no; then fi echo $ac_n "checking for res_send""... $ac_c" 1>&6 -echo "configure:1431: 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; 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 @@ -1473,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:1477: 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 @@ -1481,7 +1722,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 @@ -1522,7 +1763,7 @@ fi fi echo $ac_n "checking for hes_resolve in -lhesiod""... $ac_c" 1>&6 -echo "configure:1526: 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 @@ -1530,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; 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 @@ -1578,7 +1819,7 @@ fi # Zephyr support echo $ac_n "checking for Zephyr""... $ac_c" 1>&6 -echo "configure:1582: 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" @@ -1612,7 +1853,7 @@ if test "$zephyr" != no; then fi echo $ac_n "checking for ZInitialize in -lzephyr""... $ac_c" 1>&6 -echo "configure:1616: 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 @@ -1620,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; 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 @@ -1666,47 +1907,44 @@ EOF fi -# GDSS support (default: build util/gdss if present) -echo $ac_n "checking for GDSS""... $ac_c" 1>&6 -echo "configure:1672: checking for GDSS" >&5 -# Check whether --with-gdss or --without-gdss was given. -if test "${with_gdss+set}" = set; then - withval="$with_gdss" - gdss="$withval" - GDSS_CPPFLAGS="-I$gdss/include" - GDSS_LIBS="-L$gdss/lib -lgdss" +# RSAREF support (default: build util/rsaref if present) +echo $ac_n "checking for RSAREF""... $ac_c" 1>&6 +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" + rsaref="$withval" + RSAREF_CPPFLAGS="-I$rsaref/include" + RSAREF_LIBS="$rsaref/lib/rsaref.a" else - if test -d $srcdir/util/gdss; then - gdss=$srcdir/util/gdss - GDSS_SUBDIR=util/gdss - GDSS_OUTPUT_FILES="util/gdss/Makefile util/gdss/lib/Makefile \ - util/gdss/lib/crypto/Makefile util/gdss/lib/crypto/bignum/Makefile \ - util/gdss/lib/crypto/algorithm/Makefile" - # autoconf can't deal with creating util/gdss if util doesn't exist + RSAREF_SUBDIRS=reg_svr + if test -d $srcdir/util/rsaref; then + rsaref=$srcdir/util/rsaref + RSAREF_SUBDIRS="util/rsaref reg_svr" + RSAREF_OUTPUT_FILES="util/rsaref/Makefile" + # autoconf can't deal with creating util/rsaref if util doesn't exist if test ! -d util; then mkdir util fi - GDSS_CPPFLAGS='-I$(SRCTOP)/util/gdss/include' - GDSS_LIBS='-L$(BUILDTOP)/util/gdss/lib -lgdss' + RSAREF_CPPFLAGS='-I$(SRCTOP)/util/rsaref' + RSAREF_LIBS='$(BUILDTOP)/util/rsaref/rsaref.a' + RSAREF_LIBDEP='$(BUILDTOP)/util/rsaref/rsaref.a' else - gdss=no + rsaref=no fi fi -echo "$ac_t""$gdss" 1>&6 -if test "$gdss" != no; then - GDSS_OBJS='$(GDSS_OBJS)' - GDSS_CFILES='$(GDSS_CFILES)' - GDSS_TARGET='$(GDSS_TARGET)' +echo "$ac_t""$rsaref" 1>&6 +if test "$rsaref" != no; then cat >> confdefs.h <<\EOF -#define HAVE_GDSS 1 +#define HAVE_RSAREF 1 EOF case $PRO_C_DEFS in - *DEFINE=HAVE_GDSS*) ;; - *) PRO_C_DEFS=DEFINE=HAVE_GDSS\ $PRO_C_DEFS ;; + *DEFINE=HAVE_RSAREF*) ;; + *) PRO_C_DEFS=DEFINE=HAVE_RSAREF\ $PRO_C_DEFS ;; esac @@ -1716,11 +1954,9 @@ fi - - # Oracle (default: yes, if $ORACLE_HOME is set) echo $ac_n "checking for Oracle""... $ac_c" 1>&6 -echo "configure:1724: 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" @@ -1735,22 +1971,117 @@ fi echo "$ac_t""$oracle" 1>&6 if test "$oracle" != no; then - SQL_LIBS="-L$oracle/lib -lsql $oracle/lib/osntab.o -lsqlnet -lora -lsqlnet -lnlsrtl -lcv6 -lcore -lnlsrtl -lcore -lm" + echo $ac_n "checking Pro*C version""... $ac_c" 1>&6 +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 + 2.0.6.0.0) + SQL_LIBS="-L$oracle/lib -lsql $oracle/lib/osntab.o -lsqlnet -lora -lsqlnet -lnlsrtl -lcv6 -lcore -lnlsrtl -lcore -lm" + ;; + 2.2.4.0.0) + SQL_LIBS="-L$oracle/lib -lclntsh -lxa -lsql -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric -lepc -lnlsrtl3 -lc3v6 -lcore3 -lnlsrtl3 -lcore3 -lnlsrtl3 `cat $oracle/rdbms/lib/sysliblist` -lm -lthread" + ;; + *) + SQL_LIBS="-L$oracle/lib -lclntsh -lsql8 -lclient8 -lcommon8 -lgeneric8 -lnls8 -lcore8 `cat $oracle/lib/sysliblist` -lm -lthread" + ;; + esac SVRSUBDIRS='$(SVRDIRS)' - SERVER_OUTPUT_FILES="db/Makefile server/Makefile afssync/Makefile backup/Makefile dbck/Makefile dcm/Makefile gen/Makefile incremental/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" +fi + + + + + + + +# Java support, for webmoira +echo $ac_n "checking for Java""... $ac_c" 1>&6 +echo "configure:2005: checking for Java" >&5 +# Check whether --with-java or --without-java was given. +if test "${with_java+set}" = set; then + withval="$with_java" + java="$withval" +else + if test -n "$JAVA_HOME" -a -d "$JAVA_HOME"; then + java=$JAVA_HOME + else + java=no + fi +fi + +echo "$ac_t""$java" 1>&6 +if test "$java" != no; then + if test "$java" != yes; then + JAVA_CPPFLAGS="-I$java/include -I$java/include/$short_os" + fi + + cat >> confdefs.h <<\EOF +#define HAVE_JAVA 1 +EOF + + + case $PRO_C_DEFS in + *DEFINE=HAVE_JAVA*) ;; + *) PRO_C_DEFS=DEFINE=HAVE_JAVA\ $PRO_C_DEFS ;; + esac + + + + WEBMOIRA_SUBDIRS="webmoira" + WEBMOIRA_OUTPUT_FILES="webmoira/Makefile" fi +# LDAP support +echo $ac_n "checking for LDAP""... $ac_c" 1>&6 +echo "configure:2044: 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:1754: checking for AFS" >&5 +echo "configure:2085: checking for AFS" >&5 # Check whether --with-afs or --without-afs was given. if test "${with_afs+set}" = set; then withval="$with_afs" @@ -1768,12 +2099,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:1772: checking for insque" >&5 +echo "configure:2103: 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; then +if { (eval echo configure:2131: \"$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 @@ -1814,7 +2145,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:1818: checking for insque in -lcompat" >&5 +echo "configure:2149: 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 @@ -1822,7 +2153,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcompat $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2168: \"$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 @@ -1857,12 +2188,12 @@ fi fi echo $ac_n "checking for sigvec""... $ac_c" 1>&6 -echo "configure:1861: checking for sigvec" >&5 +echo "configure:2192: 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; then +if { (eval echo configure:2220: \"$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 @@ -1903,7 +2234,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:1907: checking for sigvec in -lucb" >&5 +echo "configure:2238: 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 @@ -1911,7 +2242,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; then +if { (eval echo configure:2257: \"$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 @@ -1946,7 +2277,7 @@ fi fi echo $ac_n "checking for pioctl in -lsys""... $ac_c" 1>&6 -echo "configure:1950: checking for pioctl in -lsys" >&5 +echo "configure:2281: 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 @@ -1954,7 +2285,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; then +if { (eval echo configure:2300: \"$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 @@ -1998,6 +2329,13 @@ EOF esac + + AFS_SUBDIRS="afs" + AFS_OUTPUT_FILES="incremental/afs/Makefile" + if test -d $srcdir/afssync; then + AFS_SYNCDIR="afssync" + AFS_OUTPUT_FILES="$AFS_OUTPUT_FILES afssync/Makefile" + fi fi @@ -2005,16 +2343,18 @@ fi + + # GNU readline echo "checking for GNU readline..." 1>&6 -echo "configure:2011: checking for GNU readline..." >&5 +echo "configure:2351: 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" + readline="$withval"; echo "$ac_t""$withval" 1>&6 else echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:2018: checking for readline in -lreadline" >&5 +echo "configure:2358: 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 @@ -2022,7 +2362,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline -ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2377: \"$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 @@ -2051,16 +2391,61 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then readline=yes else echo "$ac_t""no" 1>&6 +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:2398: 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 +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 + 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 +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + readline=/mit/gnu +else + echo "$ac_t""no" 1>&6 : fi + fi +fi + fi if test "$readline" != no; then if test "$readline" != yes; then - READLINE_CPPFLAGS="-I$readline/include/readline -DHAVE_READLINE" - READLINE_LIBS="-L$readline/lib -lreadline -ltermcap" + READLINE_CPPFLAGS="-I$readline/include" + READLINE_LIBS="-L$readline/lib" fi + READLINE_CPPFLAGS="$READLINE_CPPFLAGS -DHAVE_READLINE" + READLINE_LIBS="$READLINE_LIBS -lreadline -ltermcap" fi @@ -2068,9 +2453,9 @@ fi # Curses curses=curses echo "checking for curses" 1>&6 -echo "configure:2072: checking for curses" >&5 +echo "configure:2457: checking for curses" >&5 echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 -echo "configure:2074: checking for main in -lcurses" >&5 +echo "configure:2459: 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 @@ -2078,14 +2463,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2474: \"$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 @@ -2104,7 +2489,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:2108: checking for main in -lncurses" >&5 +echo "configure:2493: 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 @@ -2112,14 +2497,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2508: \"$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 @@ -2145,12 +2530,12 @@ if test -n "$curses"; then OLDLIBS=$LIBS LIBS=-l$curses echo "checking if curses needs termcap" 1>&6 -echo "configure:2149: checking if curses needs termcap" >&5 +echo "configure:2534: checking if curses needs termcap" >&5 if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < main(int argc, char **argv) @@ -2160,7 +2545,7 @@ else return 0; } EOF -if { (eval echo configure:2164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2549: \"$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 @@ -2172,7 +2557,7 @@ else : else cat > conftest.$ac_ext < main(int argc, char **argv) @@ -2182,7 +2567,7 @@ else return 0; } EOF -if { (eval echo configure:2186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2571: \"$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 @@ -2204,14 +2589,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:2215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* : else @@ -2219,14 +2604,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:2230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* CURSES_CPPFLAGS="-D'getmaxx(w)=w->_maxx'" else @@ -2237,6 +2622,22 @@ else fi rm -f conftest* fi +rm -f conftest* + cat > conftest.$ac_ext < +int main() { +newterm(NULL, NULL, NULL); +; return 0; } +EOF +if { (eval echo configure:2635: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi rm -f conftest* LIBS=$OLDLIBS CURSES_CPPFLAGS="-DHAVE_CURSES $CURSES_CPPFLAGS" @@ -2249,15 +2650,15 @@ fi -for ac_func in getusershell +for ac_func in getusershell strlcpy strlcat uname strvis do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2256: checking for $ac_func" >&5 +echo "configure:2657: 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:2685: \"$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 @@ -2305,8 +2706,60 @@ fi done +echo $ac_n "checking for sigaction""... $ac_c" 1>&6 +echo "configure:2711: 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 < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char sigaction(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_sigaction) || defined (__stub___sigaction) +choke me +#else +sigaction(); +#endif + +; return 0; } +EOF +if { (eval echo configure:2739: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_sigaction=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'sigaction`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_POSIX_SIGNALS 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2310: checking how to run the C preprocessor" >&5 +echo "configure:2763: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2321,14 +2774,14 @@ 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:2331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:2784: \"$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 : else @@ -2338,14 +2791,31 @@ 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:2348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:2801: \"$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 + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + 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:2818: \"$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 : else @@ -2357,6 +2827,8 @@ else fi rm -f conftest* fi +rm -f conftest* +fi rm -f conftest* ac_cv_prog_CPP="$CPP" fi @@ -2366,20 +2838,22 @@ else fi echo "$ac_t""$CPP" 1>&6 -ac_safe=`echo "crypt.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for crypt.h""... $ac_c" 1>&6 -echo "configure:2372: checking for crypt.h" >&5 +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:2846: 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 < +#include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:2856: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -2394,101 +2868,82 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - CRYPT_CPPFLAGS=-DHAVE_CRYPT_H + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi +done + -echo $ac_n "checking for crypt""... $ac_c" 1>&6 -echo "configure:2404: checking for crypt" >&5 -if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then +ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6 +echo "configure:2885: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char crypt(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_crypt) || defined (__stub___crypt) -choke me -#else -crypt(); -#endif - -; return 0; } +#include EOF -if { (eval echo configure:2432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2895: \"$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* - eval "ac_cv_func_crypt=yes" + 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_func_crypt=no" + eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* fi - -if eval "test \"`echo '$ac_cv_func_'crypt`\" = yes"; then +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - : + cat >> confdefs.h <<\EOF +#define HAVE_NETINET_IN_H 1 +EOF + else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:2450: checking for crypt in -lcrypt" >&5 -ac_lib_var=`echo crypt'_'crypt | 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 <&6 +echo "configure:2923: checking for in_addr_t defined in netinet/in.h" >&5 + cat > conftest.$ac_ext < EOF -if { (eval echo configure:2469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "in_addr_t" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + ac_cv_type_in_addr_t=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_type_in_addr_t=no fi rm -f conftest* -LIBS="$ac_save_LIBS" + echo "$ac_t""$ac_cv_type_in_addr_t" 1>&6 fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - CRYPT_LIBS=-lcrypt -else - echo "$ac_t""no" 1>&6 -fi - -fi - +if test "$ac_cv_type_in_addr_t" != "yes"; then + cat >> confdefs.h <<\EOF +#define in_addr_t uint32_t +EOF +fi case $PRO_C_INCLUDES in @@ -2571,6 +3026,9 @@ KLIBS="-lzephyr $KRB4_LIBS -lcom_err -lhesiod $LIBS" LIBS="-lmoira $KLIBS" +MR_LIBDEP='$(BUILDTOP)/lib/libmoira.a' + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -2594,7 +3052,7 @@ EOF # 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 | - case `(ac_space=' '; set) 2>&1` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -2673,7 +3131,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.12" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -2685,12 +3143,15 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "Makefile lib/Makefile include/Makefile clients/Makefile \ - clients/addusr/Makefile clients/blanche/Makefile \ + clients/lib/Makefile clients/addusr/Makefile \ + clients/blanche/Makefile clients/chfn/Makefile \ + clients/chpobox/Makefile clients/chsh/Makefile \ clients/mailmaint/Makefile clients/moira/Makefile \ clients/mrcheck/Makefile clients/mrtest/Makefile \ - clients/passwd/Makefile clients/userreg/Makefile \ - update/Makefile man/Makefile \ - $SERVER_OUTPUT_FILES $GDSS_OUTPUT_FILES" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + clients/stanley/Makefile clients/stella/Makefile \ + update/Makefile man/Makefile $WEBMOIRA_OUTPUT_FILES \ + $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 < conftest.subs <<\\CEOF $ac_vpsub $extrasub +s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g @@ -2720,8 +3183,15 @@ s%@includedir@%$includedir%g s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@host@%$host%g +s%@host_alias@%$host_alias%g +s%@host_cpu@%$host_cpu%g +s%@host_vendor@%$host_vendor%g +s%@host_os@%$host_os%g +s%@SO_LDFLAGS@%$SO_LDFLAGS%g s%@CC@%$CC%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@RANLIB@%$RANLIB%g s%@SET_MAKE@%$SET_MAKE%g @@ -2729,32 +3199,39 @@ s%@mrbindir@%$mrbindir%g s%@subdirs@%$subdirs%g s%@COM_ERR_SUBDIR@%$COM_ERR_SUBDIR%g s%@COMPILE_ET@%$COMPILE_ET%g -s%@GDSS_CPPFLAGS@%$GDSS_CPPFLAGS%g -s%@GDSS_LIBS@%$GDSS_LIBS%g -s%@GDSS_SUBDIR@%$GDSS_SUBDIR%g -s%@GDSS_OBJS@%$GDSS_OBJS%g -s%@GDSS_CFILES@%$GDSS_CFILES%g -s%@GDSS_TARGET@%$GDSS_TARGET%g +s%@REG_SVR_DEFS@%$REG_SVR_DEFS%g +s%@REG_SVR_INCLUDES@%$REG_SVR_INCLUDES%g +s%@REG_SVR_LIBS@%$REG_SVR_LIBS%g +s%@RSAREF_CPPFLAGS@%$RSAREF_CPPFLAGS%g +s%@RSAREF_LIBS@%$RSAREF_LIBS%g +s%@RSAREF_SUBDIRS@%$RSAREF_SUBDIRS%g +s%@RSAREF_LIBDEP@%$RSAREF_LIBDEP%g s%@PRO_C@%$PRO_C%g s%@PRO_C_DEFS@%$PRO_C_DEFS%g s%@PRO_C_INCLUDES@%$PRO_C_INCLUDES%g 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 s%@AFS_CPPFLAGS@%$AFS_CPPFLAGS%g s%@AFS_PRO_C_INCLUDES@%$AFS_PRO_C_INCLUDES%g s%@AFS_LIBS@%$AFS_LIBS%g s%@AFS_EXTRA_LIBS@%$AFS_EXTRA_LIBS%g s%@AFS_DIR@%$AFS_DIR%g +s%@AFS_SUBDIRS@%$AFS_SUBDIRS%g +s%@AFS_SYNCDIR@%$AFS_SYNCDIR%g s%@READLINE_CPPFLAGS@%$READLINE_CPPFLAGS%g s%@READLINE_LIBS@%$READLINE_LIBS%g s%@CURSES_CPPFLAGS@%$CURSES_CPPFLAGS%g s%@CURSES_LIBS@%$CURSES_LIBS%g s%@CURSES_SUBDIRS@%$CURSES_SUBDIRS%g s%@CPP@%$CPP%g -s%@CRYPT_CPPFLAGS@%$CRYPT_CPPFLAGS%g -s%@CRYPT_LIBS@%$CRYPT_LIBS%g s%@KLIBS@%$KLIBS%g +s%@MR_LIBDEP@%$MR_LIBDEP%g CEOF EOF @@ -2797,12 +3274,15 @@ EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then