From 9159cfe0e62fc2e141bed5eeab8331c1288fa06d Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sat, 22 Oct 2011 20:46:36 +0200
Subject: [PATCH] configure: Generate rules to update po files when gettextpo
 is explicitly requested.

---
 aclocal.m4   |  2 +-
 configure    | 20 ++++++++++++--------
 configure.ac | 16 +++++++++++-----
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 7a75fa9bb69..887fef9cef8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -204,7 +204,7 @@ wine_fn_pot_rules ()
     ac_dir=$[1]
     ac_flags=$[2]
 
-    test "x$enable_maintainer_mode" = xyes || return
+    test "x$with_gettextpo" = xyes || return
 
     if wine_fn_has_flag mc $ac_flags
     then
diff --git a/configure b/configure
index 37d8cbac9ab..48978ca6ed6 100755
--- a/configure
+++ b/configure
@@ -1475,7 +1475,7 @@ Optional Packages:
   --without-fontconfig    do not use fontconfig
   --without-freetype      do not use the FreeType library
   --without-gettext       do not use gettext
-  --without-gettextpo     do not use the GetTextPO library
+  --with-gettextpo        use the GetTextPO library to rebuild po files
   --without-gphoto        do not use gphoto (Digital Camera support)
   --without-glu           do not use the GLU library
   --without-gnutls        do not use GnuTLS (schannel support)
@@ -10549,11 +10549,11 @@ $as_echo "#define HAVE_LIBGETTEXTPO 1" >>confdefs.h
 fi
 
     fi
-    if test "x$LIBGETTEXTPO" = "x"; then :
+    test "x$with_gettextpo" != xyes || if test "x$LIBGETTEXTPO" = "x"; then :
   case "x$with_gettextpo" in
-  x)   as_fn_append wine_warnings "|GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported." ;;
+  x)   as_fn_append wine_notices "|GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt." ;;
   xno) ;;
-  *)   as_fn_error $? "GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported.
+  *)   as_fn_error $? "GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.
 This is an error since --with-gettextpo was requested." "$LINENO" 5 ;;
 esac
 fi
@@ -14294,7 +14294,7 @@ wine_fn_pot_rules ()
     ac_dir=$1
     ac_flags=$2
 
-    test "x$enable_maintainer_mode" = xyes || return
+    test "x$with_gettextpo" = xyes || return
 
     if wine_fn_has_flag mc $ac_flags
     then
@@ -15430,10 +15430,14 @@ then
 \$(srcdir)/include/config.h.in: include/stamp-h.in
 \$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4
 	cd \$(srcdir) && autoheader --warnings=all
-	@echo timestamp > \$@
+	@echo timestamp > \$@"
+fi
 
-ALL_POT_FILES =$ALL_POT_FILES
-\$(LINGUAS:%=$srcdir/po/%.po): \$(srcdir)/po/wine.pot
+if test "x$with_gettextpo" = xyes
+then
+    test "$srcdir" = . || as_fn_error $? "Rebuilding po files is not supported for out of tree builds." "$LINENO" 5
+    wine_fn_append_rule ALL_MAKEFILE_DEPENDS "ALL_POT_FILES =$ALL_POT_FILES
+\$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot
 	msgmerge -q \$@ \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@
 \$(srcdir)/po/wine.pot: \$(ALL_POT_FILES)
 	msgcat -o \$@ \$(ALL_POT_FILES)"
diff --git a/configure.ac b/configure.ac
index 4b1f7185f7c..ad4f36f97c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontcon
             [if test "x$withval" = "xno"; then ac_cv_header_fontconfig_fontconfig_h=no; fi])
 AC_ARG_WITH(freetype,  AS_HELP_STRING([--without-freetype],[do not use the FreeType library]))
 AC_ARG_WITH(gettext,   AS_HELP_STRING([--without-gettext],[do not use gettext]))
-AC_ARG_WITH(gettextpo, AS_HELP_STRING([--without-gettextpo],[do not use the GetTextPO library]),
+AC_ARG_WITH(gettextpo, AS_HELP_STRING([--with-gettextpo],[use the GetTextPO library to rebuild po files]),
             [if test "x$withval" = "xno"; then ac_cv_header_gettext_po_h=no; fi])
 AC_ARG_WITH(gphoto,    AS_HELP_STRING([--without-gphoto],[do not use gphoto (Digital Camera support)]))
 AC_ARG_WITH(glu,       AS_HELP_STRING([--without-glu],[do not use the GLU library]),
@@ -1440,7 +1440,8 @@ then
                      [AC_DEFINE(HAVE_LIBGETTEXTPO,1,[Define to 1 if you have the `gettextpo' library (-lgettextpo).])
                       AC_SUBST(LIBGETTEXTPO,"-lgettextpo")])
     fi
-    WINE_WARNING_WITH(gettextpo,[test "x$LIBGETTEXTPO" = "x"],[GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported.])
+    test "x$with_gettextpo" != xyes || WINE_NOTICE_WITH(gettextpo,[test "x$LIBGETTEXTPO" = "x"],
+          [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.])
 fi
 
 dnl **** Check for gstreamer ****
@@ -3063,10 +3064,15 @@ then
 \$(srcdir)/include/config.h.in: include/stamp-h.in
 \$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4
 	cd \$(srcdir) && autoheader --warnings=all
-	@echo timestamp > \$[@]
+	@echo timestamp > \$[@]])
+fi
 
-ALL_POT_FILES =$ALL_POT_FILES
-\$(LINGUAS:%=$srcdir/po/%.po): \$(srcdir)/po/wine.pot
+if test "x$with_gettextpo" = xyes
+then
+    test "$srcdir" = . || AC_MSG_ERROR([Rebuilding po files is not supported for out of tree builds.])
+    WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
+[ALL_POT_FILES =$ALL_POT_FILES
+\$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot
 	msgmerge -q \$[@] \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$[@].new && mv \$[@].new \$[@]
 \$(srcdir)/po/wine.pot: \$(ALL_POT_FILES)
 	msgcat -o \$[@] \$(ALL_POT_FILES)])