[maemo-commits] [maemo-commits] r14408 - in projects/haf/trunk/hildon-1: . pkgconfig

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-10-10 16:44:49 +0300 (Wed, 10 Oct 2007)
New Revision: 14408

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/configure.ac
   projects/haf/trunk/hildon-1/pkgconfig/hildon.pc.in
Log:
2007-10-10  Mohammad Anwari  <Mohammad.Anwari at nokia.com>

	* configure.ac, pkgconfig/hildon-1.pc: Turn on -DMAEMO_CHANGES only if
	USE_MAEMO_GTK is enabled.


Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2007-10-10 12:49:04 UTC (rev 14407)
+++ projects/haf/trunk/hildon-1/ChangeLog	2007-10-10 13:44:49 UTC (rev 14408)
@@ -1,3 +1,8 @@
+2007-10-10  Mohammad Anwari  <Mohammad.Anwari at nokia.com>
+
+	* configure.ac, pkgconfig/hildon-1.pc: Turn on -DMAEMO_CHANGES only if
+	USE_MAEMO_GTK is enabled.
+
 2007-10-10  Xan Lopez  <xan.lopez at nokia.com>
 
 	* src/hildon-code-dialog.c (hildon_code_dialog_init): check for

Modified: projects/haf/trunk/hildon-1/configure.ac
===================================================================
--- projects/haf/trunk/hildon-1/configure.ac	2007-10-10 12:49:04 UTC (rev 14407)
+++ projects/haf/trunk/hildon-1/configure.ac	2007-10-10 13:44:49 UTC (rev 14408)
@@ -110,6 +110,8 @@
 if test x$USE_MAEMO_GTK = xyes; then
     AC_MSG_NOTICE(Will use Maemo GTK+ specific API)
     AC_DEFINE(MAEMO_GTK, [], [Whether to use Maemo GTK+ specific API])
+    MAEMO_CHANGES="-DMAEMO_CHANGES"
+    AC_SUBST(MAEMO_CHANGES)
 else
     AC_MSG_NOTICE(Will not use Maemo GTK+ specific API)
 fi
@@ -162,7 +164,7 @@
 # -Wno-format due to way translation string are done
 
 ### enable MAEMO platform extensions
-CFLAGS="$CFLAGS -DMAEMO_CHANGES"
+CFLAGS="$CFLAGS $MAEMO_CHANGES"
 
 # HILDON_OBJ_*
 # default vars for the examples

Modified: projects/haf/trunk/hildon-1/pkgconfig/hildon.pc.in
===================================================================
--- projects/haf/trunk/hildon-1/pkgconfig/hildon.pc.in	2007-10-10 12:49:04 UTC (rev 14407)
+++ projects/haf/trunk/hildon-1/pkgconfig/hildon.pc.in	2007-10-10 13:44:49 UTC (rev 14408)
@@ -8,4 +8,4 @@
 Requires: gtk+-2.0 >= @GTK_VERSION@
 Version: @VERSION@
 Libs: -L${libdir} -lhildon- at PACKAGE_VERSION_MAJOR@
-Cflags: -I${includedir} -DMAEMO_CHANGES
+Cflags: -I${includedir} @MAEMO_CHANGES@