Define both LOCALEDIR and GETTEXT_PACKAGE using AM_CPPFLAGS in the GP_GETTEXT_HACK...

diff --git a/configure.ac b/configure.ac
index f345cc8..de790d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -161,12 +161,6 @@ AM_PO_SUBDIRS()
 AM_ICONV()
 GP_GETTEXT_FLAGS()
 
-dnl We cannot use AC_DEFINE_UNQUOTED() for these definitions, as
-dnl we require make to do insert the proper $(datadir) value
-localedir="\$(datadir)/locale"
-AC_SUBST(localedir)
-AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\"${localedir}\\\""
-
 
 dnl ---------------------------------------------------------------------------
 dnl Compiler/Linker Options and Warnings

diff --git a/m4m/gp-gettext-hack.m4 b/m4m/gp-gettext-hack.m4
index 3f5dbb7..439822b 100644 (file)
--- a/m4m/gp-gettext-hack.m4
+++ b/m4m/gp-gettext-hack.m4
@@ -25,8 +25,8 @@ AC_DEFUN([GP_GETTEXT_HACK],
 AC_BEFORE([$0], [AM_GNU_GETTEXT])dnl
 AC_BEFORE([$0], [AM_GNU_GETTEXT_VERSION])dnl
 m4_if([$1],[],[GETTEXT_PACKAGE="${PACKAGE_TARNAME}"],[GETTEXT_PACKAGE="$1"])
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
-                   [The gettext domain we're using])
+# The gettext domain we're using
+AM_CPPFLAGS="$AM_CPPFLAGS -DGETTEXT_PACKAGE=\\\"${GETTEXT_PACKAGE}\\\""
 AC_SUBST([GETTEXT_PACKAGE])
 sed_cmds="s|^DOMAIN.*|DOMAIN = ${GETTEXT_PACKAGE}|"
 m4_if([$2],[],[],[sed_cmds="${sed_cmds};s|^COPYRIGHT_HOLDER.*|COPYRIGHT_HOLDER = $2|"])
@@ -66,6 +66,10 @@ GP_CONFIG_MSG([Use translations],[${USE_NLS}])
 if test "x$USE_NLS" = "xyes" && test "${BUILD_INCLUDED_LIBINTL}"; then
    GP_CONFIG_MSG([Use included libintl],[${BUILD_INCLUDED_LIBINTL}])
 fi
+dnl We cannot use AC_DEFINE_UNQUOTED() for these definitions, as
+dnl we require make to do insert the proper $(datadir) value
+AC_SUBST([localedir], ['$(datadir)/locale'])
+AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\"${localedir}\\\""
 ])
 
 dnl Please do not remove this: