Use AC_LANG_PROGRAM to silence warnings

This commit is contained in:
jez 2011-11-25 14:17:36 +00:00
parent 1f22af47d1
commit 148596b694
7 changed files with 816 additions and 407 deletions

View file

@ -18,7 +18,7 @@ AC_DEFUN([ARABICA_HAS_EXPAT],
expat_found=no
for expat_path_tmp in $expat_possible_path ; do
CXXFLAGS="$CXXFLAGS -I$expat_path_tmp/include"
AC_COMPILE_IFELSE([@%:@include <expat.h>],
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <expat.h>]],[[]])],
[EXPAT_CFLAGS="-I$expat_path_tmp/include"
EXPAT_LIBS="-L$expat_path_tmp/lib"
expat_found=yes],

View file

@ -17,7 +17,7 @@ AC_DEFUN([HAS_LIB_ELEPHANT],
elephant_found=no
for elephant_path_tmp in $elephant_possible_path ; do
CXXFLAGS="$CXXFLAGS -I$elephant_path_tmp/include"
AC_COMPILE_IFELSE([@%:@include <elephant/memorymonitor.h>],
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <elephant/memorymonitor.h>]],[[]])],
[ELEPHANT_CFLAGS="-I$elephant_path_tmp/include"
ELEPHANT_LIBS="-L$elephant_path_tmp/lib"
elephant_found=yes]

1192
m4/libtool.m4 vendored

File diff suppressed because it is too large Load diff

View file

@ -16,7 +16,7 @@ AC_DEFUN([ARABICA_HAS_LIBXML2],
libxml2_found=no
for libxml2_path_tmp in $libxml2_possible_path ; do
CXXFLAGS="$CXXFLAGS -I$libxml2_path_tmp/include/libxml2"
AC_COMPILE_IFELSE([@%:@include <libxml/parser.h>],
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libxml/parser.h>]],[[]])],
[ LIBXML2_CFLAGS="-I$libxml2_path_tmp/include/libxml2"
LIBXML2_LIBS="-L$libxml2_path_tmp/lib"
libxml2_found=yes],

11
m4/ltoptions.m4 vendored
View file

@ -1,13 +1,14 @@
# Helper functions for option handling. -*- Autoconf -*-
#
# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
# Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# serial 6 ltoptions.m4
# serial 7 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@ -133,13 +134,13 @@ case $host in
esac
test -z "$AS" && AS=as
_LT_DECL([], [AS], [0], [Assembler program])dnl
_LT_DECL([], [AS], [1], [Assembler program])dnl
test -z "$DLLTOOL" && DLLTOOL=dlltool
_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
test -z "$OBJDUMP" && OBJDUMP=objdump
_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],

12
m4/ltversion.m4 vendored
View file

@ -7,17 +7,17 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# Generated from ltversion.in.
# @configure_input@
# serial 3110 ltversion.m4
# serial 3293 ltversion.m4
# This file is part of GNU Libtool
m4_define([LT_PACKAGE_VERSION], [2.2.7a])
m4_define([LT_PACKAGE_REVISION], [1.3110])
m4_define([LT_PACKAGE_VERSION], [2.4])
m4_define([LT_PACKAGE_REVISION], [1.3293])
AC_DEFUN([LTVERSION_VERSION],
[macro_version='2.2.7a'
macro_revision='1.3110'
[macro_version='2.4'
macro_revision='1.3293'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])

View file

@ -17,7 +17,7 @@ AC_DEFUN([ARABICA_HAS_XERCES],
xerces_found=no
for xerces_path_tmp in $xerces_possible_path ; do
CXXFLAGS="$CXXFLAGS -I$xerces_path_tmp/include"
AC_COMPILE_IFELSE([@%:@include <xercesc/sax2/SAX2XMLReader.hpp>],
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/sax2/SAX2XMLReader.hpp>]],[[]])],
[XERCES_CFLAGS="-I$xerces_path_tmp/include"
XERCES_LIBS="-L$xerces_path_tmp/lib"
xerces_found=yes]