[libexif-cvs] m4m gp-gettext-hack.m4,1.3,1.4

[Hans U. N. <hu...@us...>]

Update of /cvsroot/libexif/m4m
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv515/m4m

Modified Files:
	gp-gettext-hack.m4 
Log Message:
Define both LOCALEDIR and GETTEXT_PACKAGE using AM_CPPFLAGS in the GP_GETTEXT_HACK macro

Index: gp-gettext-hack.m4
===================================================================
RCS file: /cvsroot/libexif/m4m/gp-gettext-hack.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- gp-gettext-hack.m4	2 May 2005 19:27:16 -0000	1.3
+++ gp-gettext-hack.m4	26 Jun 2007 01:57:08 -0000	1.4
@@ -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_
 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: