Subject: bug#14830: [PATCH] * configure.ac (HAVE_W32): Avoid nested functions

From: Peter Rosin <[email-masked]>
Date: Tue, 09 Jul 2013 00:49:43 +0200

diff --git a/ChangeLog b/ChangeLog
index 220cffb..03011cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-09  Peter Rosin <[email-masked]>  (tiny change>
+
+	* configure.ac (HAVE_W32): Avoid nested functions (the second
+	argument of AC_LANG_PROGRAM is expanded inside a function).
+
 2013-07-08  Magnus Henoch <[email-masked]> (tiny change)

 	* configure.ac (HAVE_IMAGEMAGICK): Check on NS also (Bug#14798).
diff --git a/configure.ac b/configure.ac
index 3830ee3..1188f1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1632,10 +1632,10 @@ fi

 if test "${opsys}" = "mingw32"; then
   AC_MSG_CHECKING([whether Windows API headers are recent enough])
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
      #include <windows.h>
-     #include <usp10.h>]],
-   [[void test(PIMAGE_NT_HEADERS pHeader)
+     #include <usp10.h>
+     void test(PIMAGE_NT_HEADERS pHeader)
      {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);}]])],
    [emacs_cv_w32api=yes
     HAVE_W32=yes],
--
1.7.9