diff options
| author | mat <mat@FreeBSD.org> | 2016-06-01 21:15:06 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2016-06-01 21:15:06 +0800 |
| commit | cbe4fd39f2a61769e5e93323bfcf79f6a3b2f9f5 (patch) | |
| tree | b7a71cac0181f6bb082a0f5d88966b634818148b /net-mgmt | |
| parent | 181ca7d9848fa8232c32071ebcedd669b42c8271 (diff) | |
| download | freebsd-ports-gnome-cbe4fd39f2a61769e5e93323bfcf79f6a3b2f9f5.tar.gz freebsd-ports-gnome-cbe4fd39f2a61769e5e93323bfcf79f6a3b2f9f5.tar.zst freebsd-ports-gnome-cbe4fd39f2a61769e5e93323bfcf79f6a3b2f9f5.zip | |
Fix build if the MYSQL option is enabled with any other option.
Sponsored by: Absolight
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/flow-tools/files/patch-configure | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/net-mgmt/flow-tools/files/patch-configure b/net-mgmt/flow-tools/files/patch-configure index 141f5e93da67..608da62f3103 100644 --- a/net-mgmt/flow-tools/files/patch-configure +++ b/net-mgmt/flow-tools/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Wed May 11 18:15:55 2005 -+++ configure Wed Dec 20 01:34:55 2006 -@@ -1662,7 +1662,7 @@ +--- configure.orig 2005-05-11 14:15:55 UTC ++++ configure +@@ -1662,7 +1662,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst @@ -9,7 +9,7 @@ ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -2254,7 +2254,6 @@ +@@ -2254,7 +2254,6 @@ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >& GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS @@ -17,7 +17,7 @@ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then -@@ -2299,21 +2298,6 @@ +@@ -2299,21 +2298,6 @@ rm -f conftest.$ac_objext conftest.$ac_e fi echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 @@ -39,16 +39,34 @@ echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then -@@ -3345,7 +3329,7 @@ +@@ -3204,7 +3188,7 @@ fi; + + + if test "x$WHERE_MYSQL" != "x"; then +- LIBS="-L$WHERE_MYSQL/lib/mysql" ++ LIBS="-L$WHERE_MYSQL/lib/mysql $LIBS" + echo "$as_me:$LINENO: checking for my_init in -lmysqlclient" >&5 + echo $ECHO_N "checking for my_init in -lmysqlclient... $ECHO_C" >&6 + if test "${ac_cv_lib_mysqlclient_my_init+set}" = set; then +@@ -3274,7 +3258,7 @@ fi + fi + + if test "x$WHERE_OPENSSL" != "x"; then +- LIBS="-L$WHERE_OPENSSL/lib" ++ LIBS="-L$WHERE_OPENSSL/lib $LIBS" + echo "$as_me:$LINENO: checking for EVP_EncryptUpdate in -lcrypto" >&5 + echo $ECHO_N "checking for EVP_EncryptUpdate in -lcrypto... $ECHO_C" >&6 + if test "${ac_cv_lib_crypto_EVP_EncryptUpdate+set}" = set; then +@@ -3345,7 +3329,7 @@ fi if test "x$WHERE_PGSQL" != "x"; then - LIBS="-L$WHERE_PGSQL/lib/pgsql" -+ LIBS="-L$WHERE_PGSQL/lib" ++ LIBS="-L$WHERE_PGSQL/lib $LIBS" echo "$as_me:$LINENO: checking for PQsetdbLogin in -lpq" >&5 echo $ECHO_N "checking for PQsetdbLogin in -lpq... $ECHO_C" >&6 if test "${ac_cv_lib_pq_PQsetdbLogin+set}" = set; then -@@ -3402,7 +3386,7 @@ +@@ -3402,7 +3386,7 @@ echo "$as_me:$LINENO: result: $ac_cv_lib echo "${ECHO_T}$ac_cv_lib_pq_PQsetdbLogin" >&6 if test $ac_cv_lib_pq_PQsetdbLogin = yes; then |