From 7f7f279f9e287e120179ccdfde2fd9d5e9a68d88 Mon Sep 17 00:00:00 2001 From: danw Date: Sat, 1 Aug 1998 18:03:00 +0000 Subject: [PATCH] check for com_err before kerberos since we need it to check for krb4 as krb5 compat. check for krb5 for new reg_svr --- configure | 368 ++++++++++++++++++++++++++++----------------------- configure.in | 66 +++++---- 2 files changed, 242 insertions(+), 192 deletions(-) diff --git a/configure b/configure index 6136d0c6..501f7433 100755 --- a/configure +++ b/configure @@ -13,10 +13,12 @@ ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help --enable-athena Enable Athena-specific policy decisions" +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-com_err=PREFIX Specify location of com_err" + --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 @@ -550,7 +552,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:554: checking for $ac_word" >&5 +echo "configure:556: 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 @@ -579,7 +581,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:583: checking for $ac_word" >&5 +echo "configure:585: 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 @@ -627,7 +629,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:631: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:633: 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. @@ -637,11 +639,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -661,12 +663,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:665: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:667: 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:670: checking whether we are using GNU C" >&5 +echo "configure:672: 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 @@ -675,7 +677,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:679: \"$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:681: \"$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 @@ -690,7 +692,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:694: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:696: 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 @@ -747,7 +749,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:751: checking for a BSD compatible install" >&5 +echo "configure:753: 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 @@ -799,7 +801,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:803: checking for $ac_word" >&5 +echo "configure:805: 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 @@ -826,7 +828,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:830: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:832: 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 @@ -868,7 +870,7 @@ mrbindir=/moira/bin # Athena-local policy decisions echo $ac_n "checking for Athena""... $ac_c" 1>&6 -echo "configure:872: checking for Athena" >&5 +echo "configure:874: checking for Athena" >&5 # Check whether --enable-athena or --disable-athena was given. if test "${enable_athena+set}" = set; then enableval="$enable_athena" @@ -899,14 +901,14 @@ fi # Networking libraries echo "checking network libraries..." 1>&6 -echo "configure:903: checking network libraries..." >&5 +echo "configure:905: checking network libraries..." >&5 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:905: checking for gethostbyname" >&5 +echo "configure:907: 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:935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -947,7 +949,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:951: checking for gethostbyname in -lnsl" >&5 +echo "configure:953: 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 @@ -955,7 +957,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:972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -992,7 +994,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6 -echo "configure:996: checking for gethostbyname in -lresolv" >&5 +echo "configure:998: 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 @@ -1000,7 +1002,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:1017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1043,12 +1045,12 @@ fi fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:1047: checking for socket" >&5 +echo "configure:1049: 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:1077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -1089,7 +1091,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:1093: checking for socket in -lsocket" >&5 +echo "configure:1095: 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 @@ -1097,7 +1099,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:1114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1134,7 +1136,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:1138: checking for socket in -lsocket" >&5 +echo "configure:1140: 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 @@ -1142,7 +1144,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:1159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1179,9 +1181,73 @@ fi fi -# Kerberos (required) +# com_err (required, but can be built) +echo $ac_n "checking for com_err""... $ac_c" 1>&6 +echo "configure:1187: 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" + echo "$ac_t""$withval" 1>&6 + if test $withval = "no"; then + { echo "configure: error: com_err is required for Moira" 1>&2; exit 1; } + fi + if test $withval != "yes"; then + + + case $CPPFLAGS in + *-I$withval/include*) ;; + *) CPPFLAGS=-I$withval/include\ $CPPFLAGS ;; + esac + + + case $PRO_C_INCLUDES in + *INCLUDE=$withval/include*) ;; + *) PRO_C_INCLUDES=INCLUDE=$withval/include\ $PRO_C_INCLUDES ;; + esac + + + + case $LIBPATH in + *-L$withval/lib*) ;; + *) LIBPATH=-L$withval/lib\ $LIBPATH ;; + esac + + fi + COMPILE_ET=compile_et +else + echo "$ac_t""util/et" 1>&6 + COM_ERR_SUBDIR=util/et; + + + case $CPPFLAGS in + *-I`pwd`/util/et*) ;; + *) CPPFLAGS=-I`pwd`/util/et\ $CPPFLAGS ;; + esac + + + case $PRO_C_INCLUDES in + *INCLUDE=`pwd`/util/et*) ;; + *) PRO_C_INCLUDES=INCLUDE=`pwd`/util/et\ $PRO_C_INCLUDES ;; + esac + + + + case $LIBPATH in + *-L`pwd`/util/et*) ;; + *) LIBPATH=-L`pwd`/util/et\ $LIBPATH ;; + esac + + COMPILE_ET=`pwd`/util/et/compile_et + subdirs="$COM_ERR_SUBDIR" + +fi + + + + +# Kerberos (Kerberos 4 required, Kerberos 5 optional for reg_svr) echo $ac_n "checking for Kerberos 4""... $ac_c" 1>&6 -echo "configure:1185: checking for Kerberos 4" >&5 +echo "configure:1251: checking for Kerberos 4" >&5 # Check whether --with-krb4 or --without-krb4 was given. if test "${with_krb4+set}" = set; then withval="$with_krb4" @@ -1248,15 +1314,15 @@ elif test -d /usr/include/kerberosIV; then fi echo $ac_n "checking for krb_rd_req in -lkrb4""... $ac_c" 1>&6 -echo "configure:1252: checking for krb_rd_req in -lkrb4" >&5 +echo "configure:1318: 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 -lcrypto -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1286,7 +1352,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:1290: checking for krb_rd_req in -lkrb" >&5 +echo "configure:1356: 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 @@ -1294,7 +1360,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:1375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1329,65 +1395,26 @@ fi fi -# com_err (required, but can be built) -echo $ac_n "checking for com_err""... $ac_c" 1>&6 -echo "configure:1335: 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" - echo "$ac_t""$withval" 1>&6 - if test $withval = "no"; then - { echo "configure: error: com_err is required for Moira" 1>&2; exit 1; } - fi - if test $withval != "yes"; then - - - case $CPPFLAGS in - *-I$withval/include*) ;; - *) CPPFLAGS=-I$withval/include\ $CPPFLAGS ;; - esac - - - case $PRO_C_INCLUDES in - *INCLUDE=$withval/include*) ;; - *) PRO_C_INCLUDES=INCLUDE=$withval/include\ $PRO_C_INCLUDES ;; - esac - - - - case $LIBPATH in - *-L$withval/lib*) ;; - *) LIBPATH=-L$withval/lib\ $LIBPATH ;; - esac - - fi - COMPILE_ET=compile_et +echo $ac_n "checking for Kerberos 5""... $ac_c" 1>&6 +echo "configure:1400: 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 - echo "$ac_t""util/et" 1>&6 - COM_ERR_SUBDIR=util/et; - - - case $CPPFLAGS in - *-I`pwd`/util/et*) ;; - *) CPPFLAGS=-I`pwd`/util/et\ $CPPFLAGS ;; - esac - - - case $PRO_C_INCLUDES in - *INCLUDE=`pwd`/util/et*) ;; - *) PRO_C_INCLUDES=INCLUDE=`pwd`/util/et\ $PRO_C_INCLUDES ;; - esac - - - - case $LIBPATH in - *-L`pwd`/util/et*) ;; - *) LIBPATH=-L`pwd`/util/et\ $LIBPATH ;; - esac - - COMPILE_ET=`pwd`/util/et/compile_et - subdirs="$COM_ERR_SUBDIR" + 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 -lcrypto" +else + REG_SVR_DEFS=-DKRB4 fi @@ -1395,7 +1422,7 @@ fi # Hesiod support echo $ac_n "checking for Hesiod""... $ac_c" 1>&6 -echo "configure:1399: checking for Hesiod" >&5 +echo "configure:1426: checking for Hesiod" >&5 # Check whether --with-hesiod or --without-hesiod was given. if test "${with_hesiod+set}" = set; then withval="$with_hesiod" @@ -1429,12 +1456,12 @@ if test "$hesiod" != no; then fi echo $ac_n "checking for res_send""... $ac_c" 1>&6 -echo "configure:1433: checking for res_send" >&5 +echo "configure:1460: 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:1488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_res_send=yes" else @@ -1475,7 +1502,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:1479: checking for res_send in -lresolv" >&5 +echo "configure:1506: 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 @@ -1483,7 +1510,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:1525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1524,7 +1551,7 @@ fi fi echo $ac_n "checking for hes_resolve in -lhesiod""... $ac_c" 1>&6 -echo "configure:1528: checking for hes_resolve in -lhesiod" >&5 +echo "configure:1555: 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 @@ -1532,7 +1559,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:1574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1580,7 +1607,7 @@ fi # Zephyr support echo $ac_n "checking for Zephyr""... $ac_c" 1>&6 -echo "configure:1584: checking for Zephyr" >&5 +echo "configure:1611: checking for Zephyr" >&5 # Check whether --with-zephyr or --without-zephyr was given. if test "${with_zephyr+set}" = set; then withval="$with_zephyr" @@ -1614,7 +1641,7 @@ if test "$zephyr" != no; then fi echo $ac_n "checking for ZInitialize in -lzephyr""... $ac_c" 1>&6 -echo "configure:1618: checking for ZInitialize in -lzephyr" >&5 +echo "configure:1645: 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 @@ -1622,7 +1649,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:1664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1670,7 +1697,7 @@ fi # GDSS support (default: build util/gdss if present) echo $ac_n "checking for GDSS""... $ac_c" 1>&6 -echo "configure:1674: checking for GDSS" >&5 +echo "configure:1701: checking for GDSS" >&5 # Check whether --with-gdss or --without-gdss was given. if test "${with_gdss+set}" = set; then withval="$with_gdss" @@ -1722,7 +1749,7 @@ fi # RSAREF support (default: build util/rsaref if present) echo $ac_n "checking for RSAREF""... $ac_c" 1>&6 -echo "configure:1726: checking for RSAREF" >&5 +echo "configure:1753: checking for RSAREF" >&5 # Check whether --with-rsaref or --without-rsaref was given. if test "${with_rsaref+set}" = set; then withval="$with_rsaref" @@ -1767,7 +1794,7 @@ fi # Oracle (default: yes, if $ORACLE_HOME is set) echo $ac_n "checking for Oracle""... $ac_c" 1>&6 -echo "configure:1771: checking for Oracle" >&5 +echo "configure:1798: checking for Oracle" >&5 # Check whether --with-oracle or --without-oracle was given. if test "${with_oracle+set}" = set; then withval="$with_oracle" @@ -1797,7 +1824,7 @@ fi # AFS support echo $ac_n "checking for AFS""... $ac_c" 1>&6 -echo "configure:1801: checking for AFS" >&5 +echo "configure:1828: checking for AFS" >&5 # Check whether --with-afs or --without-afs was given. if test "${with_afs+set}" = set; then withval="$with_afs" @@ -1815,12 +1842,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:1819: checking for insque" >&5 +echo "configure:1846: 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:1874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_insque=yes" else @@ -1861,7 +1888,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:1865: checking for insque in -lcompat" >&5 +echo "configure:1892: 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 @@ -1869,7 +1896,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:1911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1904,12 +1931,12 @@ fi fi echo $ac_n "checking for sigvec""... $ac_c" 1>&6 -echo "configure:1908: checking for sigvec" >&5 +echo "configure:1935: 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:1963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_sigvec=yes" else @@ -1950,7 +1977,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:1954: checking for sigvec in -lucb" >&5 +echo "configure:1981: 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 @@ -1958,7 +1985,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:2000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1993,7 +2020,7 @@ fi fi echo $ac_n "checking for pioctl in -lsys""... $ac_c" 1>&6 -echo "configure:1997: checking for pioctl in -lsys" >&5 +echo "configure:2024: 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 @@ -2001,7 +2028,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:2043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2054,14 +2081,14 @@ fi # GNU readline echo "checking for GNU readline..." 1>&6 -echo "configure:2058: checking for GNU readline..." >&5 +echo "configure:2085: 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" else echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:2065: checking for readline in -lreadline" >&5 +echo "configure:2092: 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 @@ -2069,7 +2096,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:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2115,9 +2142,9 @@ fi # Curses curses=curses echo "checking for curses" 1>&6 -echo "configure:2119: checking for curses" >&5 +echo "configure:2146: checking for curses" >&5 echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 -echo "configure:2121: checking for main in -lcurses" >&5 +echo "configure:2148: 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 @@ -2125,14 +2152,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:2163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2151,7 +2178,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:2155: checking for main in -lncurses" >&5 +echo "configure:2182: 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 @@ -2159,14 +2186,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:2197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2192,12 +2219,12 @@ if test -n "$curses"; then OLDLIBS=$LIBS LIBS=-l$curses echo "checking if curses needs termcap" 1>&6 -echo "configure:2196: checking if curses needs termcap" >&5 +echo "configure:2223: checking if curses needs termcap" >&5 if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < main(int argc, char **argv) @@ -2207,7 +2234,7 @@ else return 0; } EOF -if { (eval echo configure:2211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then CURSES_LIBS="-l$curses" else @@ -2219,7 +2246,7 @@ else : else cat > conftest.$ac_ext < main(int argc, char **argv) @@ -2229,7 +2256,7 @@ else return 0; } EOF -if { (eval echo configure:2233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then CURSES_LIBS="-l$curses -ltermcap" else @@ -2251,14 +2278,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:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* : else @@ -2266,14 +2293,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:2277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* CURSES_CPPFLAGS="-D'getmaxx(w)=w->_maxx'" else @@ -2299,12 +2326,12 @@ fi for ac_func in getusershell do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2303: checking for $ac_func" >&5 +echo "configure:2330: 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:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2353,7 +2380,7 @@ done echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2357: checking how to run the C preprocessor" >&5 +echo "configure:2384: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2368,13 +2395,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:2378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -2385,13 +2412,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:2395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -2415,17 +2442,17 @@ 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:2419: checking for crypt.h" >&5 +echo "configure:2446: checking for crypt.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2447,12 +2474,12 @@ else fi echo $ac_n "checking for crypt""... $ac_c" 1>&6 -echo "configure:2451: checking for crypt" >&5 +echo "configure:2478: checking for crypt" >&5 if eval "test \"`echo '$''{'ac_cv_func_crypt'+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:2506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_crypt=yes" else @@ -2493,7 +2520,7 @@ if eval "test \"`echo '$ac_cv_func_'crypt`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:2497: checking for crypt in -lcrypt" >&5 +echo "configure:2524: 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 @@ -2501,7 +2528,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2776,6 +2803,9 @@ s%@mrbindir@%$mrbindir%g s%@subdirs@%$subdirs%g s%@COM_ERR_SUBDIR@%$COM_ERR_SUBDIR%g s%@COMPILE_ET@%$COMPILE_ET%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%@GDSS_CPPFLAGS@%$GDSS_CPPFLAGS%g s%@GDSS_LIBS@%$GDSS_LIBS%g s%@GDSS_SUBDIR@%$GDSS_SUBDIR%g diff --git a/configure.in b/configure.in index 08e296bc..f33162d3 100755 --- a/configure.in +++ b/configure.in @@ -68,7 +68,29 @@ AC_CHECK_FUNC(socket, :, LIBS="-lsocket -lnsl $LIBS", :, -lnsl))) -# Kerberos (required) +# com_err (required, but can be built) +AC_MSG_CHECKING(for com_err) +AC_ARG_WITH(com_err, + [ --with-com_err=PREFIX Specify location of com_err], + [AC_MSG_RESULT($withval) + if test $withval = "no"; then + AC_MSG_ERROR(com_err is required for Moira) + fi + if test $withval != "yes"; then + MR_INCLUDE($withval/include) + MR_LIBS($withval/lib) + fi + COMPILE_ET=compile_et], + [AC_MSG_RESULT(util/et) + COM_ERR_SUBDIR=util/et; + MR_INCLUDE(`pwd`/util/et) + MR_LIBS(`pwd`/util/et) + COMPILE_ET=`pwd`/util/et/compile_et + AC_CONFIG_SUBDIRS($COM_ERR_SUBDIR)]) +AC_SUBST(COM_ERR_SUBDIR) +AC_SUBST(COMPILE_ET) + +# Kerberos (Kerberos 4 required, Kerberos 5 optional for reg_svr) AC_MSG_CHECKING(for Kerberos 4) AC_ARG_WITH(krb4, [ --with-krb4=PREFIX Specify location of krb4], @@ -92,29 +114,27 @@ AC_CHECK_LIB(krb4, krb_rd_req, [KRB4_LIBS="-lkrb -ldes"], [AC_MSG_ERROR(Kerberos 4 libraries not found)], $LIBPATH -ldes)], - $LIBPATH -ldes425 -lkrb5 -lcrypto) + $LIBPATH -ldes425 -lkrb5 -lcrypto -lcom_err) -# com_err (required, but can be built) -AC_MSG_CHECKING(for com_err) -AC_ARG_WITH(com_err, - [ --with-com_err=PREFIX Specify location of com_err], - [AC_MSG_RESULT($withval) - if test $withval = "no"; then - AC_MSG_ERROR(com_err is required for Moira) - fi - if test $withval != "yes"; then - MR_INCLUDE($withval/include) - MR_LIBS($withval/lib) - fi - COMPILE_ET=compile_et], - [AC_MSG_RESULT(util/et) - COM_ERR_SUBDIR=util/et; - MR_INCLUDE(`pwd`/util/et) - MR_LIBS(`pwd`/util/et) - COMPILE_ET=`pwd`/util/et/compile_et - AC_CONFIG_SUBDIRS($COM_ERR_SUBDIR)]) -AC_SUBST(COM_ERR_SUBDIR) -AC_SUBST(COMPILE_ET) +AC_MSG_CHECKING(for Kerberos 5) +AC_ARG_WITH(krb5, + [ --with-krb5=PREFIX Specify location of krb5 (for reg_svr)], + [krb5="$withval"], [krb5=no]) +AC_MSG_RESULT($krb5) +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 -lcrypto" +else + REG_SVR_DEFS=-DKRB4 + REG_SVR_LIBS=-lkadm +fi +AC_SUBST(REG_SVR_DEFS) +AC_SUBST(REG_SVR_INCLUDES) +AC_SUBST(REG_SVR_LIBS) # Hesiod support AC_MSG_CHECKING(for Hesiod) -- 2.45.2