--- configure.orig Tue Aug 29 20:37:36 2000 +++ configure Sat Sep 2 10:02:53 2000 @@ -23088,12 +23088,7 @@ LIBS=$old_LIBS LDFLAGS="$old_LDFLAGS" - if test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBMCRYPT22 1 -EOF - - elif test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then + if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then case "ltdl" in c|c_r|pthread*) ;; @@ -23106,8 +23101,13 @@ ;; esac - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_LIBMCRYPT24 1 +EOF + + elif test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_LIBMCRYPT22 1 EOF else @@ -37824,18 +37824,6 @@ fi - case "cs" in - c|c_r|pthread*) ;; - *) - - - LIBS="-lcs $LIBS" - - - ;; - esac - - case "ct" in c|c_r|pthread*) ;; *) @@ -37848,30 +37836,7 @@ esac - case "comn" in - c|c_r|pthread*) ;; - *) - - - LIBS="-lcomn $LIBS" - - - ;; - esac - - - case "intl" in - c|c_r|pthread*) ;; - *) - - - LIBS="-lintl $LIBS" - - - ;; - esac - - SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl" + SYBASE_CT_LIBS="-lct" old_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR" echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 @@ -37923,18 +37888,6 @@ else echo "$ac_t""no" 1>&6 - - case "sybtcl" in - c|c_r|pthread*) ;; - *) - - - LIBS="-lsybtcl $LIBS" - - - ;; - esac - fi echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6