ports/net-im/jabber/files/patch-configure
Tijl Coosemans 3ab1b8443e - Replace security/gnutls with security/gnutls3 and update to 3.2.15
- Bump PORTREVISION on all ports that depend on security/gnutls and
  adjust all ports that depend on security/gnutls3
- Update mail/anubis to version 4.2 which supports gnutls 3.x
- Update mail/libvmime to a development snapshot (recommended by upstream
  developers)

PR:		191274
Exp-run by:	antoine
Approved by:	portmgr (antoine)
2014-07-23 09:54:02 +00:00

136 lines
6.3 KiB
Text

--- configure.orig 2007-07-19 00:24:45.000000000 +0200
+++ configure 2008-04-29 18:51:04.000000000 +0200
@@ -21168,6 +21168,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/stddef.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
@@ -21878,7 +21879,7 @@
echo "${ECHO_T}yes" >&6; }
hasgnutlsextra=yes
fi
-if test $hasgnutls = "yes" ; then
+if test $hasgnutlsextra = "yes" ; then
CPPFLAGS="$CPPFLAGS $GNUTLSEXTRA_CFLAGS"
LDFLAGS="$LDFLAGS $GNUTLSEXTRA_LIBS"
@@ -22554,7 +22555,7 @@
if test "${with_mysql+set}" = set; then
withval=$with_mysql; mysql=$withval
else
- mysql=yes
+ mysql=no
fi
if test "$mysql" != "no"; then
@@ -22778,7 +22779,7 @@
if test "${with_postgresql+set}" = set; then
withval=$with_postgresql; postgresql=$withval
else
- postgresql=yes
+ postgresql=no
fi
if test "$postgresql" != "no"; then
@@ -22787,8 +22788,8 @@
CPPFLAGS="${CPPFLAGS} -I$postgresql/include"
fi
if test "${ac_cv_header_postgresql_libpq_fe_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for postgresql/libpq-fe.h" >&5
-echo $ECHO_N "checking for postgresql/libpq-fe.h... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for libpq-fe.h" >&5
+echo $ECHO_N "checking for libpq-fe.h... $ECHO_C" >&6; }
if test "${ac_cv_header_postgresql_libpq_fe_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -22796,8 +22797,8 @@
echo "${ECHO_T}$ac_cv_header_postgresql_libpq_fe_h" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking postgresql/libpq-fe.h usability" >&5
-echo $ECHO_N "checking postgresql/libpq-fe.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking libpq-fe.h usability" >&5
+echo $ECHO_N "checking libpq-fe.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -22805,7 +22806,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <postgresql/libpq-fe.h>
+#include <libpq-fe.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -22837,15 +22838,15 @@
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking postgresql/libpq-fe.h presence" >&5
-echo $ECHO_N "checking postgresql/libpq-fe.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking libpq-fe.h presence" >&5
+echo $ECHO_N "checking libpq-fe.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <postgresql/libpq-fe.h>
+#include <libpq-fe.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
@@ -22878,30 +22879,30 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: postgresql/libpq-fe.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: postgresql/libpq-fe.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: postgresql/libpq-fe.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: postgresql/libpq-fe.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libpq-fe.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: libpq-fe.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libpq-fe.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: libpq-fe.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: postgresql/libpq-fe.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: postgresql/libpq-fe.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: postgresql/libpq-fe.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: postgresql/libpq-fe.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: postgresql/libpq-fe.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: postgresql/libpq-fe.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: postgresql/libpq-fe.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: postgresql/libpq-fe.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: postgresql/libpq-fe.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: postgresql/libpq-fe.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: postgresql/libpq-fe.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: postgresql/libpq-fe.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libpq-fe.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: libpq-fe.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libpq-fe.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: libpq-fe.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libpq-fe.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: libpq-fe.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libpq-fe.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: libpq-fe.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libpq-fe.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: libpq-fe.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libpq-fe.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: libpq-fe.h: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ echo "$as_me:$LINENO: checking for postgresql/libpq-fe.h" >&5
-echo $ECHO_N "checking for postgresql/libpq-fe.h... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for libpq-fe.h" >&5
+echo $ECHO_N "checking for libpq-fe.h... $ECHO_C" >&6; }
if test "${ac_cv_header_postgresql_libpq_fe_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else