You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by je...@apache.org on 2010/11/01 20:29:16 UTC
svn commit: r1029802 - in /subversion/trunk: build/ac-macros/gssapi.m4
build/ac-macros/kwallet.m4 build/ac-macros/neon.m4 build/ac-macros/swig.m4
configure.ac
Author: jerenkrantz
Date: Mon Nov 1 19:29:16 2010
New Revision: 1029802
URL: http://svn.apache.org/viewvc?rev=1029802&view=rev
Log:
Fix warnings about missing AC_LANG_SOURCE with autoconf 2.68; tested also
against 2.59.
Kudos to Philip Martin for pointing me at final bit needed to fix this.
* build/ac-macros/kwallet.m4 (SVN_LIB_KWALLET),
build/ac-macros/swig.m4 (SVN_FIND_SWIG),
build/ac-macros/gssapi.m4 (SVN_LIB_RA_SERF_GSSAPI),
build/ac-macros/neon.m4 (SVN_NEON_CONFIG),
configure.ac:
Wrap AC_{PREPROC,COMPILE,LINK}_IFELSE source argument with AC_LANG_SOURCE.
Modified:
subversion/trunk/build/ac-macros/gssapi.m4
subversion/trunk/build/ac-macros/kwallet.m4
subversion/trunk/build/ac-macros/neon.m4
subversion/trunk/build/ac-macros/swig.m4
subversion/trunk/configure.ac
Modified: subversion/trunk/build/ac-macros/gssapi.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/gssapi.m4?rev=1029802&r1=1029801&r2=1029802&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/gssapi.m4 (original)
+++ subversion/trunk/build/ac-macros/gssapi.m4 Mon Nov 1 19:29:16 2010
@@ -58,10 +58,10 @@ AC_DEFUN(SVN_LIB_RA_SERF_GSSAPI,
CPPFLAGS="$CPPFLAGS $SVN_GSSAPI_INCLUDES"
CFLAGS="$old_CFLAGS"
LIBS="$LIBS $SVN_GSSAPI_LIBS"
- AC_LINK_IFELSE([
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
#include <gssapi.h>
int main()
-{gss_init_sec_context(NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL);}],
+{gss_init_sec_context(NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL);}]])],
svn_lib_gssapi="yes", svn_lib_gssapi="no")
if test "$svn_lib_gssapi" = "yes"; then
AC_MSG_RESULT([yes])
Modified: subversion/trunk/build/ac-macros/kwallet.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/kwallet.m4?rev=1029802&r1=1029801&r2=1029802&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/kwallet.m4 (original)
+++ subversion/trunk/build/ac-macros/kwallet.m4 Mon Nov 1 19:29:16 2010
@@ -74,10 +74,10 @@ AC_DEFUN(SVN_LIB_KWALLET,
kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix)`"
AC_LANG(C++)
- AC_LINK_IFELSE([
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
#include <kwallet.h>
int main()
-{KWallet::Wallet::walletList();}], svn_lib_kwallet="yes", svn_lib_kwallet="no")
+{KWallet::Wallet::walletList();}]])], svn_lib_kwallet="yes", svn_lib_kwallet="no")
AC_LANG(C)
if test "$svn_lib_kwallet" = "yes"; then
AC_MSG_RESULT([yes])
Modified: subversion/trunk/build/ac-macros/neon.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/neon.m4?rev=1029802&r1=1029801&r2=1029802&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/neon.m4 (original)
+++ subversion/trunk/build/ac-macros/neon.m4 Mon Nov 1 19:29:16 2010
@@ -113,11 +113,11 @@ AC_DEFUN(SVN_NEON_CONFIG,
#include <ne_xml.h>
int main()
{ne_xml_create(); ne_decompress_destroy(NULL);}"
- AC_LINK_IFELSE([$neon_test_code], shared_linking="yes", shared_linking="no")
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[$neon_test_code]])], shared_linking="yes", shared_linking="no")
if test "$shared_linking" = "no"; then
NEON_LIBS=`$PKG_CONFIG neon --libs --static`
LIBS="$LIBS $NEON_LIBS"
- AC_LINK_IFELSE([$neon_test_code], , AC_MSG_ERROR([cannot find Neon]))
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[$neon_test_code]])], , AC_MSG_ERROR([cannot find Neon]))
fi
CFLAGS="$old_CFLAGS"
LIBS="$old_LIBS"
Modified: subversion/trunk/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/swig.m4?rev=1029802&r1=1029801&r2=1029802&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/swig.m4 (original)
+++ subversion/trunk/build/ac-macros/swig.m4 Mon Nov 1 19:29:16 2010
@@ -231,10 +231,10 @@ AC_DEFUN(SVN_FIND_SWIG,
old_LIBS="$LIBS"
CFLAGS="`echo $CFLAGS | $SED -e "s/ -ansi//g"` $svn_cv_ruby_includes"
LIBS="$SWIG_RB_LIBS"
- AC_LINK_IFELSE([
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
#include <ruby.h>
int main()
-{rb_errinfo();}], have_rb_errinfo="yes", have_rb_errinfo="no")
+{rb_errinfo();}]])], have_rb_errinfo="yes", have_rb_errinfo="no")
if test "$have_rb_errinfo" = "yes"; then
AC_MSG_RESULT([yes])
AC_DEFINE([HAVE_RB_ERRINFO], [1],
Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1029802&r1=1029801&r2=1029802&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Mon Nov 1 19:29:16 2010
@@ -376,10 +376,10 @@ if test -n "`echo "$svn_lib_expat" | $EG
old_LIBS="$LIBS"
CPPFLAGS="$CPPFLAGS $SVN_XML_INCLUDES"
LIBS="$LIBS $SVN_XML_LIBS"
- AC_LINK_IFELSE([
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
#include <expat.h>
int main()
-{XML_ParserCreate(NULL);}], svn_lib_expat="yes", svn_lib_expat="no")
+{XML_ParserCreate(NULL);}]])], svn_lib_expat="yes", svn_lib_expat="no")
LIBS="$old_LIBS"
if test "$svn_lib_expat" = "yes"; then
AC_MSG_RESULT([yes])
@@ -390,10 +390,10 @@ int main()
if test "$enable_all_static" != "yes"; then
SVN_APRUTIL_LIBS="$SVN_APRUTIL_LIBS `$apu_config --libs`"
fi
- AC_COMPILE_IFELSE([
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#include <expat.h>
int main()
-{XML_ParserCreate(NULL);}], svn_lib_expat="yes", svn_lib_expat="no")
+{XML_ParserCreate(NULL);}]])], svn_lib_expat="yes", svn_lib_expat="no")
if test "$svn_lib_expat" = "yes"; then
AC_MSG_RESULT([yes])
AC_MSG_WARN([Expat found amongst libraries used by APR-Util, but Subversion libraries might be needlessly linked against additional unused libraries. It can be avoided by specifying exact location of Expat in argument of --with-expat option.])
@@ -500,11 +500,11 @@ dnl APR_HAS_DSO -------------------
AC_MSG_CHECKING([whether APR has support for DSOs])
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
-AC_PREPROC_IFELSE([
+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
#include <apr.h>
#if !APR_HAS_DSO
#error
-#endif],
+#endif]])],
APR_HAS_DSO="yes"
AC_MSG_RESULT([yes]),
APR_HAS_DSO="no"
@@ -532,10 +532,10 @@ if test -n "$PKG_CONFIG"; then
CPPFLAGS="$CPPFLAGS $DBUS_CPPFLAGS"
LIBS="$LIBS $DBUS_LIBS"
AC_MSG_CHECKING([for D-Bus])
- AC_LINK_IFELSE([
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
#include <dbus/dbus.h>
int main()
-{dbus_bus_get(DBUS_BUS_SESSION, NULL);}], HAVE_DBUS="yes", HAVE_DBUS="no")
+{dbus_bus_get(DBUS_BUS_SESSION, NULL);}]])], HAVE_DBUS="yes", HAVE_DBUS="no")
if test "$HAVE_DBUS" = "yes"; then
AC_MSG_RESULT([yes])
else
@@ -826,7 +826,7 @@ if test "$enable_disallowing_of_undefine
AC_MSG_CHECKING([for -Wl,--no-undefined])
old_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -Wl,--no-undefined"
- AC_LINK_IFELSE([int main(){;}], [svn_wl_no_undefined="yes"], [svn_wl_no_undefined="no"])
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(){;}]])], [svn_wl_no_undefined="yes"], [svn_wl_no_undefined="no"])
LDFLAGS="$old_LDFLAGS"
libraries="auth_gnome_keyring auth_kwallet client delta diff fs fs_base fs_fs fs_util ra ra_local ra_neon ra_serf ra_svn repos subr wc"
if test "$svn_wl_no_undefined" = "yes"; then