From 33567bea36ccfed720f2fc05882d874bf1b80329 Mon Sep 17 00:00:00 2001 From: danw Date: Wed, 22 Jul 1998 14:55:54 +0000 Subject: [PATCH] update to build rsaref and new reg_svr --- Makefile.in | 3 +- configure | 402 +++++++++++++++++++++++++++++---------------------- configure.in | 75 +++++++--- 3 files changed, 280 insertions(+), 200 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8c5460d7..179f149e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,7 +13,8 @@ mandir=@mandir@ mrbindir=@mrbindir@ CLIENTDIRS=@GDSS_SUBDIR@ include lib clients update man -SVRDIRS=db server backup dbck dcm gen reg_svr incremental regtape afssync +SVRDIRS=db server backup dbck dcm gen incremental regtape \ + afssync @RSAREF_SUBDIRS@ DEPDIRS=@COM_ERR_SUBDIR@ SUBDIRS=$(CLIENTDIRS) @SVRSUBDIRS@ diff --git a/configure b/configure index a1cf1b24..6136d0c6 100755 --- a/configure +++ b/configure @@ -13,16 +13,18 @@ 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" 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" +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 @@ -548,7 +550,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:552: checking for $ac_word" >&5 +echo "configure:554: 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 @@ -577,7 +579,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:581: checking for $ac_word" >&5 +echo "configure:583: 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 @@ -625,7 +627,7 @@ fi 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:631: 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. @@ -635,11 +637,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:645: \"$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 @@ -659,12 +661,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:663: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:665: 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:670: 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 +675,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:679: \"$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 @@ -688,7 +690,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:692: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:694: 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 @@ -745,7 +747,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:749: checking for a BSD compatible install" >&5 +echo "configure:751: 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 @@ -797,7 +799,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:801: checking for $ac_word" >&5 +echo "configure:803: 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 @@ -824,7 +826,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:830: 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 @@ -866,7 +868,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:872: 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 +899,14 @@ fi # Networking libraries echo "checking network libraries..." 1>&6 -echo "configure:901: checking network libraries..." >&5 +echo "configure:903: checking network libraries..." >&5 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:903: checking for gethostbyname" >&5 +echo "configure:905: 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:933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -945,7 +947,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:951: 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 +955,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:970: \"$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 @@ -990,7 +992,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:996: 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 +1000,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:1015: \"$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 @@ -1041,12 +1043,12 @@ fi fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:1045: checking for socket" >&5 +echo "configure:1047: 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:1075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -1087,7 +1089,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:1093: 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 +1097,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:1112: \"$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 @@ -1132,7 +1134,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:1138: 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 +1142,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:1157: \"$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 @@ -1177,73 +1179,9 @@ fi 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 -# 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 (required) echo $ac_n "checking for Kerberos 4""... $ac_c" 1>&6 -echo "configure:1247: checking for Kerberos 4" >&5 +echo "configure:1185: checking for Kerberos 4" >&5 # Check whether --with-krb4 or --without-krb4 was given. if test "${with_krb4+set}" = set; then withval="$with_krb4" @@ -1310,7 +1248,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:1314: checking for krb_rd_req in -lkrb4" >&5 +echo "configure:1252: 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 @@ -1318,7 +1256,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb4 $LIBPATH -ldes425 -lkrb5 -lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1271: \"$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 @@ -1348,7 +1286,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:1352: checking for krb_rd_req in -lkrb" >&5 +echo "configure:1290: 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 +1294,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:1309: \"$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 @@ -1391,9 +1329,73 @@ 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 +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 + + + + # Hesiod support echo $ac_n "checking for Hesiod""... $ac_c" 1>&6 -echo "configure:1397: checking for Hesiod" >&5 +echo "configure:1399: 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 +1429,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:1433: 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:1461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_res_send=yes" else @@ -1473,7 +1475,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:1479: 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 +1483,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:1498: \"$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 @@ -1522,7 +1524,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:1528: 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 +1532,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:1547: \"$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 @@ -1578,7 +1580,7 @@ fi # Zephyr support echo $ac_n "checking for Zephyr""... $ac_c" 1>&6 -echo "configure:1582: checking for Zephyr" >&5 +echo "configure:1584: 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 +1614,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:1618: 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 +1622,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:1637: \"$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 @@ -1668,7 +1670,7 @@ 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 +echo "configure:1674: checking for GDSS" >&5 # Check whether --with-gdss or --without-gdss was given. if test "${with_gdss+set}" = set; then withval="$with_gdss" @@ -1718,9 +1720,54 @@ 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 +# 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 + 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 + RSAREF_CPPFLAGS="-I$(SRCTOP)/util/rsaref" + RSAREF_LIBS='$(BUILDTOP)/util/rsaref/rsaref.a' + else + rsaref=no + fi +fi + +echo "$ac_t""$rsaref" 1>&6 +if test "$rsaref" != no; then + + cat >> confdefs.h <<\EOF +#define HAVE_RSAREF 1 +EOF + + + case $PRO_C_DEFS in + *DEFINE=HAVE_RSAREF*) ;; + *) PRO_C_DEFS=DEFINE=HAVE_RSAREF\ $PRO_C_DEFS ;; + esac + + +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:1771: checking for Oracle" >&5 # Check whether --with-oracle or --without-oracle was given. if test "${with_oracle+set}" = set; then withval="$with_oracle" @@ -1750,7 +1797,7 @@ fi # AFS support echo $ac_n "checking for AFS""... $ac_c" 1>&6 -echo "configure:1754: checking for AFS" >&5 +echo "configure:1801: 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 +1815,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:1819: 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:1847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_insque=yes" else @@ -1814,7 +1861,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:1865: 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 +1869,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:1884: \"$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 @@ -1857,12 +1904,12 @@ fi fi echo $ac_n "checking for sigvec""... $ac_c" 1>&6 -echo "configure:1861: checking for sigvec" >&5 +echo "configure:1908: 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:1936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_sigvec=yes" else @@ -1903,7 +1950,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:1954: 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 +1958,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:1973: \"$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 @@ -1946,7 +1993,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:1997: 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 +2001,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:2016: \"$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 @@ -2007,14 +2054,14 @@ fi # GNU readline echo "checking for GNU readline..." 1>&6 -echo "configure:2011: checking for GNU readline..." >&5 +echo "configure:2058: 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:2018: checking for readline in -lreadline" >&5 +echo "configure:2065: 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 +2069,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:2084: \"$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 @@ -2068,9 +2115,9 @@ fi # Curses curses=curses echo "checking for curses" 1>&6 -echo "configure:2072: checking for curses" >&5 +echo "configure:2119: 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:2121: 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 +2125,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:2136: \"$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 @@ -2104,7 +2151,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:2155: 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 +2159,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:2170: \"$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 @@ -2145,12 +2192,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:2196: checking if curses needs termcap" >&5 if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < main(int argc, char **argv) @@ -2160,7 +2207,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:2211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then CURSES_LIBS="-l$curses" else @@ -2172,7 +2219,7 @@ else : else cat > conftest.$ac_ext < main(int argc, char **argv) @@ -2182,7 +2229,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:2233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then CURSES_LIBS="-l$curses -ltermcap" else @@ -2204,14 +2251,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:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* : else @@ -2219,14 +2266,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:2277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* CURSES_CPPFLAGS="-D'getmaxx(w)=w->_maxx'" else @@ -2252,12 +2299,12 @@ fi for ac_func in getusershell do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2256: checking for $ac_func" >&5 +echo "configure:2303: 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:2331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2306,7 +2353,7 @@ done 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:2357: 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,13 +2368,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:2331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -2338,13 +2385,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:2348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -2368,17 +2415,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:2372: checking for crypt.h" >&5 +echo "configure:2419: 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:2382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2400,12 +2447,12 @@ else fi echo $ac_n "checking for crypt""... $ac_c" 1>&6 -echo "configure:2404: checking for crypt" >&5 +echo "configure:2451: 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:2479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_crypt=yes" else @@ -2446,7 +2493,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:2450: checking for crypt in -lcrypt" >&5 +echo "configure:2497: 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 @@ -2454,7 +2501,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:2516: \"$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 @@ -2690,7 +2737,7 @@ trap 'rm -fr `echo "Makefile lib/Makefile include/Makefile clients/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 + $SERVER_OUTPUT_FILES $GDSS_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 3bdb6d16..08e296bc 100755 --- a/configure.in +++ b/configure.in @@ -68,28 +68,6 @@ AC_CHECK_FUNC(socket, :, LIBS="-lsocket -lnsl $LIBS", :, -lnsl))) -# 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 (required) AC_MSG_CHECKING(for Kerberos 4) AC_ARG_WITH(krb4, @@ -116,6 +94,28 @@ AC_CHECK_LIB(krb4, krb_rd_req, $LIBPATH -ldes)], $LIBPATH -ldes425 -lkrb5 -lcrypto) +# 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) + # Hesiod support AC_MSG_CHECKING(for Hesiod) AC_ARG_WITH(hesiod, @@ -188,6 +188,35 @@ AC_SUBST(GDSS_OBJS) AC_SUBST(GDSS_CFILES) AC_SUBST(GDSS_TARGET) +# RSAREF support (default: build util/rsaref if present) +AC_MSG_CHECKING(for RSAREF) +AC_ARG_WITH(rsaref, + [ --with-rsaref=PREFIX Specify location of RSAREF], + [rsaref="$withval" + RSAREF_CPPFLAGS="-I$rsaref/include" + RSAREF_LIBS="$rsaref/lib/rsaref.a"], + 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 + RSAREF_CPPFLAGS="-I$(SRCTOP)/util/rsaref" + RSAREF_LIBS='$(BUILDTOP)/util/rsaref/rsaref.a' + else + rsaref=no + fi]) +AC_MSG_RESULT($rsaref) +if test "$rsaref" != no; then + MR_DEFINE(HAVE_RSAREF) +fi +AC_SUBST(RSAREF_CPPFLAGS) +AC_SUBST(RSAREF_LIBS) +AC_SUBST(RSAREF_SUBDIRS) + # Oracle (default: yes, if $ORACLE_HOME is set) AC_MSG_CHECKING(for Oracle) AC_ARG_WITH(oracle, @@ -331,4 +360,4 @@ AC_OUTPUT(Makefile lib/Makefile include/Makefile clients/Makefile \ clients/mrcheck/Makefile clients/mrtest/Makefile \ clients/passwd/Makefile clients/userreg/Makefile \ update/Makefile man/Makefile \ - $SERVER_OUTPUT_FILES $GDSS_OUTPUT_FILES) + $SERVER_OUTPUT_FILES $GDSS_OUTPUT_FILES $RSAREF_OUTPUT_FILES) -- 2.45.1