unify macro set

diff --git a/configure.in b/configure.in
index ac2f7a4..9ba9312 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,6 @@ AC_INIT([EXIF library],[0.6.13],[libexif-devel@lists.sourceforge.net],[libexif])
 AC_CONFIG_SRCDIR([libexif/exif-data.h])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([gnu 1.8 dist-bzip2])
-GP_CONFIG_INIT
 GP_CONFIG_MSG([Source code location],[${srcdir}])
 
 dnl ---------------------------------------------------------------------------
@@ -49,9 +48,9 @@ AC_CHECK_LIB([m],[sqrt],[MATHLIBS="-lm"],AC_MSG_ERROR([
 AC_SUBST(MATHLIBS)
 
 
-dnl ---------------------------------------------------------------------------
-dnl i18n support
-dnl ---------------------------------------------------------------------------
+# ---------------------------------------------------------------------------
+# i18n support
+# ---------------------------------------------------------------------------
 GP_GETTEXT_HACK([${PACKAGE}-${LIBEXIF_CURRENT}],
                 [Lutz Müller and others])
 ALL_LINGUAS="de es fr"

diff --git a/m4/gp-config-msg.m4 b/m4/gp-config-msg.m4
index 42db496..a3f5cb1 100644 (file)
--- a/m4/gp-config-msg.m4
+++ b/m4/gp-config-msg.m4
@@ -13,42 +13,37 @@ dnl    GP_CONFIG_MSG([Feature foo],[${foo}])
 dnl    GP_CONFIG_MSG([Location of bar],[${bar}])
 dnl    GP_CONFIG_OUTPUT
 dnl
-
+dnl
 AC_DEFUN([GP_CONFIG_INIT],
-[
+[# the empty string must contain at least as many spaces as the substr length
+ndim_config_empty="                        "
 ndim_config_msg="
 Configuration (${PACKAGE_TARNAME} ${PACKAGE_VERSION}):
 
-"
-])
-
+";])dnl
+dnl
 AC_DEFUN([GP_CONFIG_MSG],
-[
-AC_REQUIRE([GP_CONFIG_INIT])
-# the empty string must contain at least as many spaces as the substr length
-ndim_config_empty="                        "
-if test -n "$1"; then
-   ndim_config_msg="${ndim_config_msg} $(expr "$1:${ndim_config_empty}" : "\(.\{0,22\}\)") $2
+[AC_REQUIRE([GP_CONFIG_INIT])dnl
+m4_if([$1],,[
+# Empty line in config message output
+ndim_config_msg="${ndim_config_msg}
 "
-else
-   ndim_config_msg="${ndim_config_msg}
+],[
+ndim_config_msg="${ndim_config_msg}    $(expr "$1:${ndim_config_empty}" : "\(.\{0,22\}\)") $2
 "
-fi
-])
-
+])])dnl
+dnl
 AC_DEFUN([GP_CONFIG_OUTPUT],
-[
-AC_REQUIRE([GP_CONFIG_INIT])
-AC_REQUIRE([GP_CONFIG_MSG])
+[AC_REQUIRE([GP_CONFIG_INIT])dnl
+AC_REQUIRE([GP_CONFIG_MSG])dnl
 echo "${ndim_config_msg}
-You may run \"make\" and \"make install\" now."
-])
-
+You may run \"make\" and \"make install\" now.";])dnl
+dnl
 dnl Please do not remove this:
 dnl filetype: de774af3-dc3b-4b1d-b6f2-4aca35d3da16
 dnl I use this to find all the different instances of this file which 
 dnl are supposed to be synchronized.
-
+dnl
 dnl Local Variables:
 dnl mode: autoconf
 dnl End:

diff --git a/m4/gp-gettext-hack.m4 b/m4/gp-gettext-hack.m4
index 695667f..b93e13d 100644 (file)
--- a/m4/gp-gettext-hack.m4
+++ b/m4/gp-gettext-hack.m4
@@ -10,7 +10,10 @@ dnl    GP_GETTEXT_HACK([${PACKAGE_TARNAME}-${LIBFOO_CURRENT}],
 dnl                    [Copyright Holder],
 dnl                    [foo-translation@example.org])
 dnl    ALL_LINGUAS="de es fr"
+dnl    AM_GNU_GETTEXT_VERSION([0.14.1])
 dnl    AM_GNU_GETTEXT([external])
+dnl    AM_PO_SUBDIRS()
+dnl    AM_ICONV()
 dnl    GP_GETTEXT_FLAGS
 dnl
 dnl You can leave out the GP_GETTEXT_HACK parameters if you want to,
@@ -19,21 +22,13 @@ dnl
 
 AC_DEFUN([GP_GETTEXT_HACK],
 [
-if test -n "$1"; then
-   GETTEXT_PACKAGE="$1"
-else
-   GETTEXT_PACKAGE=${PACKAGE_TARNAME}
-fi
+m4_if([$1],[],[GETTEXT_PACKAGE="${PACKAGE_TARNAME}"],[GETTEXT_PACKAGE="$1"])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
                    [The gettext domain we're using])
 AC_SUBST([GETTEXT_PACKAGE])
 sed_cmds="s|^DOMAIN.*|DOMAIN = ${GETTEXT_PACKAGE}|"
-if test -n "$2"; then
-   sed_cmds="${sed_cmds};s|^COPYRIGHT_HOLDER.*|COPYRIGHT_HOLDER = $2|"
-fi
-if test -n "$3"; then
-   sed_mb="$3"
-elif test -n "$PACKAGE_BUGREPORT"; then
+m4_if([$2],[],[],[sed_cmds="${sed_cmds};s|^COPYRIGHT_HOLDER.*|COPYRIGHT_HOLDER = $2|"])
+m4_if([$3],[],[if test -n "$PACKAGE_BUGREPORT"; then
    sed_mb="${PACKAGE_BUGREPORT}"
 else
    AC_MSG_ERROR([
@@ -42,12 +37,12 @@ else
 *** or give [GP_GETTEXT_HACK] the second parameter.
 ***
 ])
-fi
+fi],[sed_mb="$3"])
 sed_cmds="${sed_cmds};s|^MSGID_BUGS_ADDRESS.*|MSGID_BUGS_ADDRESS = ${sed_mb}|"
 # Not so sure whether this hack is all *that* evil...
 AC_MSG_CHECKING([for po/Makevars requiring hack])
-if test -f po/Makevars.template; then
-   sed "$sed_cmds" < po/Makevars.template > po/Makevars
+if test -f "${srcdir}/po/Makevars.template"; then
+   sed "$sed_cmds" < "${srcdir}/po/Makevars.template" > "${srcdir}/po/Makevars"
    AC_MSG_RESULT([yes, done.])
 else
    AC_MSG_RESULT([no])