[tor-commits] [tor/master] oops: AC_RUN_IFELSE gets offended if I don't give it a AC_LANG_PROGRAM

nickm at torproject.org nickm at torproject.org
Mon Jun 18 15:56:34 UTC 2012


commit 8c0158101cd18c1854c45e51d28316b517184e36
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 18 11:47:05 2012 -0400

    oops: AC_RUN_IFELSE gets offended if I don't give it a AC_LANG_PROGRAM
---
 acinclude.m4 |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index ae14411..9ab6848 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -71,14 +71,12 @@ AC_DEFUN([TOR_CHECK_LDFLAGS], [
     CFLAGS="$CFLAGS -pedantic -Werror"
     LDFLAGS="$LDFLAGS $2 $1"
     LIBS="$LIBS $3"
-    AC_RUN_IFELSE([
-#include <stdio.h>
-int main(int argc, char **argv) { fputs("", stdout); return 0; }],
-                   [AS_VAR_SET(VAR,yes)],
-                   [AS_VAR_SET(VAR,no)],
-		   [AC_TRY_LINK([], [return 0;],
-                                    [AS_VAR_SET(VAR,yes)],
-                                    [AS_VAR_SET(VAR,no)])])
+    AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [fputs("", stdout)])],
+                  [AS_VAR_SET(VAR,yes)],
+                  [AS_VAR_SET(VAR,no)],
+	          [AC_TRY_LINK([], [return 0;],
+                                   [AS_VAR_SET(VAR,yes)],
+                                   [AS_VAR_SET(VAR,no)])])
     CFLAGS="$tor_saved_CFLAGS"
     LDFLAGS="$tor_saved_LDFLAGS"
     LIBS="$tor_saved_LIBS"





More information about the tor-commits mailing list