diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-09-11 19:34:53 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-09-11 19:34:53 +0000 |
| commit | 071c2d52c75d240533eb0bb44f76527fe6f365cf (patch) | |
| tree | 1b518f412a174b629bc6e942d7ff1b8181df76a7 /gnu | |
| parent | e42359498bc5acf22070639f4eb5419792c386c5 (diff) | |
yes this is a configure diff, but this library order is needed for static library linking
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/cvs/configure | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/gnu/usr.bin/cvs/configure b/gnu/usr.bin/cvs/configure index 085ad8c4cd2..51d9435f2d5 100644 --- a/gnu/usr.bin/cvs/configure +++ b/gnu/usr.bin/cvs/configure @@ -2990,7 +2990,8 @@ 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="-lkrb $LIBS" +# -lkrb is handled explicitly later +#LIBS="-lkrb $LIBS" cat > conftest.$ac_ext <<EOF #line 2996 "configure" #include "confdefs.h" @@ -3031,7 +3032,8 @@ 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="-lkrb $LIBS" +# -lkrb is handled explicitly later +#LIBS="-lkrb $LIBS" cat > conftest.$ac_ext <<EOF #line 3037 "configure" #include "confdefs.h" @@ -3075,7 +3077,8 @@ 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="-lkrb $LIBS" +# -lkrb is handled explicitly later +#LIBS="-lkrb $LIBS" cat > conftest.$ac_ext <<EOF #line 3081 "configure" #include "confdefs.h" @@ -3115,7 +3118,8 @@ fi EOF test -n "${krb_libdir}" && LIBS="${LIBS} -L${krb_libdir}" - LIBS="${LIBS} -lkrb" +# -lkrb is handled explicitly later +# LIBS="${LIBS} -lkrb" # Put -L${krb_libdir} in LDFLAGS temporarily so that it appears before # -ldes in the command line. Don't do it permanently so that we honor # the user's setting for LDFLAGS @@ -3128,7 +3132,8 @@ 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="-ldes $LIBS" +# -ldes is handled explicitly later +#LIBS="-ldes $LIBS" cat > conftest.$ac_ext <<EOF #line 3134 "configure" #include "confdefs.h" @@ -3156,7 +3161,8 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="${LIBS} -ldes" +# -ldes is handled explicitly later +# LIBS="${LIBS} -ldes" else echo "$ac_t""no" 1>&6 fi @@ -3287,9 +3293,9 @@ EOF includeopt="${includeopt} -I$GSSAPI/include/kerberosV" # FIXME: This is ugly, but these things don't seem to be standardized. if test "$ac_cv_header_gssapi_h" = "yes"; then - LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb -lkrb5 -lasn1 -lcrypto -lcom_err -lkafs" + LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkafs -lkrb5 -lkrb -lasn1 -ldes -lcrypto -lcom_err" else - LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb -lkrb5 -lcrypto -lcom_err -lkafs" + LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkafs -lkrb5 -lkrb -ldes -lcrypto -lcom_err" fi save_CPPFLAGS=$CPPFLAGS CPPFLAGS="-I$GSSAPI/include/kerberosV $CPPFLAGS" |