balsa r8004 - in trunk: . libbalsa libinit_balsa src

[PeterB svn gnome org]

Author: PeterB
Date: Sat Nov 22 15:17:30 2008
New Revision: 8004
URL: http://svn.gnome.org/viewvc/balsa?rev=8004&view=rev

Log:
fix bug #561875

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libbalsa/Makefile.am
   trunk/libinit_balsa/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Nov 22 15:17:30 2008
@@ -380,6 +380,7 @@
 AC_SUBST(BALSA_CFLAGS)
 AC_SUBST(BALSA_LIBS)
 AC_SUBST(BALSA_AB_LIBS)
+AC_SUBST(BALSA_DEFS)
 
 # GtkHtml library.
 #
@@ -818,6 +819,16 @@
 if test -d "${srcdir}/.svn" ; then
 	BALSA_FROM_SVN=yes
 	BALSA_CFLAGS="$BALSA_CFLAGS -Wall -Werror"
+        BALSA_DEFS="\
+-DG_DISABLE_DEPRECATED \
+-DGDK_DISABLE_DEPRECATED \
+-DGDK_PIXBUF_DISABLE_DEPRECATED \
+-DGMIME_DISABLE_DEPRECATED \
+-DGNOME_DISABLE_DEPRECATED \
+-DGNOME_DISABLE_DEPRECATED_SOURCE \
+-DGNOME_VFS_DISABLE_DEPRECATED \
+-DGTK_DISABLE_DEPRECATED \
+-DPANGO_DISABLE_DEPRECATED"
 else
 	BALSA_FROM_SVN=no
 fi

Modified: trunk/libbalsa/Makefile.am
==============================================================================
--- trunk/libbalsa/Makefile.am	(original)
+++ trunk/libbalsa/Makefile.am	Sat Nov 22 15:17:30 2008
@@ -145,16 +145,7 @@
 	-I${top_srcdir}/libbalsa/imap \
 	$(BALSA_CFLAGS)
 
-DEFS =                                   \
-       -DG_DISABLE_DEPRECATED            \
-       -DGDK_DISABLE_DEPRECATED          \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED   \
-       -DGMIME_DISABLE_DEPRECATED	 \
-       -DGNOME_DISABLE_DEPRECATED        \
-       -DGNOME_DISABLE_DEPRECATED_SOURCE \
-       -DGNOME_VFS_DISABLE_DEPRECATED    \
-       -DGTK_DISABLE_DEPRECATED          \
-       -DPANGO_DISABLE_DEPRECATED
+DEFS = $(BALSA_DEFS)
 
 #Signal marshallers
 marshal_prefix = libbalsa

Modified: trunk/libinit_balsa/Makefile.am
==============================================================================
--- trunk/libinit_balsa/Makefile.am	(original)
+++ trunk/libinit_balsa/Makefile.am	Sat Nov 22 15:17:30 2008
@@ -72,6 +72,4 @@
 	-I$(top_srcdir)/src \
         $(BALSA_CFLAGS)
 
-DEFS = -DG_DISABLE_DEPRECATED	\
-       -DGTK_DISABLE_DEPRECATED \
-       -DGNOME_DISABLE_DEPRECATED
+DEFS = $(BALSA_DEFS)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Nov 22 15:17:30 2008
@@ -143,16 +143,7 @@
 	-I$(top_srcdir)/libbalsa \
 	$(BALSA_CFLAGS)
 
-DEFS =                                   \
-       -DG_DISABLE_DEPRECATED            \
-       -DGDK_DISABLE_DEPRECATED          \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED   \
-       -DGMIME_DISABLE_DEPRECATED	 \
-       -DGNOME_DISABLE_DEPRECATED        \
-       -DGNOME_DISABLE_DEPRECATED_SOURCE \
-       -DGNOME_VFS_DISABLE_DEPRECATED    \
-       -DGTK_DISABLE_DEPRECATED          \
-       -DPANGO_DISABLE_DEPRECATED
+DEFS = $(BALSA_DEFS)
 
 balsa_LDADD = \
 	$(top_builddir)/libinit_balsa/libinit_balsa.a \