[Gaim-commits] CVS: gaim ChangeLog,1.521,1.522 configure.ac,1.76,1.77 configure.in,1.124,1.125

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

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

Modified Files:
	ChangeLog configure.ac configure.in 
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: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -d -r1.521 -r1.522
--- ChangeLog	11 Aug 2002 06:42:16 -0000	1.521
+++ ChangeLog	18 Aug 2002 19:32:04 -0000	1.522
@@ -33,6 +33,7 @@
 	* TOC no longer compiles statically by default--use OSCAR
 	* ICQ plugin no longer gets built--use OSCAR
 	* Added support for gettext 0.11.x.
+	* Added support for automake 1.6.
 	* Buddy Ticker made a plugin.
 
 version 0.59 (06/24/2002):

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- configure.ac	18 Aug 2002 18:21:08 -0000	1.76
+++ configure.ac	18 Aug 2002 19:32:04 -0000	1.77
@@ -151,10 +151,11 @@
 		fi
 	fi
 fi
+		
+GNOME_INIT_HOOK([], nofail, applets)
 
 if test "x$enable_gnome" = "xyes" ; then
 	if test "x$enable_panel" = "xyes" ; then
-		GNOME_INIT(applets)
 		GNOME_X_CHECKS
 		CFLAGS="$CFLAGS $GNOME_INCLUDEDIR"
 		AC_DEFINE(USE_APPLET)
@@ -361,6 +362,7 @@
 	AC_DEFINE(GAIM_PLUGINS)
 	AM_CONDITIONAL(PLUGINS, test "x$enable_plugins" = "xyes")
 else
+	AM_CONDITIONAL(PLUGINS, false)
 	enable_plugins=no
 	enable_prpls=no
 fi
@@ -368,6 +370,7 @@
 if test "x$enable_prpls" = "xyes" ; then
 	AM_CONDITIONAL(PRPLS, test "x$enable_plugins" = "xyes")
 else
+	AM_CONDITIONAL(PRPLS, false)
 	enable_prpls=no
 fi
 

Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- configure.in	18 Aug 2002 18:21:08 -0000	1.124
+++ configure.in	18 Aug 2002 19:32:04 -0000	1.125
@@ -150,10 +150,11 @@
 		fi
 	fi
 fi
+		
+GNOME_INIT_HOOK([], nofail, applets)
 
 if test "x$enable_gnome" = "xyes" ; then
 	if test "x$enable_panel" = "xyes" ; then
-		GNOME_INIT(applets)
 		GNOME_X_CHECKS
 		CFLAGS="$CFLAGS $GNOME_INCLUDEDIR"
 		AC_DEFINE(USE_APPLET)
@@ -358,6 +359,7 @@
 	AC_DEFINE(GAIM_PLUGINS)
 	AM_CONDITIONAL(PLUGINS, test "x$enable_plugins" = "xyes")
 else
+	AM_CONDITIONAL(PLUGINS, false)
 	enable_plugins=no
 	enable_prpls=no
 fi
@@ -365,6 +367,7 @@
 if test "x$enable_prpls" = "xyes" ; then
 	AM_CONDITIONAL(PRPLS, test "x$enable_plugins" = "xyes")
 else
+	AM_CONDITIONAL(PRPLS, false)
 	enable_prpls=no
 fi