Patch: fix openssl include



I've committed the following patch to HEAD and I'd like to commit it to
both gnome-2-0 and gnome-1-4 branch..

It remove a warning issued by gcc >= 3.1 when we include -I/usr/include
if openssl headers are in /usr/include/openssl..

-- 
Frédéric Crozat
MandrakeSoft
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-vfs/configure.in,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- configure.in	21 Jun 2002 11:42:59 -0000	1.188
+++ configure.in	19 Jul 2002 08:33:31 -0000	1.189
@@ -348,7 +348,11 @@
 	
 	if test "x{$openssl_includes}" != "xno" -a "x{$openssl_includes}" != "x"; then
 		have_openssl_includes="yes"
-		OPENSSL_CFLAGS="-I$with_openssl_includes"
+		if "{$openssl_includes}" != "/usr/include" ; then
+			OPENSSL_CFLAGS="-I$with_openssl_includes"
+		else
+			OPENSSL_CFLAGS=""
+		fi
 	else
 		OPENSSL_CFLAGS=""
 	fi
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-vfs/ChangeLog,v
retrieving revision 1.1372
retrieving revision 1.1373
diff -u -r1.1372 -r1.1373
--- ChangeLog	19 Jul 2002 08:26:19 -0000	1.1372
+++ ChangeLog	19 Jul 2002 08:33:30 -0000	1.1373
@@ -1,5 +1,11 @@
 2002-07-19  Frederic Crozat  <fcrozat mandrakesoft com>
 
+	* configure.in:
+	don't set OPENSSL_CFLAGS if it is "/usr/include",
+	otherwise gcc >= 3.1 issues a warning. 
+
+2002-07-19  Frederic Crozat  <fcrozat mandrakesoft com>
+
         * modules/ssh-method.c: (ssh_connect):
         Fix bug 88539 (leaking ssh processes) by using
         g_spawn_async_with_pipes


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]