diff options
| author | marcus <marcus@FreeBSD.org> | 2002-11-13 15:04:27 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2002-11-13 15:04:27 +0800 |
| commit | ced4db9842c479d66f686d5fbd50d8a0cb8c41e3 (patch) | |
| tree | 009a06d6b495bea7826340bc7c020aa267fd370f | |
| parent | 140a5a591cd65f084725e6eaae218e800330607a (diff) | |
| download | freebsd-ports-gnome-ced4db9842c479d66f686d5fbd50d8a0cb8c41e3.tar.gz freebsd-ports-gnome-ced4db9842c479d66f686d5fbd50d8a0cb8c41e3.tar.zst freebsd-ports-gnome-ced4db9842c479d66f686d5fbd50d8a0cb8c41e3.zip | |
Fix build when Apache 2.x is present.
Tested by: Glenn Johnson <glennpj@charter.net>
| -rw-r--r-- | devel/libsoup/files/patch-configure | 23 | ||||
| -rw-r--r-- | devel/libsoup22/files/patch-configure | 23 | ||||
| -rw-r--r-- | devel/soup/files/patch-configure | 23 |
3 files changed, 54 insertions, 15 deletions
diff --git a/devel/libsoup/files/patch-configure b/devel/libsoup/files/patch-configure index fb57eb67fb25..c5b0a0c6e45a 100644 --- a/devel/libsoup/files/patch-configure +++ b/devel/libsoup/files/patch-configure @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- configure.orig Fri Jun 7 18:58:41 2002 -+++ configure Sat Jul 20 15:01:54 2002 +--- configure.orig Fri Jun 7 11:58:41 2002 ++++ configure Tue Nov 12 17:40:49 2002 @@ -6554,6 +6554,7 @@ # This can be used to rebuild libtool when needed @@ -24,3 +21,19 @@ $FreeBSD$ FAVOUR_LIBXML=1 SOUP_PKGCONFIG_REQUIRES="glib" +@@ -9083,11 +9084,11 @@ + fi + + if test x$APXS != xno; then +- APACHE_CFLAGS="-I`apxs -q INCLUDEDIR CFLAGS`" +- APACHE_LIBS=`apxs -q LDFLAGS_SHLIB LIBS_SHLIB` ++# APACHE_CFLAGS="-I`apxs -q INCLUDEDIR CFLAGS | sed -e 's|;;||g'`" ++# APACHE_LIBS=`apxs -q LDFLAGS_SHLIB LIBS_SHLIB` + +- save_CPPFLAGS=$CPPFLAGS +- CPPFLAGS=$APACHE_CFLAGS ++# save_CPPFLAGS=$CPPFLAGS ++# CPPFLAGS=$APACHE_CFLAGS + + for ac_header in httpd.h http_config.h http_core.h http_log.h http_main.h http_protocol.h + do diff --git a/devel/libsoup22/files/patch-configure b/devel/libsoup22/files/patch-configure index fb57eb67fb25..c5b0a0c6e45a 100644 --- a/devel/libsoup22/files/patch-configure +++ b/devel/libsoup22/files/patch-configure @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- configure.orig Fri Jun 7 18:58:41 2002 -+++ configure Sat Jul 20 15:01:54 2002 +--- configure.orig Fri Jun 7 11:58:41 2002 ++++ configure Tue Nov 12 17:40:49 2002 @@ -6554,6 +6554,7 @@ # This can be used to rebuild libtool when needed @@ -24,3 +21,19 @@ $FreeBSD$ FAVOUR_LIBXML=1 SOUP_PKGCONFIG_REQUIRES="glib" +@@ -9083,11 +9084,11 @@ + fi + + if test x$APXS != xno; then +- APACHE_CFLAGS="-I`apxs -q INCLUDEDIR CFLAGS`" +- APACHE_LIBS=`apxs -q LDFLAGS_SHLIB LIBS_SHLIB` ++# APACHE_CFLAGS="-I`apxs -q INCLUDEDIR CFLAGS | sed -e 's|;;||g'`" ++# APACHE_LIBS=`apxs -q LDFLAGS_SHLIB LIBS_SHLIB` + +- save_CPPFLAGS=$CPPFLAGS +- CPPFLAGS=$APACHE_CFLAGS ++# save_CPPFLAGS=$CPPFLAGS ++# CPPFLAGS=$APACHE_CFLAGS + + for ac_header in httpd.h http_config.h http_core.h http_log.h http_main.h http_protocol.h + do diff --git a/devel/soup/files/patch-configure b/devel/soup/files/patch-configure index fb57eb67fb25..c5b0a0c6e45a 100644 --- a/devel/soup/files/patch-configure +++ b/devel/soup/files/patch-configure @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- configure.orig Fri Jun 7 18:58:41 2002 -+++ configure Sat Jul 20 15:01:54 2002 +--- configure.orig Fri Jun 7 11:58:41 2002 ++++ configure Tue Nov 12 17:40:49 2002 @@ -6554,6 +6554,7 @@ # This can be used to rebuild libtool when needed @@ -24,3 +21,19 @@ $FreeBSD$ FAVOUR_LIBXML=1 SOUP_PKGCONFIG_REQUIRES="glib" +@@ -9083,11 +9084,11 @@ + fi + + if test x$APXS != xno; then +- APACHE_CFLAGS="-I`apxs -q INCLUDEDIR CFLAGS`" +- APACHE_LIBS=`apxs -q LDFLAGS_SHLIB LIBS_SHLIB` ++# APACHE_CFLAGS="-I`apxs -q INCLUDEDIR CFLAGS | sed -e 's|;;||g'`" ++# APACHE_LIBS=`apxs -q LDFLAGS_SHLIB LIBS_SHLIB` + +- save_CPPFLAGS=$CPPFLAGS +- CPPFLAGS=$APACHE_CFLAGS ++# save_CPPFLAGS=$CPPFLAGS ++# CPPFLAGS=$APACHE_CFLAGS + + for ac_header in httpd.h http_config.h http_core.h http_log.h http_main.h http_protocol.h + do |