Fixed some autoconf bit rot.

Autoconf 2.68 is more picky about correct macro usage and thus I fixed
some wrong call conventions for AC_LANG_PROGRAM.  Also factored an m4
conditional construct out from AC_INIT to avoid the "not a literal"
warning.

9 files changed, 72 insertions, 215 deletions

diff --git a/ChangeLog b/ChangeLog
index be48d831b..fb3bec9e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-09  Werner Koch  <[email protected]>
+
+	* configure.ac: Fix usage of AC_LANG_PROGRAM.
+
 2010-12-28  Werner Koch  <[email protected]>
 
 	* configure.ac (git_revision): Add new m4 macro.
@@ -197,7 +201,7 @@
 
 	* configure.ac (AC_CONFIG_COMMANDS): Removed creation of
 	g10defs.h.
-	(AH_BOTTOM): Moved stuff from g10defs.h to config.h. 
+	(AH_BOTTOM): Moved stuff from g10defs.h to config.h.
 
 2006-12-07  David Shaw  <[email protected]>
 
@@ -235,7 +239,7 @@
 	* acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Add case for mingw32
 	and allow setting the variable on the command line.  Fixes bug 518.
 	Also use HOST instead of TARGET.
-	
+
 	* README: Add information about the forthcoming GnuPG 2.0.
 
 	* configure.ac (AB_INIT): New.
@@ -524,7 +528,7 @@
 
 2005-03-11  Werner Koch  <[email protected]>
 
-	* configure.ac: New option --enable-noexecstack. 
+	* configure.ac: New option --enable-noexecstack.
 
 2005-02-16  Werner Koch  <[email protected]>
 
@@ -633,7 +637,7 @@
 2004-12-14  Werner Koch  <[email protected]>
 
 	Released 1.3.93.
-	
+
 	* Makefile.am (AUTOMAKE_OPTIONS): Add filename-length-max=99.
 
 2004-11-06  David Shaw  <[email protected]>
@@ -869,7 +873,7 @@
 	(EXTRA_DIST): Add scripts/config.rpath.
 	* configure.ac (AC_CONFIG_FILES): Add po/Makefile.in,
 	(AL_LINGUAS): Removed.
-	
+
 2003-10-24  David Shaw  <[email protected]>
 
 	* configure.ac (DLLIBS): Work properly on platforms where dlopen
@@ -877,7 +881,7 @@
 
 2003-10-24  Werner Koch  <[email protected]>
 
-	* configure.ac (DLLIBS): Fixed last change. 
+	* configure.ac (DLLIBS): Fixed last change.
 
 2003-10-23  Werner Koch  <[email protected]>
 
@@ -903,7 +907,7 @@
 
 2003-10-01  Werner Koch  <[email protected]>
 
-	* configure.ac (AH_BOTTOM): Define GNUPG_MAJOR_VERSION. 
+	* configure.ac (AH_BOTTOM): Define GNUPG_MAJOR_VERSION.
 	(ENABLE_CARD_SUPPORT): Define as automake conditional.
 
 2003-09-30  David Shaw  <[email protected]>
@@ -1157,7 +1161,7 @@
 2002-10-18  Werner Koch  <[email protected]>
 
 	Released 1.3.0.
-	
+
 	* configure.ac: Changed version number comments.
 	(ALL_LINGUAS): Removed all except for de.  During development it
 	might not be a good idea to keep all of them - they get outdated
@@ -1320,7 +1324,7 @@
 
 	* configure.ac: Replace the 'c:/' variables with 'c:\' due
 	to the fact we already use '\' in the remaining code.
-	
+
 2002-07-08  David Shaw  <[email protected]>
 
 	* configure.ac: Add --with-mailprog to override the use of
@@ -1351,7 +1355,7 @@
 	* configure.ac: Set version number to 1.1.91.
 
         Released 1.1.90.
-	
+
 	* INSTALL: Replaced by generic install file.
 	* README: Marked as development version and moved most stuff of
 	the old INSTALL file to here.
@@ -1382,7 +1386,7 @@
 	Also, check for the Mozilla LDAP library if the OpenLDAP library
 	check fails.  Put -lsocket and -lnsl in NETLIBS rather than LIBS
 	so not all programs are forced to link to them.
-	
+
 2002-06-05  David Shaw  <[email protected]>
 
 	* configure.ac: Add a switch for the experimental external HKP
@@ -1467,7 +1471,7 @@
 2001-12-22  Werner Koch  <[email protected]>
 
         Released 1.0.6c snapshot.
-	
+
 	* configure.ac (AH_BOTTOM): Moved EXEC_TEMPFILE_ONLY to here.
 
 	* acconfig.h:  Removed, it should no longer be used.
@@ -1508,7 +1512,7 @@
 
 2001-10-22  Werner Koch  <[email protected]>
 
-	* configure.ac: Fixed for automake 1.5 
+	* configure.ac: Fixed for automake 1.5
 
 2001-10-17  Werner Koch  <[email protected]>
 
@@ -1545,7 +1549,7 @@
 2001-08-22  Werner Koch  <[email protected]>
 
 	* configure.ac (gethrtime): Enhanced the test by running a test
-	program. 
+	program.
 	* INSTALL: Removed the note about Solaris problems because the
 	above test should catch this.
 
@@ -1561,11 +1565,11 @@
 	* configure.ac: Set some compiler flags for dec-osf and hpux. By
 	Tim Mooney.
 
-	* configure.ac: Create g10defs.h with EXTSEP_S et al. 
+	* configure.ac: Create g10defs.h with EXTSEP_S et al.
 
 2001-08-03  Werner Koch  <[email protected]>
 
-	* configure.ac (VERSION,PACKAGE): Fixed quoting. 
+	* configure.ac (VERSION,PACKAGE): Fixed quoting.
 
 2001-07-26  Werner Koch  <[email protected]>
 
@@ -1585,7 +1589,7 @@
 	* Makefile.am (DISTCLEANFILES): gettext is better now; no more
 	need to remove the libintl.h symlink.
         (dist-hook): Create VERSION file.
-	
+
 2001-06-08  Werner Koch  <[email protected]>
 
 	* configure.in (DYNLINK_MOD_CFLAGS): Use -shared with dec-osf.
@@ -1618,7 +1622,7 @@
 	anyway.
 
 	* configure.in: Use it here.
-	
+
 	* configure.in (ALL_LINGUAS): Add Estonian translation by Toomas Soome.
 	(use_m_debug): Removed --enable-m-debug because it does not work
 	anymore.
@@ -1639,7 +1643,7 @@
 
 2001-03-12  Werner Koch  <[email protected]>
 
-	* INSTALL: Add a note to VPATH builds. 
+	* INSTALL: Add a note to VPATH builds.
 
 2001-03-08  Werner Koch  <[email protected]>
 
@@ -1659,7 +1663,7 @@
 
         Actually Paul's patches are dated 2000-20-17; I applied them today
 	and merged some ChangeLog entries ([email protected]).
-	
+
         * configure.in (AC_SYS_LARGEFILE): Add.
         (try_large_file): Remove.  All uses removed.
         (AC_CHECK_FUNCS): Remove fopen64 and fstat64.
diff --git a/configure.ac b/configure.ac
index 4e9d53d66..1349c1865 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,17 +3,17 @@
 #               2008, 2009 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
-# 
+#
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
@@ -27,14 +27,15 @@ min_automake_version="1.9.3"
 # "svn up" and "autogen.sh --force" right before creating a distribution.
 m4_define([my_version], [1.4.12])
 m4_define([my_issvn], [yes])
+
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
 m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
           | awk '/^\* / {printf "%s",$3}']))
-AC_INIT([gnupg], 
-        [my_version[]m4_if(my_issvn,[yes],
-        [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])],
-        [[email protected]])
+m4_define([my_full_version], [my_version[]m4_if(my_issvn,[yes],
+          [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])])
+
+AC_INIT([gnupg],[my_full_version],[http://bugs.gnupg.org])
 # Set development_version to yes if the minor number is odd or you
 # feel that the default check for a development version is not
 # sufficient.
@@ -210,7 +211,7 @@ if test x"$use_idea" = xyes ; then
 
    AC_MSG_CHECKING([for idea cipher module])
    tmp=""
-   if test -f $srcdir/cipher/idea.c; then 
+   if test -f $srcdir/cipher/idea.c; then
       IDEA_O=idea.o
       tmp=idea
    else
@@ -468,7 +469,7 @@ is intended for making fat binary builds on OS X. */
 # define GNUPG_TMP_SFX "_tmp"
 #else /*!def __VMS */
 # define GNUPG_BAK_SFX "~"
-# define GNUPG_TMP_SFX EXTSEP_S "tmp" 
+# define GNUPG_TMP_SFX EXTSEP_S "tmp"
 #endif /* def __VMS [else] */
 
 
@@ -486,7 +487,7 @@ is intended for making fat binary builds on OS X. */
 #  define GNUPG_LIBDIR      "/SYS$MANAGER/gnupg_share"
 #  define GNUPG_LIBEXECDIR  ""
 # else
-#  define GNUPG_HOMEDIR "~/.gnupg" 
+#  define GNUPG_HOMEDIR "~/.gnupg"
 # endif
 #endif
 
@@ -634,7 +635,7 @@ esac
 
 if test "$have_dosish_system" = yes; then
    AC_DEFINE(HAVE_DOSISH_SYSTEM,1,
-             [defined if we run on some of the PCDOS like systems 
+             [defined if we run on some of the PCDOS like systems
               (DOS, Windoze. OS/2) with special properties like
               no file modes])
 fi
@@ -713,10 +714,10 @@ if test x"$use_dns_pka" = xyes || test x"$use_dns_srv" = xyes || test x"$use_dns
     # code to use the BIND 8 resolver API.
 
     AC_MSG_CHECKING([whether the resolver is usable])
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
-#include <resolv.h>],
+#include <resolv.h>]],
 [[unsigned char answer[PACKETSZ]; res_query("foo.bar",C_IN,T_A,answer,PACKETSZ); dn_skipname(0,0); dn_expand(0,0,0,0,0);]])],have_resolver=yes,have_resolver=no)
     AC_MSG_RESULT($have_resolver)
 
@@ -725,11 +726,11 @@ if test x"$use_dns_pka" = xyes || test x"$use_dns_srv" = xyes || test x"$use_dns
 
     if test x"$have_resolver" != xyes ; then
        AC_MSG_CHECKING([whether I can make the resolver usable with BIND_8_COMPAT])
-       AC_LINK_IFELSE([AC_LANG_PROGRAM([#define BIND_8_COMPAT
+       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define BIND_8_COMPAT
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
-#include <resolv.h>],
+#include <resolv.h>]],
 [[unsigned char answer[PACKETSZ]; res_query("foo.bar",C_IN,T_A,answer,PACKETSZ); dn_skipname(0,0); dn_expand(0,0,0,0,0);]])],[have_resolver=yes ; need_compat=yes])
        AC_MSG_RESULT($have_resolver)
     fi
@@ -888,7 +889,7 @@ if test "$try_extensions" = yes || test x"$card_support" = xyes ; then
          AC_MSG_NOTICE([dlopen not found.  Disabling extensions.])
 	 try_extensions=no
       fi
-  
+
       if test "$card_support" = yes ; then
          AC_MSG_WARN([dlopen not found.  Disabling OpenPGP card support.])
          card_support=no
@@ -978,8 +979,8 @@ GNUPG_TIME_T_UNSIGNED
 # Ensure that we have UINT64_C before we bother to check for uint64_t
 AC_CHECK_HEADERS([inttypes.h])
 AC_CACHE_CHECK([for UINT64_C], [gnupg_cv_uint64_c_works],
-               AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <inttypes.h>],[
-uint64_t foo=UINT64_C(42);]),gnupg_cv_uint64_c_works=yes,gnupg_cv_uint64_c_works=no))
+               AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <inttypes.h>]],[[
+uint64_t foo=UINT64_C(42);]])],gnupg_cv_uint64_c_works=yes,gnupg_cv_uint64_c_works=no))
 
 if test "$gnupg_cv_uint64_c_works" = "yes" ; then
    AC_CHECK_SIZEOF(uint64_t)
@@ -1030,10 +1031,10 @@ AC_CHECK_FUNC(getopt,,AC_CHECK_LIB(iberty,getopt,AC_SUBST(GETOPT,"-liberty")))
 
 #
 # check for gethrtime and run a testprogram to see whether
-# it is broken.  It has been reported that some Solaris and HP UX systems 
+# it is broken.  It has been reported that some Solaris and HP UX systems
 # raise an SIGILL
 #
-AC_CACHE_CHECK([for gethrtime], 
+AC_CACHE_CHECK([for gethrtime],
                [gnupg_cv_func_gethrtime],
                [AC_TRY_LINK([#include <sys/times.h>],[
                    hrtime_t tv;
@@ -1045,13 +1046,13 @@ AC_CACHE_CHECK([for gethrtime],
 if test $gnupg_cv_func_gethrtime = yes; then
      AC_DEFINE([HAVE_GETHRTIME], 1,
                [Define if you have the `gethrtime(2)' function.])
-     AC_CACHE_CHECK([whether gethrtime is broken], 
+     AC_CACHE_CHECK([whether gethrtime is broken],
                [gnupg_cv_func_broken_gethrtime],
                [AC_TRY_RUN([
                    #include <sys/times.h>
                    int main () {
                    hrtime_t tv;
-                   tv = gethrtime(); 
+                   tv = gethrtime();
                  }
                  ],
                  [gnupg_cv_func_broken_gethrtime=no],
@@ -1063,7 +1064,7 @@ if test $gnupg_cv_func_gethrtime = yes; then
       [Define if `gethrtime(2)' does not work correctly i.e. issues a SIGILL.])
     fi
 fi
-     
+
 
 GNUPG_CHECK_MLOCK
 GNUPG_FUNC_MKDIR_TAKES_ONE_ARG
@@ -1159,7 +1160,7 @@ if test "$use_static_rnd" = default; then
                 ;;
             *)
                 random_modules="rndlinux rndegd rndunix"
-                AC_DEFINE(USE_ALL_RANDOM_MODULES, 1, 
+                AC_DEFINE(USE_ALL_RANDOM_MODULES, 1,
                           [Allow to select random modules at runtime.])
                 ;;
          esac
@@ -1180,23 +1181,23 @@ print_egd_warning=no
 for rndmod in $random_modules "" ; do
   case "$rndmod" in
     rndlinux)
-         AC_DEFINE(USE_RNDLINUX,1, 
+         AC_DEFINE(USE_RNDLINUX,1,
                   [Defined if the /dev/random based RNG should be used.])
          use_rndlinux=yes
          ;;
     rndunix)
-         AC_DEFINE(USE_RNDUNIX,1, 
+         AC_DEFINE(USE_RNDUNIX,1,
                   [Defined if the default Unix RNG should be used.])
          print_egd_warning=yes
          use_rndunix=yes
           ;;
     rndegd)
-         AC_DEFINE(USE_RNDEGD,1, 
+         AC_DEFINE(USE_RNDEGD,1,
                   [Defined if the EGD based RNG should be used.])
          use_rndegd=yes
          ;;
     rndw32)
-         AC_DEFINE(USE_RNDW32,1, 
+         AC_DEFINE(USE_RNDW32,1,
                   [Defined if the Windows specific RNG should be used.])
          use_rndw32=yes
         ;;
@@ -1356,7 +1357,7 @@ GNUPG_CHECK_READLINE
 
 # Allow users to append something to the version string without
 # flagging it as development version.  The user version parts is
-# considered everything after a dash. 
+# considered everything after a dash.
 if test "$development_version" != yes; then
   changequote(,)dnl
   tmp_pat='[a-zA-Z]'
@@ -1374,7 +1375,7 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
 
 
 # add some extra libs here so that previous tests don't fail for
-# mysterious reasons - the final link step should bail out. 
+# mysterious reasons - the final link step should bail out.
 case "${host}" in
     *-mingw32*)
 dnl      NETLIBS="$NETLIBS -lwsock32"
@@ -1413,7 +1414,7 @@ if test "$GCC" = yes; then
     _gcc_cflags_save=$CFLAGS
     CFLAGS="-Wno-pointer-sign"
 
-    AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_psign=yes,_gcc_psign=no)
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],_gcc_psign=yes,_gcc_psign=no)
     AC_MSG_RESULT($_gcc_psign)
 
     CFLAGS=$_gcc_cflags_save;
@@ -1467,7 +1468,7 @@ AC_OUTPUT
 
 # Give some feedback
 echo
-echo   "                Version info:   $PACKAGE_STRING"             
+echo   "                Version info:   $PACKAGE_STRING"
 echo   "                Configured for: $PRINTABLE_OS_NAME ($host)"
 if test -n "$show_extraasm"; then
   echo "  Extra cpu specific functions:$show_extraasm"
diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h
deleted file mode 100644
index f891deb96..000000000
--- a/intl/libgnuintl.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H	1
-
-#include <locale.h>
-
-/* The LC_MESSAGES locale category is the category used by the functions
-   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
-   On systems that don't define it, use an arbitrary value instead.
-   On Solaris, <locale.h> defines __LOCALE_H then includes <libintl.h> (i.e.
-   this file!) and then only defines LC_MESSAGES.  To avoid a redefinition
-   warning, don't define LC_MESSAGES in this case.  */
-#if !defined LC_MESSAGES && !defined __LOCALE_H
-# define LC_MESSAGES 1729
-#endif
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
-   precedence over _conio_gettext.  */
-#ifdef __DJGPP__
-# undef gettext
-# define gettext gettext
-#endif
-
-#ifndef PARAMS
-# if __STDC__ || defined __cplusplus
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext PARAMS ((const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
-				int __category));
-
-
-/* Similar to `gettext' but select the plural form corresponding to the
-   number N.  */
-extern char *ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
-			       unsigned long int __n));
-
-/* Similar to `dgettext' but select the plural form corresponding to the
-   number N.  */
-extern char *dngettext PARAMS ((const char *__domainname, const char *__msgid1,
-				const char *__msgid2, unsigned long int __n));
-
-/* Similar to `dcgettext' but select the plural form corresponding to the
-   number N.  */
-extern char *dcngettext PARAMS ((const char *__domainname, const char *__msgid1,
-				 const char *__msgid2, unsigned long int __n,
-				 int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain PARAMS ((const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain PARAMS ((const char *__domainname,
-				     const char *__dirname));
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-extern char *bind_textdomain_codeset PARAMS ((const char *__domainname,
-					      const char *__codeset));
-
-
-/* Optimized version of the functions above.  */
-#if defined __OPTIMIZED
-/* These are macros, but could also be inline functions.  */
-
-# define gettext(msgid)							      \
-  dgettext (NULL, msgid)
-
-# define dgettext(domainname, msgid)					      \
-  dcgettext (domainname, msgid, LC_MESSAGES)
-
-# define ngettext(msgid1, msgid2, n)					      \
-  dngettext (NULL, msgid1, msgid2, n)
-
-# define dngettext(domainname, msgid1, msgid2, n)			      \
-  dcngettext (domainname, msgid1, msgid2, n, LC_MESSAGES)
-
-#endif /* Optimizing. */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libintl.h */
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 5cbbb6321..80447d475 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-09  Werner Koch  <[email protected]>
+
+	* libcurl.m4: s/ifelse/m4_if/.
+
 2009-07-21  Werner Koch  <[email protected]>
 
 	* estream.m4: New.  Taken from libestream.
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
index b43cd9005..c763146a3 100644
--- a/m4/libcurl.m4
+++ b/m4/libcurl.m4
@@ -58,7 +58,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
 
   AC_ARG_WITH(libcurl,
      AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]),
-     [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
+     [_libcurl_with=$withval],[_libcurl_with=m4_if([$1],,[yes],[$1])])
 
   if test "$_libcurl_with" != "no" ; then
 
@@ -82,7 +82,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
            [libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`])
 
 	_libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse`
-	_libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse`
+	_libcurl_wanted=`echo m4_if([$2],,[0],[$2]) | $_libcurl_version_parse`
 
         if test $_libcurl_wanted -gt 0 ; then
 	   AC_CACHE_CHECK([for libcurl >= version $2],
@@ -141,7 +141,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
            _libcurl_save_libs=$LIBS
            LIBS="$LIBCURL $LIBS"
 
-           AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <curl/curl.h>],[
+           AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curl/curl.h>]],[[
 /* Try and use a few common options to force a failure if we are
    missing symbols or can't link. */
 int x;
@@ -152,7 +152,7 @@ x=CURLOPT_FILE;
 x=CURLOPT_ERRORBUFFER;
 x=CURLOPT_STDERR;
 x=CURLOPT_VERBOSE;
-]),libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
+]])],libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
 
            CPPFLAGS=$_libcurl_save_cppflags
            LIBS=$_libcurl_save_libs
@@ -251,10 +251,10 @@ x=CURLOPT_VERBOSE;
 
   if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then
      # This is the IF-NO path
-     ifelse([$4],,:,[$4])
+     m4_if([$4],,:,[$4])
   else
      # This is the IF-YES path
-     ifelse([$3],,:,[$3])
+     m4_if([$3],,:,[$3])
   fi
 
   unset _libcurl_with
diff --git a/m4/libusb.m4 b/m4/libusb.m4
index 809dc1dd9..6f2460e10 100644
--- a/m4/libusb.m4
+++ b/m4/libusb.m4
@@ -43,9 +43,9 @@ AC_DEFUN([GNUPG_CHECK_LIBUSB],
 
      AC_MSG_CHECKING([whether libusb is present and sane])
 
-     AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <usb.h>],[
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <usb.h>]],[[
 usb_bulk_write(NULL,0,NULL,0,0);
-]),_found_libusb=yes,_found_libusb=no)
+]])],_found_libusb=yes,_found_libusb=no)
 
      AC_MSG_RESULT([$_found_libusb])
 
diff --git a/m4/readline.m4 b/m4/readline.m4
index d25234605..f3be681fb 100644
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -30,18 +30,18 @@ AC_DEFUN([GNUPG_CHECK_READLINE],
 
         AC_MSG_CHECKING([whether readline via \"$_combo\" is present and sane])
 
-        AC_LINK_IFELSE(AC_LANG_PROGRAM([
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <stdio.h>
 #include <readline/readline.h>
 #include <readline/history.h>
-],[
+]],[[
 rl_completion_func_t *completer;
 add_history("foobar");
 rl_catch_signals=0;
 rl_inhibit_completion=0;
 rl_attempted_completion_function=NULL;
 rl_completion_matches(NULL,NULL);
-]),_found_readline=yes,_found_readline=no)
+]])],_found_readline=yes,_found_readline=no)
 
         AC_MSG_RESULT([$_found_readline])
 
diff --git a/po/[email protected] b/po/[email protected]
deleted file mode 100644
index c5b6cead6..000000000
--- a/po/[email protected]
+++ /dev/null
@@ -1,12 +0,0 @@
-/^msgid /{
-x
-s/m/m/
-ta
-r [email protected]
-g
-N
-bb
-:a
-x
-:b
-}
diff --git a/po/[email protected] b/po/[email protected]
deleted file mode 100644
index 64c963a84..000000000
--- a/po/[email protected]
+++ /dev/null
@@ -1,12 +0,0 @@
-/^msgid /{
-x
-s/m/m/
-ta
-r [email protected]
-g
-N
-bb
-:a
-x
-:b
-}