[Gaim-commits] CVS: gaim/m4 gnome.m4,1.1,1.2

[Christian H. <ch...@us...>]

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

Modified Files:
	gnome.m4 
Log Message:
This hopefully adds automake 1.6 support to gaim. I have not tested it,
though it came from a guy who uses 1.6, so I'd hope it works.

It doesn't break 1.4.


Index: gnome.m4
===================================================================
RCS file: /cvsroot/gaim/gaim/m4/gnome.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnome.m4	23 Mar 2000 03:16:06 -0000	1.1
+++ gnome.m4	18 Aug 2002 19:32:04 -0000	1.2
@@ -43,6 +43,8 @@
 	    		fi
   		fi,
 		want_gnome=yes)
+	        
+	GNOME_GNORBA_HOOK([],$2)
 
 	if test "x$want_gnome" = xyes; then
 
@@ -53,7 +55,6 @@
 	      AC_MSG_CHECKING(if $GNOME_CONFIG works)
 	      if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
 	        AC_MSG_RESULT(yes)
-	        GNOME_GNORBA_HOOK([],$2)
 	        GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`"
 	        GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`"
 	        GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`"
@@ -98,7 +99,7 @@
 	if test -n "$3"; then
 	  n="$3"
 	  for i in $n; do
-	    AC_MSG_CHECKING(extra library $i)
+	    AC_MSG_CHECKING(extra library \"$i\")
 	    case $i in 
 	      applets)
 		AC_SUBST(GNOME_APPLETS_LIBS)