configure.ac m4 quoting cleanup

attempt to quiet expanded before required warnings from libopts

bk: 4cebd67d0ke_U-hTcqc4jUrV5cFG7w

diff --git a/configure.ac b/configure.ac
index 251a239efcbf5b58a1c53e6a962a3791b7997a41..30724ba6fad76adbe443c12cc9d9d7cad89753c5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -134,7 +134,7 @@ AC_CACHE_CHECK(
     ac_cv_cpp_warning,
     [
        AC_COMPILE_IFELSE(
-           AC_LANG_PROGRAM([], [#warning foo]),
+           [AC_LANG_PROGRAM([[]], [[#warning foo]])],
            [ac_cv_cpp_warning=yes],
            [ac_cv_cpp_warning=no],
        )
@@ -2221,17 +2221,17 @@ AC_CACHE_CHECK(
            ;;
         *)
            AC_COMPILE_IFELSE(
-               AC_LANG_PROGRAM(
-                   [
+               [AC_LANG_PROGRAM(
+                   [[
                        #ifdef HAVE_NETINET_IN_H
                        #include <netinet/in.h>
                        #endif
-                   ],
-                   [
+                   ]],
+                   [[
                        struct ip_mreq ipmr;
                        ipmr.imr_interface.s_addr = 0;
-                   ]
-               ),
+                   ]]
+               )],
                [ntp_cv_multicast=yes],
                []
            )
@@ -2243,7 +2243,7 @@ case "$ntp_cv_multicast" in
  yes)
     AC_DEFINE(MCAST, 1, [Does the target support multicast IP?])
     AC_CACHE_CHECK(
-       [[arg type needed for setsockopt() IP*_MULTICAST_LOOP]],
+       [arg type needed for setsockopt() IP*_MULTICAST_LOOP],
        ntp_cv_typeof_ip_multicast_loop,
        [
            case "$host" in

diff --git a/sntp/configure.ac b/sntp/configure.ac
index 91e4cf9057308a3210ce58e88fd3e9702bf5758c..c488e22d74601db3b658caae7c6400a0cc5ea28c 100644 (file)
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -476,17 +476,17 @@ AC_CACHE_CHECK(
            ;;
         *)
            AC_COMPILE_IFELSE(
-               AC_LANG_PROGRAM(
-                   [
+               [AC_LANG_PROGRAM(
+                   [[
                        #ifdef HAVE_NETINET_IN_H
                        #include <netinet/in.h>
                        #endif
-                   ],
-                   [
+                   ]],
+                   [[
                        struct ip_mreq ipmr;
                        ipmr.imr_interface.s_addr = 0;
-                   ]
-               ),
+                   ]]
+               )],
                [ntp_cv_multicast=yes],
                []
            )

diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4
index 7b6a9fb3052e7c46e7d402485c56ff03d0138566..97732ceae1709b8ecc347f8be95de357093c039e 100644 (file)
--- a/sntp/libopts/m4/libopts.m4
+++ b/sntp/libopts/m4/libopts.m4
@@ -9,8 +9,7 @@ dnl
 dnl do always before generated macros:
 dnl
 AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
-[if test X${INVOKE_LIBOPTS_MACROS_FIRST_done} != Xyes ; then]
-  AC_HEADER_STDC
+  AC_REQUIRE([AC_HEADER_STDC])dnl
   AC_HEADER_DIRENT
   
   # =================
@@ -105,9 +104,8 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
   AC_FUNC_VPRINTF
   AC_FUNC_FORK
   AC_CHECK_FUNCS([mmap canonicalize_file_name snprintf strdup strchr \
-                 strrchr strsignal])
-[  INVOKE_LIBOPTS_MACROS_FIRST_done=yes
-fi]])
+                  strrchr strsignal])
+])
 
 dnl
 dnl @synopsis  INVOKE_LIBOPTS_MACROS
@@ -408,7 +406,7 @@ AC_DEFUN([LIBOPTS_DISABLE_OPTIONAL_ARGS],[
 
 
 AC_DEFUN([INVOKE_LIBOPTS_MACROS],[
-  INVOKE_LIBOPTS_MACROS_FIRST
+  AC_REQUIRE([INVOKE_LIBOPTS_MACROS_FIRST])dnl
   # Check to see if a reg expr header is specified.
   LIBOPTS_WITH_REGEX_HEADER
 
@@ -470,6 +468,7 @@ dnl
 dnl Default to system libopts
 dnl
 AC_DEFUN([LIBOPTS_CHECK],[
+  AC_REQUIRE([INVOKE_LIBOPTS_MACROS_FIRST])dnl
   [NEED_LIBOPTS_DIR='']
   m4_pushdef([AO_Libopts_Dir],
            [ifelse($1, , [libopts], [$1])])
@@ -541,9 +540,7 @@ AC_DEFUN([LIBOPTS_CHECK],[
     [AC_CONFIG_FILES(AO_Libopts_Dir/Makefile)])
   m4_popdef([AO_Libopts_Dir])
 
-  AM_COND_IF([BUILD_LIBOPTS],
-    [INVOKE_LIBOPTS_MACROS],
-    [INVOKE_LIBOPTS_MACROS_FIRST])
+  AM_COND_IF([BUILD_LIBOPTS], [INVOKE_LIBOPTS_MACROS])
   [
 # end of AC_DEFUN of LIBOPTS_CHECK]
 ])