Ensure en@quot and en@boldquot only appear in LINGUAS once. make distcheck lives!

[wget] / configure.ac

diff --git a/configure.ac b/configure.ac
index b517c47548e6e586331f07de568521426ce13720..4f65b7b151f47f2bae0b18a4eb25bbf69a8669b2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,13 +29,10 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 
 AC_INIT([wget], 
-       [m4_normalize(esyscmd([sed -e 's/^.*"\(.*\)";$/\1/' src/version.c]))],
+       [1.12-devel],
        [bug-wget@gnu.org])
 AC_PREREQ(2.61)
 
-# Make configure depend on the VERSION file, since it's used in AC_INIT
-AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/src/version.c'])
-
 dnl
 dnl What version of Wget are we building?
 dnl
@@ -109,6 +106,7 @@ test -z "$CC" && cc_specified=yes
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_AIX
+gl_EARLY
 
 AC_PROG_RANLIB
 
@@ -186,6 +184,9 @@ AC_CHECK_TYPES(sig_atomic_t, [], [], [
 #include <signal.h>
 ])
 
+# gnulib
+gl_INIT
+
 dnl
 dnl Checks for library functions.
 dnl
@@ -219,13 +220,6 @@ WGET_NANOSLEEP
 WGET_POSIX_CLOCK
 WGET_NSL_SOCKET
 
-dnl
-dnl Check if we need to compile in getopt.c.
-dnl
-AC_CHECK_FUNC(getopt_long, [], [
-  AC_LIBOBJ([getopt])
-])
-
 dnl
 dnl Checks for libraries.
 dnl
@@ -340,7 +334,6 @@ then
   dnl If none of the above worked, use the one we ship with Wget.
   if test x"$found_md5" = xno; then
     AC_DEFINE([HAVE_BUILTIN_MD5], 1, [Define when using built-in MD5.])
-    AC_LIBOBJ([gnu-md5])
     found_md5=yes
     AC_MSG_NOTICE([using the built-in (GNU) MD5 implementation])
     AC_C_BIGENDIAN
@@ -432,10 +425,7 @@ dnl     ALL_LINGUAS="cs de hr it ..."
 dnl The downside was that configure needed to be rebuilt whenever a
 dnl new language was added.
 dnl
-dnl ALL_LINGUAS=`(cd ${srcdir}/po && ls *.po | sed -e 's/\.po$//' | tr '\012' ' ')`
-
-dnl internationalization macros
-dnl WGET_WITH_NLS
+ALL_LINGUAS="en@quot en@boldquot $(cd ${srcdir}/po && ls *.po | grep -v 'en@.*quot' | sed -e 's/\.po$//' | tr '\012' ' ')"
 
 dnl
 dnl Find makeinfo.  We used to provide support for Emacs processing
@@ -466,10 +456,6 @@ dnl Create output
 dnl
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile util/Makefile
                  po/Makefile.in tests/Makefile tests/WgetTest.pm
-                 windows/Makefile])
+                 lib/Makefile windows/Makefile])
 AC_CONFIG_HEADERS([src/config.h])
-AH_BOTTOM([
-#include "config-post.h"
-])
-AC_CONFIG_COMMANDS([default], [WGET_PROCESS_PO])
 AC_OUTPUT