From 3f125dce2184e12c0f626f9acaaf4130f7eb4a74 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 18 Feb 2011 18:53:53 +0900 Subject: [PATCH] Use LIBS and CPPFLAGS instead of substituting them individually per library. --- configure.ac | 40 +++++++++++++++++++++++++++------------- m4/openssl.m4 | 2 +- src/Makefile.am | 8 +------- test/Makefile.am | 16 +++------------- 4 files changed, 32 insertions(+), 34 deletions(-) diff --git a/configure.ac b/configure.ac index e2f8e2cb8..50081b223 100644 --- a/configure.ac +++ b/configure.ac @@ -12,8 +12,6 @@ AC_CONFIG_HEADERS([config.h]) case "$target" in *mingw*|*cygwin*) - WINSOCK_LIBS="-lws2_32" - AC_SUBST(WINSOCK_LIBS) LIBS="-lws2_32 -lcrypto -lwsock32 -lgdi32 -lwinmm $LIBS" ;; esac @@ -73,6 +71,8 @@ if test "x$with_libxml2" = "xyes"; then AM_PATH_XML2([2.6.24], [have_libxml2=yes]) if test "x$have_libxml2" = "xyes"; then AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have libxml2.]) + LIBS="$XML_LIBS $LIBS" + CPPFLAGS="$XML_CPPFLAGS $CPPFLAGS" elif test "x$with_libxml2_requested" = "xyes"; then ARIA2_DEP_NOT_MET([libxml2]) fi @@ -80,16 +80,20 @@ fi if test "x$with_libexpat" = "xyes" && test "x$have_libxml2" != "xyes"; then AM_PATH_LIBEXPAT - if test "x$have_libexpat" != "xyes" && - test "x$with_libexpat_requested" = "xyes"; then + if test "x$have_libexpat" = "xyes"; then + LIBS="$LIBEXPAT_LIBS $LIBS" + CPPFLAGS="$LIBEXPAT_CPPFLAGS $CPPFLAGS" + elif test "x$with_libexpat_requested" = "xyes"; then ARIA2_DEP_NOT_MET([libexpat]) fi fi if test "x$with_sqlite3" = "xyes"; then AM_PATH_SQLITE3 - if test "x$have_sqlite3" != "xyes" && - test "x$with_sqlite3_requested" = "xyes"; then + if test "x$have_sqlite3" = "xyes"; then + LIBS="$SQLITE3_LIBS $LIBS" + CPPFLAGS="$SQLITE3_CFLAGS $CPPFLAGS" + elif test "x$with_sqlite3_requested" = "xyes"; then ARIA2_DEP_NOT_MET([sqlite3]) fi fi @@ -100,32 +104,38 @@ if test "x$with_gnutls" = "xyes"; then [have_libgnutls=yes], [have_libgnutls=no]) if test "x$have_libgnutls" = "xyes"; then AC_DEFINE([HAVE_LIBGNUTLS], [1], [Define to 1 if you have libgnutls.]) + LIBS="$LIBGNUTLS_LIBS $LIBS" + CPPFLAGS="$LIBGNUTLS_CFLAGS $CPPFLAGS" elif test "x$with_gnutls_requested" = "xyes"; then ARIA2_DEP_NOT_MET([gnutls]) fi - AC_SUBST(LIBGNUTLS_LIBS) - AC_SUBST(LIBGNUTLS_CFLAGS) fi if test "x$have_libgnutls" = "xyes"; then AM_PATH_LIBGCRYPT([1.2.2], [have_libgcrypt=yes]) if test "x$have_libgcrypt" = "xyes"; then AC_DEFINE([HAVE_LIBGCRYPT], [1], [Define to 1 if you have libgcrypt.]) + LIBS="$LIBGCRYPT_LIBS $LIBS" + CPPFLAGS="$LIBGCRYPT_CFLAGS $CPPFLAGS" fi fi if test "x$with_openssl" = "xyes" && test "x$have_libgnutls" != "xyes"; then AM_PATH_OPENSSL - if test "x$have_openssl" != "xyes" && - test "x$with_openssl_requested" = "xyes"; then + if test "x$have_openssl" = "xyes"; then + LIBS="$OPENSSL_LIBS $LIBS" + CPPFLAGS="$OPENSSL_CFLAGS $CPPFLAGS" + elif test "x$with_openssl_requested" = "xyes"; then ARIA2_DEP_NOT_MET([openssl]) fi fi if test "x$with_libcares" = "xyes"; then AM_PATH_LIBCARES - if test "x$have_libcares" != "xyes" && - test "x$with_libcares_requested" = "xyes"; then + if test "x$have_libcares" = "xyes"; then + LIBS="$LIBCARES_LIBS $LIBS" + CPPFLAGS="$LIBCARES_CPPFLAGS $CPPFLAGS" + elif test "x$with_libcares_requested" = "xyes"; then ARIA2_DEP_NOT_MET([libcares]) fi fi @@ -133,7 +143,10 @@ fi # Check availability of libz if test "x$with_libz" = "xyes"; then AM_PATH_LIBZ - if test "x$have_libz" != "xyes" && test "x$with_libz_requested" = "xyes"; then + if test "x$have_libz" = "xyes"; then + LIBS="$LIBZ_LIBS $LIBS" + CPPFLAGS="$LIBZ_CPPFLAGS $CPPFLAGS" + elif test "x$with_libz_requested" = "xyes"; then ARIA2_DEP_NOT_MET([libz]) fi fi @@ -497,6 +510,7 @@ echo "CFLAGS: $CFLAGS" echo "CPPFLAGS: $CPPFLAGS" echo "LDFLAGS: $LDFLAGS" echo "LIBS: $LIBS" +echo "DEFS: $DEFS" echo "SQLite3: $have_sqlite3" echo "GnuTLS: $have_libgnutls" echo "OpenSSL: $have_openssl" diff --git a/m4/openssl.m4 b/m4/openssl.m4 index dd03d88cf..e3638e988 100644 --- a/m4/openssl.m4 +++ b/m4/openssl.m4 @@ -6,7 +6,7 @@ AC_ARG_WITH([openssl-prefix], [openssl_prefix=""]) if test "x$openssl_prefix" = "x"; then - openssl_prefix="/usr/local" + openssl_prefix="/usr" fi LIBS_save=$LIBS diff --git a/src/Makefile.am b/src/Makefile.am index f7a7f4470..e657310ac 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -556,14 +556,8 @@ endif # HAVE_KQUEUE AR = @AR@ noinst_LIBRARIES = libaria2c.a libaria2c_a_SOURCES = $(SRCS) -aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\ - @LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@\ - @LIBCARES_LIBS@ @LIBEXPAT_LIBS@ @LIBZ_LIBS@\ - @SQLITE3_LIBS@ #-lprofiler +aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ #-lprofiler #aria2c_LDFLAGS = -pg AM_CPPFLAGS = -Wall\ -I$(top_srcdir)/lib -I$(top_srcdir)/intl\ - @LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\ - @LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\ - @LIBZ_CPPFLAGS@ @SQLITE3_CFLAGS@\ -DLOCALEDIR=\"@localedir@\" -DCA_BUNDLE=\"$(ca_bundle)\" @DEFS@ #-pg diff --git a/test/Makefile.am b/test/Makefile.am index abf531762..7ba4ea75c 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -213,24 +213,14 @@ aria2c_SOURCES += MetalinkerTest.cc\ MetalinkProcessorTest.cc endif # ENABLE_METALINK -#aria2c_CXXFLAGS = ${CPPUNIT_CFLAGS} -I../src -I../lib -Wall -D_FILE_OFFSET_BITS=64 -#aria2c_LDFLAGS = ${CPPUNIT_LIBS} - -aria2c_LDADD = ../src/libaria2c.a\ - @LIBINTL@ @LIBGNUTLS_LIBS@\ - @LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@\ - @LIBCARES_LIBS@ @LIBEXPAT_LIBS@ @LIBZ_LIBS@\ - @SQLITE3_LIBS@\ - ${CPPUNIT_LIBS} +aria2c_LDADD = ../src/libaria2c.a @LIBINTL@ @CPPUNIT_LIBS@ AM_CPPFLAGS = -Wall\ - ${CPPUNIT_CFLAGS}\ -I$(top_srcdir)/src\ -I$(top_srcdir)/lib -I$(top_srcdir)/intl\ - @LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\ - @LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\ - @LIBZ_CPPFLAGS@ @SQLITE3_CFLAGS@ -DLOCALEDIR=\"$(localedir)\"\ + -DLOCALEDIR=\"$(localedir)\"\ -DA2_TEST_DIR=\"$(top_srcdir)/test\"\ -DA2_TEST_OUT_DIR=\"${a2_test_outdir}\"\ + @CPPUNIT_CFLAGS@\ @DEFS@ EXTRA_DIST = 4096chunk.txt\