dasher r3635 - in trunk: . Src/Common Src/Gtk2

[pwelche svn gnome org]

Author: pwelche
Date: Mon Mar  2 17:07:20 2009
New Revision: 3635
URL: http://svn.gnome.org/viewvc/dasher?rev=3635&view=rev

Log:
The N_ macro is defined in /usr/include/glib-2.0/glib/gi18n.h
Those configure flags revealed another missing part to the move to gvfs.


Modified:
   trunk/ChangeLog
   trunk/Src/Common/I18n.h
   trunk/Src/Gtk2/Makefile.am
   trunk/configure.in

Modified: trunk/Src/Common/I18n.h
==============================================================================
--- trunk/Src/Common/I18n.h	(original)
+++ trunk/Src/Common/I18n.h	Mon Mar  2 17:07:20 2009
@@ -24,16 +24,22 @@
 #if defined(DASHER_WIN32) || defined(__APPLE__)
 
 #define _(szText) szText
+#define N_(szText) (szText)
 
 #else
 
 #include <libintl.h>
-// Attempt to get rid of '"_" rededined' compiler warnings.  I'm not sure the
+// Attempt to get rid of '"_" redefined' compiler warnings.  I'm not sure the
 // proper way to verify that gnome i18n support is present, so if you have a
 // better idea...
 #ifndef _
 #define _(szText) gettext(szText)
 #endif
+
+#ifndef N_
+#define N_(szText) (szText)
+#endif
+
 #endif
 
 #endif

Modified: trunk/Src/Gtk2/Makefile.am
==============================================================================
--- trunk/Src/Gtk2/Makefile.am	(original)
+++ trunk/Src/Gtk2/Makefile.am	Mon Mar  2 17:07:20 2009
@@ -105,4 +105,3 @@
 AM_CXXFLAGS = $(GTK2BUILD_CFLAGS) -I$(srcdir)/../DasherCore -DPROGDATA=\"$(pkgdatadir)\" -I../../intl -I$(top_srcdir)/intl 
 
 AM_CFLAGS = $(GTK2_CFLAGS)
-

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Mar  2 17:07:20 2009
@@ -397,9 +397,9 @@
 AC_SUBST(SETTINGS_CFLAGS)
 AC_SUBST(SETTINGS_LIBS)
 
-GTK2BUILD_CFLAGS="$GTK2_CFLAGS $SETTINGS_CFLAGS $gthread_CFLAGS $gnome_speech_CFLAGS $gnome_a11y_CFLAGS $glade_CFLAGS $gnome_CFLAGS $wnck_CFLAGS $hildon_CFLAGS"
+GTK2BUILD_CFLAGS="$GTK2_CFLAGS $GIO_CFLAGS $SETTINGS_CFLAGS $gthread_CFLAGS $gnome_speech_CFLAGS $gnome_a11y_CFLAGS $glade_CFLAGS $gnome_CFLAGS $wnck_CFLAGS $hildon_CFLAGS"
 
-GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS"
+GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $GIO_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS"
 
 AC_SUBST(GTK2BUILD_CFLAGS)
 AC_SUBST(GTK2BUILD_LIBS)