1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-25 00:51:21 +00:00

Fix detection of libmcrypt (hopefully).

PR:		ports/25353
Submitted by:	Juraj Bednar <juraj@bednar.sk>
This commit is contained in:
Dirk Froemberg 2001-03-10 13:06:31 +00:00
parent b88a789d55
commit fded15910a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=39420
4 changed files with 60 additions and 6 deletions

View File

@ -1,5 +1,34 @@
--- 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

View File

@ -74,9 +74,6 @@ while [ "$1" ]; do
ZLIB=1
;;
\"mcrypt\")
echo "mcrypt support doesn't compile at the moment. Ignoring." > /dev/stderr
;;
\"nothing\")
echo "LIB_DEPENDS+= mcrypt.5:\${PORTSDIR}/security/libmcrypt"
echo "CONFIGURE_ARGS+=--with-mcrypt=\${PREFIX}"
;;
@ -146,6 +143,7 @@ while [ "$1" ]; do
echo "SNMP is DISABLED for now. Ignoring." > /dev/stderr
;;
\"nothing\")
echo "LIB_DEPENDS+= snmp.4:\${PORTSDIR}/net/net-snmp"
echo "CONFIGURE_ARGS+=--with-snmp=\${PREFIX} --enable-ucd-snmp-hack"
;;

View File

@ -1,5 +1,34 @@
--- 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

View File

@ -74,9 +74,6 @@ while [ "$1" ]; do
ZLIB=1
;;
\"mcrypt\")
echo "mcrypt support doesn't compile at the moment. Ignoring." > /dev/stderr
;;
\"nothing\")
echo "LIB_DEPENDS+= mcrypt.5:\${PORTSDIR}/security/libmcrypt"
echo "CONFIGURE_ARGS+=--with-mcrypt=\${PREFIX}"
;;
@ -146,6 +143,7 @@ while [ "$1" ]; do
echo "SNMP is DISABLED for now. Ignoring." > /dev/stderr
;;
\"nothing\")
echo "LIB_DEPENDS+= snmp.4:\${PORTSDIR}/net/net-snmp"
echo "CONFIGURE_ARGS+=--with-snmp=\${PREFIX} --enable-ucd-snmp-hack"
;;