2005-10-02 Marcus Brinkmann <[email protected]>

	* configure.ac [!$try_gettext]: Invoke AM_PO_SUBDIRS.

scripts/
2005-10-02  Marcus Brinkmann  <[email protected]>

	* autogen.sh (DIE): Remove ugly hack for po dir suppression.

4 files changed, 9 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 8504ed3a2..f73c93b02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-02  Marcus Brinkmann  <[email protected]>
+
+	* configure.ac [!$try_gettext]: Invoke AM_PO_SUBDIRS.
+
 2005-08-31  David Shaw  <[email protected]>
 
 	* configure.ac: Check for getpwnam, getpwuid, and pwd.h.
diff --git a/configure.ac b/configure.ac
index a5e327648..17482d4c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -708,6 +708,7 @@ else
   AC_SUBST(USE_NLS)
   AC_SUBST(USE_INCLUDED_LIBINTL)
   AC_SUBST(BUILD_INCLUDED_LIBINTL)
+  AM_PO_SUBDIRS
 fi
 
 if test "$try_extensions" = yes || test x"$card_support" = xyes ; then
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index b9ac70965..6d25f763e 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-02  Marcus Brinkmann  <[email protected]>
+
+	* autogen.sh (DIE): Remove ugly hack for po dir suppression.
+
 2005-08-21  David Shaw  <[email protected]>
 
 	* gnupg.spec.in: Distribute gpg-zip.
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index b75bb1819..74df2b236 100755
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -99,12 +99,6 @@ if test "$1" = "--build-w32"; then
 
     $tsdir/configure ${conf_CC} --build=${build} --host=${host} \
                 ${disable_foo_tests}  $*
-
-    # Ugly hack to overcome a gettext problem.  Someone should look into
-    # gettext to figure out why the po directory is not ignored as it used
-    # to be.
-    [ $? = 0 ] && touch $tsdir/po/all
-    exit $?
 fi