svn commit: r1125474 - in /apr/apr/branches/1.4.x: CHANGES build/apr_common.m4

[rj...@apache.org]

Author: rjung
Date: Fri May 20 17:18:29 2011
New Revision: 1125474

URL: http://svn.apache.org/viewvc?rev=1125474&view=rev
Log:
Silence autoconf 2.68 warnings.

Add AC_LANG_SOURCE to AC_COMPILE_IFELSE
in apr_common.m4.

Backport of r1125472 from trunk
resp. r1125473 from 1.5.x..

Modified:
    apr/apr/branches/1.4.x/CHANGES
    apr/apr/branches/1.4.x/build/apr_common.m4

Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=1125474&r1=1125473&r2=1125474&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Fri May 20 17:18:29 2011
@@ -1,4 +1,8 @@
                                                      -*- coding: utf-8 -*-
+Changes for APR 1.4.6
+
+  *) Silence autoconf 2.68 warnings.  [Rainer Jung]
+
 Changes for APR 1.4.5
 
   *) Security: CVE-2011-1928

Modified: apr/apr/branches/1.4.x/build/apr_common.m4
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/apr_common.m4?rev=1125474&r1=1125473&r2=1125474&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/build/apr_common.m4 (original)
+++ apr/apr/branches/1.4.x/build/apr_common.m4 Fri May 20 17:18:29 2011
@@ -495,12 +495,14 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
    CFLAGS="$CFLAGS -Werror"
  fi
  AC_COMPILE_IFELSE(
-  [#include "confdefs.h"
-  ]
-  [[$1]]
-  [int main(int argc, const char *const *argv) {]
-  [[$2]]
-  [   return 0; }],
+  [AC_LANG_SOURCE(
+   [#include "confdefs.h"
+   ]
+   [[$1]]
+   [int main(int argc, const char *const *argv) {]
+   [[$2]]
+   [   return 0; }]
+  )],
   [$3], [$4])
  CFLAGS=$apr_save_CFLAGS
 ])