Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Nov 2002 16:42:40 -0600
From:      Glenn Johnson <glennpj@charter.net>
To:        Joe Marcus Clarke <marcus@marcuscom.com>
Cc:        Sean McNeil <sean@mcneil.com>, Adam Weinberger <adamw@FreeBSD.ORG>, gnome@FreeBSD.ORG
Subject:   Re: soup build failure
Message-ID:  <20021112224240.GB14587@gforce.johnson.home>
In-Reply-To: <20021112222722.GA14587@gforce.johnson.home>
References:  <BJEIIPHPIIDCPFGIPEPBIEAPCAAA.sean@mcneil.com> <1037131484.2584.6.camel@gyros> <20021112201943.GA1128@gforce.johnson.home> <1037133036.2584.14.camel@gyros> <20021112222722.GA14587@gforce.johnson.home>

next in thread | previous in thread | raw e-mail | index | archive | help

--PEIAKu/WMn1b1Hv9
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Okay, the attached patch-configure gets soup to build with apache2.  Can
someone test this with apache13 to make sure it does not cause a problem
there?

-- 
Glenn Johnson
glennpj@charter.net

--PEIAKu/WMn1b1Hv9
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-configure


$FreeBSD$

--- configure.orig	Fri Jun  7 10:58:41 2002
+++ configure	Tue Nov 12 16:34:02 2002
@@ -6554,6 +6554,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -7460,9 +7461,9 @@
 
   rm -f conf.glibtest
 
-	GLIB_CFLAGS=`glib-config --cflags glib`
-	GLIB_LIBS=`glib-config --libs glib`
-	GMODULE_LIBS=`glib-config --libs gmodule`
+	GLIB_CFLAGS=`$GLIB_CONFIG --cflags glib`
+	GLIB_LIBS=`$GLIB_CONFIG --libs glib`
+	GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule`
 	FAVOUR_LIBXML=1
 	SOUP_PKGCONFIG_REQUIRES="glib"
 
@@ -9025,9 +9026,9 @@
 
 	if test "x$enable_nss" = xyes; then
 		if test "x$enable_static_ssl" = "xyes"; then
-			NSS_LIBS="-lpthread $nspr_prefix/libnspr4.a $nspr_prefix/libplc4.a $nspr_prefix/libplds4.a $nss_prefix/libnssb.a"
+			NSS_LIBS="-pthread $nspr_prefix/libnspr4.a $nspr_prefix/libplc4.a $nspr_prefix/libplds4.a $nss_prefix/libnssb.a"
 		else
-			NSS_LIBS="-lpthread -L$nspr_prefix -lnspr4 -lplc4 -lplds4 $nss_prefix -lnss3 -lssl3"
+			NSS_LIBS="-pthread -L$nspr_prefix -lnspr4 -lplc4 -lplds4 $nss_prefix -lnss3 -lssl3"
 		fi
 		NSS_CFLAGS=$CPPFLAGS
 		cat >>confdefs.h <<\EOF
@@ -9083,7 +9084,7 @@
 fi
 
 if test x$APXS != xno; then
-	APACHE_CFLAGS="-I`apxs -q INCLUDEDIR CFLAGS`"
+	APACHE_CFLAGS="-I`apxs -q INCLUDEDIR CFLAGS | sed -s/';;/ '/`"
 	APACHE_LIBS=`apxs -q LDFLAGS_SHLIB LIBS_SHLIB`
 
 	save_CPPFLAGS=$CPPFLAGS

--PEIAKu/WMn1b1Hv9--

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021112224240.GB14587>