Mercurial > pidgin

changeset 3411:5df423e0bca8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 3430] 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. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Sun, 18 Aug 2002 19:32:05 +0000
parents 3fd9f8e2c463
children 953588e0b586
files ChangeLog configure.ac configure.in m4/gnome.m4 src/protocols/gg/Makefile.am src/protocols/irc/Makefile.am src/protocols/jabber/Makefile.am src/protocols/msn/Makefile.am src/protocols/napster/Makefile.am src/protocols/oscar/Makefile.am src/protocols/toc/Makefile.am src/protocols/yahoo/Makefile.am src/protocols/zephyr/Makefile.am
diffstat 13 files changed, 29 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Aug 18 18:28:48 2002 +0000
+++ b/ChangeLog	Sun Aug 18 19:32:05 2002 +0000
@@ -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):
--- a/configure.ac	Sun Aug 18 18:28:48 2002 +0000
+++ b/configure.ac	Sun Aug 18 19:32:05 2002 +0000
@@ -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
 
--- a/configure.in	Sun Aug 18 18:28:48 2002 +0000
+++ b/configure.in	Sun Aug 18 19:32:05 2002 +0000
@@ -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
 
--- a/m4/gnome.m4	Sun Aug 18 18:28:48 2002 +0000
+++ b/m4/gnome.m4	Sun Aug 18 19:32:05 2002 +0000
@@ -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)
--- a/src/protocols/gg/Makefile.am	Sun Aug 18 18:28:48 2002 +0000
+++ b/src/protocols/gg/Makefile.am	Sun Aug 18 19:32:05 2002 +0000
@@ -18,6 +18,8 @@
 		  iconv_string.h \
 		  gg.c
 
+libgg_a_CFLAGS = $(AM_CFLAGS)
+
 else
 
 st =
--- a/src/protocols/irc/Makefile.am	Sun Aug 18 18:28:48 2002 +0000
+++ b/src/protocols/irc/Makefile.am	Sun Aug 18 19:32:05 2002 +0000
@@ -13,6 +13,8 @@
 
 libirc_a_SOURCES = irc.c
 
+libirc_a_CFLAGS = $(AM_CFLAGS)
+
 else
 
 st =
--- a/src/protocols/jabber/Makefile.am	Sun Aug 18 18:28:48 2002 +0000
+++ b/src/protocols/jabber/Makefile.am	Sun Aug 18 19:32:05 2002 +0000
@@ -53,6 +53,8 @@
 			\
 			jabber.c
 
+libjabber_a_CFLAGS = $(AM_CFLAGS)
+
 else
 
 st =
--- a/src/protocols/msn/Makefile.am	Sun Aug 18 18:28:48 2002 +0000
+++ b/src/protocols/msn/Makefile.am	Sun Aug 18 19:32:05 2002 +0000
@@ -13,6 +13,8 @@
 
 libmsn_a_SOURCES = msn.c
 
+libmsn_a_CFLAGS = $(AM_CFLAGS)
+
 else
 
 st =
--- a/src/protocols/napster/Makefile.am	Sun Aug 18 18:28:48 2002 +0000
+++ b/src/protocols/napster/Makefile.am	Sun Aug 18 19:32:05 2002 +0000
@@ -11,6 +11,8 @@
 
 libnapster_a_SOURCES = napster.c
 
+libnapster_a_CFLAGS = $(AM_CFLAGS)
+
 else
 
 st =
--- a/src/protocols/oscar/Makefile.am	Sun Aug 18 18:28:48 2002 +0000
+++ b/src/protocols/oscar/Makefile.am	Sun Aug 18 19:32:05 2002 +0000
@@ -42,6 +42,7 @@
 			util.c		\
 			oscar.c
 
+liboscar_a_CFLAGS = $(AM_CFLAGS)
 
 else
 
--- a/src/protocols/toc/Makefile.am	Sun Aug 18 18:28:48 2002 +0000
+++ b/src/protocols/toc/Makefile.am	Sun Aug 18 19:32:05 2002 +0000
@@ -13,6 +13,8 @@
 
 libtoc_a_SOURCES = toc.c
 
+libtoc_a_CFLAGS = $(AM_CFLAGS)
+
 else
 
 st =
--- a/src/protocols/yahoo/Makefile.am	Sun Aug 18 18:28:48 2002 +0000
+++ b/src/protocols/yahoo/Makefile.am	Sun Aug 18 19:32:05 2002 +0000
@@ -13,6 +13,8 @@
 
 libyahoo_a_SOURCES = crypt.c yahoo.c
 
+libyahoo_a_CFLAGS = $(AM_CFLAGS)
+
 else
 
 st =
--- a/src/protocols/zephyr/Makefile.am	Sun Aug 18 18:28:48 2002 +0000
+++ b/src/protocols/zephyr/Makefile.am	Sun Aug 18 19:32:05 2002 +0000
@@ -76,6 +76,8 @@
 			\
 			zephyr.c
 
+libzephyr_a_CFLAGS = $(AM_CFLAGS)
+
 else
 
 st =