libgweather r523 - in trunk: . libgweather

[vuntz svn gnome org]

Author: vuntz
Date: Tue Nov 25 22:28:10 2008
New Revision: 523
URL: http://svn.gnome.org/viewvc/libgweather?rev=523&view=rev

Log:
2008-11-25  Vincent Untz  <vuntz gnome org>

	* configure.in: use $DISABLE_DEPRECATED which is set by gnome-common
	instead of listing _DISABLE_DEPRECATED flags ourselves. We'll stay
	up-to-date this way. Note: use gnome-common from trunk if you want
	LIBSOUP_DISABLE_DEPRECATED really hard.
	* libgweather/gweather-uninstalled.pc.in: remove locations_file from
	there too


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libgweather/gweather-uninstalled.pc.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Nov 25 22:28:10 2008
@@ -23,6 +23,7 @@
 LIBXML_REQUIRED=2.6.0
 
 AM_MAINTAINER_MODE
+GNOME_MAINTAINER_MODE_DEFINES
 
 IT_PROG_INTLTOOL([0.40.3])
 PKG_PROG_PKG_CONFIG([0.19])
@@ -94,7 +95,7 @@
 fi
 
 if test "x$enable_maintainer_mode" = "xyes"; then
-	CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED"
+	CFLAGS="$CFLAGS $DISABLE_DEPRECATED"
 fi
 
 dnl -- Check for GTK+ 2.0 (required) ------------------------------------------

Modified: trunk/libgweather/gweather-uninstalled.pc.in
==============================================================================
--- trunk/libgweather/gweather-uninstalled.pc.in	(original)
+++ trunk/libgweather/gweather-uninstalled.pc.in	Tue Nov 25 22:28:10 2008
@@ -3,7 +3,6 @@
 datarootdir= datarootdir@
 libdir= libdir@
 includedir= includedir@
-locations_file= datadir@/libgweather/Locations.xml
 
 Name: GWeather
 Description: GWeather shared library