[Gaim-commits] CVS: gaim configure.ac,1.26,1.27

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv11611

Modified Files:
	configure.ac 
Log Message:
no.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- configure.ac	2001/11/01 22:38:35	1.26
+++ configure.ac	2001/11/01 23:07:19	1.27
@@ -153,11 +153,17 @@
 fi
 CFLAGS="$CFLAGS $GTK_CFLAGS"
 
-if test "x$enable_panel" = "xyes" ; then
+dnl if test "x$enable_panel" = "xyes" ; then
 	dnl Things moved with the new versoin of Orbit. Thanks for
 	dnl telling me, Dan.  This should fix them.
-	CFLAGS="$CFLAGS $ORBIT_CFLAGS"
-fi
+	dnl
+	dnl The gnome-config script should pick this up and affect GNOME_ variables
+	dnl correctly. Thus, this check is not needed; if it fails, it is because of
+	dnl a broken installation or that your appletsConf.sh file is not updated
+	dnl for the new orbit installation. Gaim shouldn't need to do this.
+	dnl
+	dnl CFLAGS="$CFLAGS $ORBIT_CFLAGS"
+dnl fi
 
 use_pixbuf=no
 if test "x$enable_pixbuf" = "xyes" ; then