Actually use gettext. Involves checking in configure.in, linking to it in

2000-09-11 Havoc Pennington <hp@redhat.com> * Actually use gettext. Involves checking in configure.in, linking to it in Makefile.am, making _() do the right thing. I have gettext in libc instead of -lintl though, so I'm not going to see Makefile bugs - maybe someone can check on it.
author: Havoc Pennington <hp@redhat.com> 2000-09-11 21:58:49 +0000
committer: Havoc Pennington <hp@src.gnome.org> 2000-09-11 21:58:49 +0000
commit: 16c7bcf0113a2b927c5b392ef797532e98246bdb (patch)
tree: 6b5e63803fafc3b1ab8f9e77ebd8e389fdf37b67
parent: 7332883604e505f102df46f7f9ed1d0068f0e0c5 (diff)
download: gconf-16c7bcf0113a2b927c5b392ef797532e98246bdb.tar.gz
25 files changed, 65 insertions, 229 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b7e0b1e..e9375000 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-09-11  Havoc Pennington  <hp@redhat.com>
+
+	* Actually use gettext. Involves checking in configure.in, linking
+	to it in Makefile.am, making _() do the right thing.
+
+	I have gettext in libc instead of -lintl though, so I'm not going
+	to see Makefile bugs - maybe someone can check on it.
+
 2000-09-10  Havoc Pennington  <hp@pobox.com>
 
 	* gconf/gconf-value.c (gconf_entry_new): New function
diff --git a/TODO b/TODO
index 79a7bfe9..46668ab6 100644
--- a/TODO
+++ b/TODO
@@ -6,9 +6,6 @@ installation administration; it's mostly just going to be a
 process-transparent way to store settings, limited to single
 workstation config files.
 
-* Fix spelling of "writable" throughout, or at least
-  in public API (s/writeable/writable/g)
-
 * Maintain documentation
 
 * API so clients can find out if they can write to a given key
@@ -16,8 +13,6 @@ workstation config files.
 
 * Implement the default error handlers in GConfClient
 
-* Change _() to actually call gettext or dgettext
-
 * Change GConfEntry::key to be the full key, not a subdir
   name
 
@@ -28,14 +23,6 @@ workstation config files.
   though, since they don't follow GTK _get_ conventions
   and are just struct access macros.
 
-* Check for more _destroy() that should be _free()
-
-* Fill out the GConfEntry API, it doesn't look complete.
-
-* Privatize the GConfError stuff except error domain and codes
-
-* Remove goofy "dummy" thing in GConfEngine
-
 * Implement batch gets
 
 * Envisioneer the vortals
diff --git a/acconfig.h b/acconfig.h
index d3940757..05f1ae3b 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -6,3 +6,4 @@
 #undef HAVE_STPCPY
 #undef ENABLE_NLS
 #undef HAVE_PTHREAD_H
+#undef GETTEXT_PACKAGE
diff --git a/backends/xml-backend.c b/backends/xml-backend.c
index b41eb87a..6931ad08 100644
--- a/backends/xml-backend.c
+++ b/backends/xml-backend.c
@@ -41,20 +41,6 @@
 #include <dirent.h>
 #include <limits.h>
 
-/* Quick hack so I can mark strings */
-
-#ifdef _ 
-#warning "_ already defined"
-#else
-#define _(x) x
-#endif
-
-#ifdef N_ 
-#warning "N_ already defined"
-#else
-#define N_(x) x
-#endif
-
 /*
  * Overview
  * 
diff --git a/backends/xml-cache.c b/backends/xml-cache.c
index c28a4a03..f97835bb 100644
--- a/backends/xml-cache.c
+++ b/backends/xml-cache.c
@@ -22,21 +22,6 @@
 
 #include <time.h>
 
-/* Quick hack so I can mark strings */
-
-#ifdef _ 
-#warning "_ already defined"
-#else
-#define _(x) x
-#endif
-
-#ifdef N_ 
-#warning "N_ already defined"
-#else
-#define N_(x) x
-#endif
-
-
 /* This makes hash table safer when debugging */
 #ifndef GCONF_ENABLE_DEBUG
 #define safe_g_hash_table_insert g_hash_table_insert
diff --git a/backends/xml-dir.c b/backends/xml-dir.c
index 217afe3b..cf21dc2f 100644
--- a/backends/xml-dir.c
+++ b/backends/xml-dir.c
@@ -37,20 +37,6 @@
 #include <gconf/gconf-internals.h>
 #include "xml-entry.h"
 
-/* Quick hack so I can mark strings */
-
-#ifdef _ 
-#warning "_ already defined"
-#else
-#define _(x) x
-#endif
-
-#ifdef N_ 
-#warning "N_ already defined"
-#else
-#define N_(x) x
-#endif
-
 /* This makes hash table safer when debugging */
 #ifndef GCONF_ENABLE_DEBUG
 #define safe_g_hash_table_insert g_hash_table_insert
diff --git a/backends/xml-entry.c b/backends/xml-entry.c
index 496654e2..50d12e90 100644
--- a/backends/xml-entry.c
+++ b/backends/xml-entry.c
@@ -22,20 +22,6 @@
 #include <stdlib.h>
 #include <gnome-xml/entities.h>
 
-/* Quick hack so I can mark strings */
-
-#ifdef _ 
-#warning "_ already defined"
-#else
-#define _(x) x
-#endif
-
-#ifdef N_ 
-#warning "N_ already defined"
-#else
-#define N_(x) x
-#endif
-
 static void
 entry_sync_if_needed(Entry* e, GConfValue* val);
 static GConfValue*
diff --git a/configure.in b/configure.in
index 73bed152..53baeb65 100644
--- a/configure.in
+++ b/configure.in
@@ -20,6 +20,10 @@ dnl not incremented for bugfix or unstable releases.
 MAJOR_VERSION=1
 AC_SUBST(MAJOR_VERSION)
 
+GETTEXT_PACKAGE=gconf$MAJOR_VERSION
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
+
 dnl libtool versioning for guile wrapper
 
 SCMGCONF_CURRENT=0
@@ -172,6 +176,11 @@ ALL_LINGUAS="ca cs da de el fi fr ga ja ko no pt_BR ru sv tr uk"
 
 AM_GNU_GETTEXT
 
+# AM_GNU_GETTEXT above substs $DATADIRNAME
+# this is the directory where the *.{mo,gmo} files are installed
+gtklocaledir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(gconflocaledir)
+
 CFLAGS="$CFLAGS -Wall"
 
 AC_SUBST(CFLAGS)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 332fbbc2..9092b257 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -13,7 +13,7 @@ endif
 
 noinst_PROGRAMS=$(GTK_EXAMPLES)
 
-GTK_EXAMPLES_LINK= $(EFENCE) $(ORBIT_LIBS) $(GTK_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(top_builddir)/wrappers/gtk/libgconf-gtk-$(MAJOR_VERSION).la $(EFENCE)
+GTK_EXAMPLES_LINK= $(EFENCE) $(INTLLIBS) $(ORBIT_LIBS) $(GTK_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(top_builddir)/wrappers/gtk/libgconf-gtk-$(MAJOR_VERSION).la $(EFENCE)
 
 basic_gconf_app_SOURCES = basic-gconf-app.c
 
diff --git a/gconf-config.in b/gconf-config.in
index aa9caca4..f6155c8a 100644
--- a/gconf-config.in
+++ b/gconf-config.in
@@ -212,7 +212,7 @@ fi
 
 includes="-I@includedir@/gconf/@MAJOR_VERSION@"
 af_cflags="$af_cflags $includes $cflags `@OAF_CONFIG@ --cflags`"
-af_libs="-L@libdir@ $af_libs -lgconf-@MAJOR_VERSION@ `@OAF_CONFIG@ --libs`"
+af_libs="-L@libdir@ @INTLLIBS@ $af_libs -lgconf-@MAJOR_VERSION@ `@OAF_CONFIG@ --libs`"
 
 if test "X$af_lib_gconf_gtk" = "Xyes"; then
     af_libs="$af_libs -lgconf-gtk-@MAJOR_VERSION@ $af_libs @GTK_LIBS@"
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index 26c1d752..97107f4b 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -7,6 +7,7 @@ INCLUDES=\
 	$(ORBIT_CFLAGS) \
 	$(XML_CFLAGS) \
 	$(OAF_CFLAGS) \
+	-DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\"  \
         -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" \
 	-DGCONF_CONFDIR=\""$(sysconfdir)/gconf/$(MAJOR_VERSION)"\" \
 	-DGCONF_BUILDDIR=\""$(top_builddir)"\" 			\
@@ -46,7 +47,7 @@ gconfd_1_SOURCES = \
 	gconfd.h		\
 	gconfd.c
 
-gconfd_1_LDADD = $(EFENCE) $(OAF_LIBS) $(GLIB_LIBS) libgconf-$(MAJOR_VERSION).la
+gconfd_1_LDADD = $(EFENCE) $(INTLLIBS) $(OAF_LIBS) $(GLIB_LIBS) libgconf-$(MAJOR_VERSION).la
 
 # gconf_testclient_SOURCES = \
 # 	testclient.c
@@ -56,7 +57,7 @@ gconfd_1_LDADD = $(EFENCE) $(OAF_LIBS) $(GLIB_LIBS) libgconf-$(MAJOR_VERSION).la
 gconftool_1_SOURCES = \
 	gconftool.c
 
-gconftool_1_LDADD = $(EFENCE) $(OAF_LIBS) $(GLIB_LIBS) $(ORBIT_LIBS) $(POPT_LIBS) $(XML_LIBS) libgconf-$(MAJOR_VERSION).la
+gconftool_1_LDADD = $(EFENCE) $(INTLLIBS) $(OAF_LIBS) $(GLIB_LIBS) $(ORBIT_LIBS) $(POPT_LIBS) $(XML_LIBS) libgconf-$(MAJOR_VERSION).la
 
 $(CORBA_SOURCES): $(srcdir)/GConf.idl
 	orbit-idl $(srcdir)/GConf.idl
@@ -81,7 +82,7 @@ libgconf_1_la_SOURCES = \
 
 libgconf_1_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE)
 
-libgconf_1_la_LIBADD =  $(OAF_LIBS) $(GLIB_LIBS)
+libgconf_1_la_LIBADD = $(INTLLIBS) $(OAF_LIBS) $(GLIB_LIBS)
 
 EXTRA_DIST=GConf.idl gconfd.oafinfo.in default.path.in
 
diff --git a/gconf/gconf-backend.c b/gconf/gconf-backend.c
index e2532563..9e5049bb 100644
--- a/gconf/gconf-backend.c
+++ b/gconf/gconf-backend.c
@@ -26,21 +26,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-/* Quick hack so I can mark strings */
-
-#ifdef _ 
-#warning "_ already defined"
-#else
-#define _(x) x
-#endif
-
-#ifdef N_ 
-#warning "N_ already defined"
-#else
-#define N_(x) x
-#endif
-
-
 gchar* 
 gconf_address_backend(const gchar* address)
 {
diff --git a/gconf/gconf-database.c b/gconf/gconf-database.c
index 96842b25..2d5bb7c6 100644
--- a/gconf/gconf-database.c
+++ b/gconf/gconf-database.c
@@ -26,22 +26,6 @@
 #include <liboaf/liboaf.h>
 #include <time.h>
 
-
-/* Quick hack so I can mark strings */
-/* Please don't mark LOG_DEBUG syslog messages */
-
-#ifdef _ 
-#warning "_ already defined"
-#else
-#define _(x) x
-#endif
-
-#ifdef N_ 
-#warning "N_ already defined"
-#else
-#define N_(x) x
-#endif
-
 /* This makes hash table safer when debugging */
 #ifndef GCONF_ENABLE_DEBUG
 #define safe_g_hash_table_insert g_hash_table_insert
diff --git a/gconf/gconf-error.c b/gconf/gconf-error.c
index 0480a75a..518e1505 100644
--- a/gconf/gconf-error.c
+++ b/gconf/gconf-error.c
@@ -18,23 +18,9 @@
  */
 
 #include "gconf-error.h"
+#include "gconf-internals.h"
 #include <stdarg.h>
 
-/* Quick hack so I can mark strings */
-
-#ifdef _ 
-#warning "_ already defined"
-#else
-#define _(x) x
-#endif
-
-#ifdef N_ 
-#warning "N_ already defined"
-#else
-#define N_(x) x
-#endif
-
-
 static const gchar* err_msgs[] = {
   N_("Success"),
   N_("Failed"),
diff --git a/gconf/gconf-glib.c b/gconf/gconf-glib.c
index 56a33b59..bd651643 100644
--- a/gconf/gconf-glib.c
+++ b/gconf/gconf-glib.c
@@ -204,9 +204,7 @@ g_clear_error (GError **err)
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-
-/* FIXME */
-#define _(x) x
+#include "gconf-internals.h"
 
 typedef struct _GMarkupAttribute GMarkupAttribute;
 typedef struct _GMarkupNodePassthrough GMarkupNodePassthrough;
diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c
index 65a61590..2d7fb01d 100644
--- a/gconf/gconf-internals.c
+++ b/gconf/gconf-internals.c
@@ -37,21 +37,6 @@
 #include <time.h>
 #include <math.h>
 
-
-/* Quick hack so I can mark strings */
-
-#ifdef _ 
-#warning "_ already defined"
-#else
-#define _(x) x
-#endif
-
-#ifdef N_ 
-#warning "N_ already defined"
-#else
-#define N_(x) x
-#endif
-
 static gboolean gconf_daemon_mode = FALSE;
 static gchar* daemon_ior = NULL;
 
diff --git a/gconf/gconf-internals.h b/gconf/gconf-internals.h
index 5357702c..9df785c3 100644
--- a/gconf/gconf-internals.h
+++ b/gconf/gconf-internals.h
@@ -189,6 +189,27 @@ void     gconf_set_error  (GError** err,
 GError*  gconf_compose_errors (GError* err1, GError* err2);
 
 
+#ifdef ENABLE_NLS
+#    include <libintl.h>
+#    include <config.h>
+#    undef _
+#    define _(String) dgettext (GETTEXT_PACKAGE, String)
+#    ifdef gettext_noop
+#        define N_(String) gettext_noop (String)
+#    else
+#        define N_(String) (String)
+#    endif
+#else
+/* Stubs that do something close enough.  */
+#    define textdomain(String) (String)
+#    define gettext(String) (String)
+#    define dgettext(Domain,Message) (Message)
+#    define dcgettext(Domain,Message,Type) (Message)
+#    define bindtextdomain(Domain,Directory) (Domain)
+#    define _(String) (String)
+#    define N_(String) (String)
+#endif
+
 #endif /* GCONF_ENABLE_INTERNALS */
 
 #endif /* GCONF_GCONF_INTERNALS_H */
diff --git a/gconf/gconf-sources.c b/gconf/gconf-sources.c
index cdd3c34a..84fbaf5e 100644
--- a/gconf/gconf-sources.c
+++ b/gconf/gconf-sources.c
@@ -32,21 +32,6 @@
 #include <errno.h>
 #include <ctype.h>
 
-
-/* Quick hack so I can mark strings */
-
-#ifdef _ 
-#warning "_ already defined"
-#else
-#define _(x) x
-#endif
-
-#ifdef N_ 
-#warning "N_ already defined"
-#else
-#define N_(x) x
-#endif
-
 /* 
  *  Sources
  */
diff --git a/gconf/gconf-value.c b/gconf/gconf-value.c
index 6e1306c1..71c80217 100644
--- a/gconf/gconf-value.c
+++ b/gconf/gconf-value.c
@@ -26,20 +26,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-/* Quick hack so I can mark strings */
-
-#ifdef _ 
-#warning "_ already defined"
-#else
-#define _(x) x
-#endif
-
-#ifdef N_ 
-#warning "N_ already defined"
-#else
-#define N_(x) x
-#endif
-
 static void
 set_string(gchar** dest, const gchar* src)
 {
diff --git a/gconf/gconf.c b/gconf/gconf.c
index 705fdcc9..769c915d 100644
--- a/gconf/gconf.c
+++ b/gconf/gconf.c
@@ -34,21 +34,6 @@
 #include <unistd.h>
 #include <liboaf/liboaf.h>
 
-
-/* Quick hack so I can mark strings */
-
-#ifdef _ 
-#warning "_ already defined"
-#else
-#define _(x) x
-#endif
-
-#ifdef N_ 
-#warning "N_ already defined"
-#else
-#define N_(x) x
-#endif
-
 /* Returns TRUE if there was an error, frees exception, sets err */
 static gboolean gconf_handle_corba_exception(CORBA_Environment* ev, GError** err);
 /* just returns TRUE if there's an exception indicating the server is
diff --git a/gconf/gconfd.c b/gconf/gconfd.c
index 6ab47f98..f30a046f 100644
--- a/gconf/gconfd.c
+++ b/gconf/gconfd.c
@@ -54,22 +54,6 @@
 #include <time.h>
 #include <liboaf/liboaf.h>
 
-
-/* Quick hack so I can mark strings */
-/* Please don't mark LOG_DEBUG syslog messages */
-
-#ifdef _ 
-#warning "_ already defined"
-#else
-#define _(x) x
-#endif
-
-#ifdef N_ 
-#warning "N_ already defined"
-#else
-#define N_(x) x
-#endif
-
 /* This makes hash table safer when debugging */
 #ifndef GCONF_ENABLE_DEBUG
 #define safe_g_hash_table_insert g_hash_table_insert
diff --git a/gconf/gconftool.c b/gconf/gconftool.c
index d99a38be..6311b193 100644
--- a/gconf/gconftool.c
+++ b/gconf/gconftool.c
@@ -27,20 +27,6 @@
 #include <stdlib.h>
 #include <errno.h>
 
-/* Quick hack so I can mark strings */
-
-#ifdef _ 
-#warning "_ already defined"
-#else
-#define _(x) x
-#endif
-
-#ifdef N_ 
-#warning "N_ already defined"
-#else
-#define N_(x) x
-#endif
-
 static int set_mode = FALSE;
 static int get_mode = FALSE;
 static int unset_mode = FALSE;
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 111b40fc..cf3aa8cb 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -24,6 +24,8 @@ gnulocaledir = $(prefix)/share/locale
 gettextsrcdir = $(prefix)/share/gettext/po
 subdir = po
 
+DESTDIR =
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
@@ -111,16 +113,16 @@ install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
 	if test -r "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(datadir); \
+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
 	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
 	fi
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
+	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
+	    *)     destdir=$(DESTDIR)$(localedir);; \
 	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  dir=$$destdir/$$lang/LC_MESSAGES; \
@@ -153,12 +155,12 @@ install-data-yes: all
 	done
 	if test "$(PACKAGE)" = "gettext"; then \
 	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
+	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
 	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
 	  fi; \
 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(gettextsrcdir)/Makefile.in.in; \
+			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
 	else \
 	  : ; \
 	fi
@@ -171,12 +173,12 @@ uninstall:
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
 	done
-	rm -f $(gettextsrcdir)/po-Makefile.in.in
+	rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
 
 check: all
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 83735b0e..f8e37673 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/gconf \
 
 noinst_PROGRAMS=testgconf testlisteners testschemas testchangeset testencode testunique testpersistence testdirlist testaddress
 
-TESTLIBS= $(ORBIT_LIBS) $(GLIB_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la  $(EFENCE)
+TESTLIBS= $(INTLLIBS) $(ORBIT_LIBS) $(GLIB_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la  $(EFENCE)
 
 testunique_SOURCES=testunique.c
 
diff --git a/wrappers/gtk/Makefile.am b/wrappers/gtk/Makefile.am
index 16b3dffe..ef102f40 100644
--- a/wrappers/gtk/Makefile.am
+++ b/wrappers/gtk/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES=-I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/gconf \
-	$(GLIB_CFLAGS) $(OAF_CFLAGS) $(GMODULE_CFLAGS) $(ORBIT_CFLAGS) $(GTK_CFLAGS) \
+	 -DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\" $(GLIB_CFLAGS) $(OAF_CFLAGS) $(GMODULE_CFLAGS) $(ORBIT_CFLAGS) $(GTK_CFLAGS) \
 	-DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_SYSCONFDIR=\""$(sysconfdir)/$(MAJOR_VERSION)"\" -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\"  -DGCONF_ENABLE_INTERNALS=1 -DG_LOG_DOMAIN=\"GConfClient\"
 
 lib_LTLIBRARIES = libgconf-gtk-1.la
@@ -13,11 +13,11 @@ libgconf_gtk_1_la_SOURCES = \
 
 libgconf_gtk_1_la_LDFLAGS=-version-info $(GCONFGTK_CURRENT):$(GCONFGTK_REVISION):$(GCONFGTK_AGE)
 
-libgconf_gtk_1_la_LIBADD=$(OAF_LIBS) $(GTK_LIBS)
+libgconf_gtk_1_la_LIBADD= $(INTLLIBS) $(OAF_LIBS) $(GTK_LIBS)
 
 noinst_PROGRAMS= testgconfclient
 
 testgconfclient_SOURCES = testgconfclient.c
 
 testgconfclient_DEPS=$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la libgconf-gtk-$(MAJOR_VERSION).la
-testgconfclient_LDADD = $(ORBIT_LIBS) $(GTK_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(top_builddir)/wrappers/gtk/libgconf-gtk-$(MAJOR_VERSION).la
+testgconfclient_LDADD = $(INTLLIBS) $(ORBIT_LIBS) $(GTK_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(top_builddir)/wrappers/gtk/libgconf-gtk-$(MAJOR_VERSION).la
author	Havoc Pennington <hp@redhat.com>	2000-09-11 21:58:49 +0000
committer	Havoc Pennington <hp@src.gnome.org>	2000-09-11 21:58:49 +0000
commit	16c7bcf0113a2b927c5b392ef797532e98246bdb (patch)
tree	6b5e63803fafc3b1ab8f9e77ebd8e389fdf37b67
parent	7332883604e505f102df46f7f9ed1d0068f0e0c5 (diff)
download	gconf-16c7bcf0113a2b927c5b392ef797532e98246bdb.tar.gz