diff options
| -rw-r--r-- | aclocal.m4 | 29 | ||||
| -rwxr-xr-x | configure | 111 |
2 files changed, 69 insertions, 71 deletions
@@ -93,21 +93,21 @@ fi]) dnl ----- Regular expressions ----- AC_DEFUN(ATHENA_REGEXP, -[AC_ARG_WITH(rx, - [ --with-rx=PREFIX Use installed rx library], - [rx="$withval"], [rx=no]) -if test "$rx" != no; then - if test "$rx" != yes; then - CPPFLAGS="$CPPFLAGS -I$rx/include" - LDFLAGS="$LDFLAGS -L$rx/lib" +[AC_ARG_WITH(regex, + [ --with-regex=PREFIX Use installed regex library], + [regex="$withval"], [regex=no]) +if test "$regex" != no; then + if test "$regex" != yes; then + CPPFLAGS="$CPPFLAGS -I$regex/include" + LDFLAGS="$LDFLAGS -L$regex/lib" fi - AC_CHECK_LIB(rx, regcomp, RX_LIBS=-lrx, - [AC_MSG_ERROR(rx library not found)]) + AC_CHECK_LIB(regex, regcomp, REGEX_LIBS=-lregex, + [AC_MSG_ERROR(regex library not found)]) else AC_CHECK_FUNC(regcomp, :, [AC_MSG_ERROR(can't find POSIX regexp support)]) fi -AC_SUBST(RX_LIBS)]) +AC_SUBST(REGEX_LIBS)]) dnl ----- Motif ----- @@ -144,7 +144,7 @@ dnl ----- AFS ----- AC_DEFUN(ATHENA_AFS_CHECK, [AC_CHECK_FUNC(insque, :, AC_CHECK_LIB(compat, insque)) AC_CHECK_FUNC(sigvec, :, AC_CHECK_LIB(ucb, sigvec)) -AC_CHECK_FUNC(gethostname, :, AC_CHECK_LIB(nsl, gethostbyname)) +AC_CHECK_FUNC(gethostbyname, :, AC_CHECK_LIB(nsl, gethostbyname)) AC_CHECK_FUNC(socket, :, AC_CHECK_LIB(socket, socket)) if test "$afs" != yes; then CPPFLAGS="$CPPFLAGS -I$afs/include" @@ -178,16 +178,15 @@ fi]) dnl ----- Kerberos 4 ----- AC_DEFUN(ATHENA_KRB4_CHECK, -[ocppflags="$CPPFLAGS" -if test "$krb4" != yes; then +[if test "$krb4" != yes; then CPPFLAGS="$CPPFLAGS -I$krb4/include" LDFLAGS="$LDFLAGS -L$krb4/lib" fi AC_CHECK_LIB(krb, krb_rd_req, [KRB4_LIBS="-lkrb -ldes"], [if test "$krb4" != yes; then - CPPFLAGS="$ocppflags -I$krb4/include/kerberosIV" + CPPFLAGS="$CPPFLAGS -I$krb4/include/kerberosIV" else - CPPFLAGS="$ocppflags -I/usr/include/kerberosIV" + CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV" fi AC_CHECK_LIB(krb4, krb_rd_req, [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err"], @@ -18,7 +18,7 @@ ac_help="$ac_help ac_help="$ac_help --with-hesiod=PREFIX Use Hesiod" ac_help="$ac_help - --with-rx=PREFIX Use installed rx library" + --with-regex=PREFIX Use installed regex library" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -2891,13 +2891,12 @@ else fi if test "$krb4" != no; then - ocppflags="$CPPFLAGS" -if test "$krb4" != yes; then + if test "$krb4" != yes; then CPPFLAGS="$CPPFLAGS -I$krb4/include" LDFLAGS="$LDFLAGS -L$krb4/lib" fi echo $ac_n "checking for krb_rd_req in -lkrb""... $ac_c" 1>&6 -echo "configure:2901: checking for krb_rd_req in -lkrb" >&5 +echo "configure:2900: 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 @@ -2905,7 +2904,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb -ldes $LIBS" cat > conftest.$ac_ext <<EOF -#line 2909 "configure" +#line 2908 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2916,7 +2915,7 @@ int main() { krb_rd_req() ; return 0; } EOF -if { (eval echo configure:2920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2919: \"$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 @@ -2935,12 +2934,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 if test "$krb4" != yes; then - CPPFLAGS="$ocppflags -I$krb4/include/kerberosIV" + CPPFLAGS="$CPPFLAGS -I$krb4/include/kerberosIV" else - CPPFLAGS="$ocppflags -I/usr/include/kerberosIV" + CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV" fi echo $ac_n "checking for krb_rd_req in -lkrb4""... $ac_c" 1>&6 -echo "configure:2944: checking for krb_rd_req in -lkrb4" >&5 +echo "configure:2943: 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 @@ -2948,7 +2947,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err $LIBS" cat > conftest.$ac_ext <<EOF -#line 2952 "configure" +#line 2951 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2959,7 +2958,7 @@ int main() { krb_rd_req() ; return 0; } EOF -if { (eval echo configure:2963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2962: \"$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 @@ -2998,12 +2997,12 @@ fi if test "$hesiod" != no; then echo $ac_n "checking for res_send""... $ac_c" 1>&6 -echo "configure:3002: checking for res_send" >&5 +echo "configure:3001: 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 <<EOF -#line 3007 "configure" +#line 3006 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char res_send(); below. */ @@ -3026,7 +3025,7 @@ res_send(); ; return 0; } EOF -if { (eval echo configure:3030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_res_send=yes" else @@ -3044,7 +3043,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:3048: checking for res_send in -lresolv" >&5 +echo "configure:3047: 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 @@ -3052,7 +3051,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 3056 "configure" +#line 3055 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3063,7 +3062,7 @@ int main() { res_send() ; return 0; } EOF -if { (eval echo configure:3067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3066: \"$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 @@ -3097,7 +3096,7 @@ if test "$hesiod" != yes; then LDFLAGS="$LDFLAGS -L$hesiod/lib" fi echo $ac_n "checking for hes_resolve in -lhesiod""... $ac_c" 1>&6 -echo "configure:3101: checking for hes_resolve in -lhesiod" >&5 +echo "configure:3100: 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 @@ -3105,7 +3104,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lhesiod $LIBS" cat > conftest.$ac_ext <<EOF -#line 3109 "configure" +#line 3108 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3116,7 +3115,7 @@ int main() { hes_resolve() ; return 0; } EOF -if { (eval echo configure:3120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3119: \"$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 @@ -3144,29 +3143,29 @@ EOF fi -# Check whether --with-rx or --without-rx was given. -if test "${with_rx+set}" = set; then - withval="$with_rx" - rx="$withval" +# Check whether --with-regex or --without-regex was given. +if test "${with_regex+set}" = set; then + withval="$with_regex" + regex="$withval" else - rx=no + regex=no fi -if test "$rx" != no; then - if test "$rx" != yes; then - CPPFLAGS="$CPPFLAGS -I$rx/include" - LDFLAGS="$LDFLAGS -L$rx/lib" +if test "$regex" != no; then + if test "$regex" != yes; then + CPPFLAGS="$CPPFLAGS -I$regex/include" + LDFLAGS="$LDFLAGS -L$regex/lib" fi - echo $ac_n "checking for regcomp in -lrx""... $ac_c" 1>&6 -echo "configure:3162: checking for regcomp in -lrx" >&5 -ac_lib_var=`echo rx'_'regcomp | sed 'y%./+-%__p_%'` + echo $ac_n "checking for regcomp in -lregex""... $ac_c" 1>&6 +echo "configure:3161: checking for regcomp in -lregex" >&5 +ac_lib_var=`echo regex'_'regcomp | 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="-lrx $LIBS" +LIBS="-lregex $LIBS" cat > conftest.$ac_ext <<EOF -#line 3170 "configure" +#line 3169 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3177,7 +3176,7 @@ int main() { regcomp() ; return 0; } EOF -if { (eval echo configure:3181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3180: \"$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 @@ -3192,20 +3191,20 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - RX_LIBS=-lrx + REGEX_LIBS=-lregex else echo "$ac_t""no" 1>&6 -{ echo "configure: error: rx library not found" 1>&2; exit 1; } +{ echo "configure: error: regex library not found" 1>&2; exit 1; } fi else echo $ac_n "checking for regcomp""... $ac_c" 1>&6 -echo "configure:3204: checking for regcomp" >&5 +echo "configure:3203: checking for regcomp" >&5 if eval "test \"`echo '$''{'ac_cv_func_regcomp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3209 "configure" +#line 3208 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char regcomp(); below. */ @@ -3228,7 +3227,7 @@ regcomp(); ; return 0; } EOF -if { (eval echo configure:3232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_regcomp=yes" else @@ -3254,13 +3253,13 @@ LIBS="$KRB4_LIBS $HESIOD_LIBS $LIBS" if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:3258: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:3257: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 3264 "configure" +#line 3263 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -3278,7 +3277,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 3282 "configure" +#line 3281 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -3300,12 +3299,12 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:3304: checking for vprintf" >&5 +echo "configure:3303: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3309 "configure" +#line 3308 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vprintf(); below. */ @@ -3328,7 +3327,7 @@ vprintf(); ; return 0; } EOF -if { (eval echo configure:3332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -3352,12 +3351,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:3356: checking for _doprnt" >&5 +echo "configure:3355: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3361 "configure" +#line 3360 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char _doprnt(); below. */ @@ -3380,7 +3379,7 @@ _doprnt(); ; return 0; } EOF -if { (eval echo configure:3384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -3407,12 +3406,12 @@ fi for ac_func in putenv strchr memcpy memmove waitpid getlogin strerror random do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3411: checking for $ac_func" >&5 +echo "configure:3410: 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 <<EOF -#line 3416 "configure" +#line 3415 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3435,7 +3434,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3462,12 +3461,12 @@ done for ac_func in lrand48 gethostid krb_get_err_text krb_log do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3466: checking for $ac_func" >&5 +echo "configure:3465: 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 <<EOF -#line 3471 "configure" +#line 3470 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3490,7 +3489,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3690,7 +3689,7 @@ s%@RLIB@%$RLIB%g s%@SLIB@%$SLIB%g s%@KRB4_LIBS@%$KRB4_LIBS%g s%@HESIOD_LIBS@%$HESIOD_LIBS%g -s%@RX_LIBS@%$RX_LIBS%g +s%@REGEX_LIBS@%$REGEX_LIBS%g CEOF EOF |