From: Tiziano Müller Date: Mon, 20 May 2013 13:43:05 +0000 (+0200) Subject: Replace PolarSSL-conditionals in Makefile.am and trust the include dirs X-Git-Tag: rec-3.6.0-rc1~542^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc8915f355b261702d392b22e5f40e3a5129fdc5;p=pdns Replace PolarSSL-conditionals in Makefile.am and trust the include dirs Different ways of using the bundled PolarSSL have been used (-L.. vs if/then/else). Replace this by defining POLARSSL_CFLAGS/_LIBS/_SUBDIR in configure.ac and use that in all makefiles. Remove includes based on the preprocessor HAVE_LIBPOLARSSL definition and trust the CFLAGS set in the environment to point to the correct directory for the PolarSSL include. --- diff --git a/configure.ac b/configure.ac index 3ee5cf72f..748e41226 100644 --- a/configure.ac +++ b/configure.ac @@ -216,15 +216,25 @@ AS_IF([test "x$with_system_polarssl" != "xno"], [have_system_polarssl=no] ) +POLARSSL_SUBDIR=ext/polarssl-1.1.2 +POLARSSL_CFLAGS=-I\$\(top_srcdir\)/pdns/$POLARSSL_SUBDIR/include/ +POLARSSL_LIBS=\$\(top_builddir\)/pdns/$POLARSSL_SUBDIR/library/libpolarssl.a + AS_IF([test "x$have_system_polarssl" = "xyes"], - [AC_DEFINE(HAVE_LIBPOLARSSL, 1, [If linking against system polarssl])], + [ + POLARSSL_CFLAGS= + POLARSSL_LIBS=-lpolarssl + POLARSSL_SUBDIR= + ], [AS_IF([test "x$with_system_polarssl" = "xyes"], [AC_MSG_ERROR([use of system polarssl requested but not found])] )] ) AC_MSG_CHECKING(whether we will try to link in system PolarSSL) AC_MSG_RESULT($have_system_polarssl) -AM_CONDITIONAL(HAVE_LIBPOLARSSL, test "x$have_system_polarssl" = "xyes") +AC_SUBST(POLARSSL_CFLAGS) +AC_SUBST(POLARSSL_LIBS) +AC_SUBST(POLARSSL_SUBDIR) AC_MSG_CHECKING(whether we will be linking in Botan 1.10) AC_ARG_ENABLE(botan1.10, diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am index 0412defe2..449a336a3 100644 --- a/modules/remotebackend/Makefile.am +++ b/modules/remotebackend/Makefile.am @@ -34,8 +34,8 @@ libtestremotebackend_la_SOURCES=../../pdns/dnsbackend.hh ../../pdns/dnsbackend.c ../../pdns/aes/aestab.c ../../pdns/aes/aestab.h ../../pdns/aes/brg_endian.h ../../pdns/aes/brg_types.h \ remotebackend.hh remotebackend.cc unixconnector.cc httpconnector.cc pipeconnector.cc -libtestremotebackend_la_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS) -g -O0 -I../../pdns -libtestremotebackend_la_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS) -g -O0 -I../../pdns +libtestremotebackend_la_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(POLARSSL_CFLAGS) $(LIBCURL_CFLAGS) -g -O0 -I../../pdns +libtestremotebackend_la_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(POLARSSL_CFLAGS) $(LIBCURL_CFLAGS) -g -O0 -I../../pdns test_remotebackend_pipe_SOURCES=test-remotebackend.cc test-remotebackend-pipe.cc test_remotebackend_unix_SOURCES=test-remotebackend.cc test-remotebackend-unix.cc @@ -45,20 +45,20 @@ test_remotebackend_json_SOURCES=test-remotebackend.cc test-remotebackend-json.cc test_remotebackend_pipe_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS) -g -O0 -I../../pdns test_remotebackend_pipe_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_pipe_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) ../../pdns/ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(LIBCURL_LIBS) +test_remotebackend_pipe_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBCURL_LIBS) test_remotebackend_unix_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS) -g -O0 -I../../pdns test_remotebackend_unix_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_unix_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) ../../pdns/ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(LIBCURL_LIBS) +test_remotebackend_unix_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBCURL_LIBS) test_remotebackend_http_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS) -g -O0 -I../../pdns test_remotebackend_http_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_http_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) ../../pdns/ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(LIBCURL_LIBS) +test_remotebackend_http_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBCURL_LIBS) test_remotebackend_post_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS) -g -O0 -I../../pdns test_remotebackend_post_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_post_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) ../../pdns/ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(LIBCURL_LIBS) +test_remotebackend_post_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBCURL_LIBS) test_remotebackend_json_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS) -g -O0 -I../../pdns test_remotebackend_json_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_json_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) ../../pdns/ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(LIBCURL_LIBS) +test_remotebackend_json_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBCURL_LIBS) diff --git a/pdns/Makefile.am b/pdns/Makefile.am index cf1f2b651..d5ec6885b 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -1,9 +1,6 @@ -if HAVE_LIBPOLARSSL -AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -I ext/rapidjson/include -else -AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -Iext/polarssl-1.1.2/include -Iext/rapidjson/include -endif +AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS) -Iext/rapidjson/include + AM_CPPFLAGS=-Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS) if BOTAN110 AM_CPPFLAGS += $(BOTAN110_CFLAGS) @@ -20,11 +17,7 @@ EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_ no-dnssec.schema.mysql.sql no-dnssec.schema.pgsql.sql no-dnssec.schema.sqlite3.sql \ bind-dnssec.schema.sqlite3.sql -if HAVE_LIBPOLARSSL -SUBDIRS= backends -else -SUBDIRS= ext/polarssl-1.1.2 backends -endif +SUBDIRS= $(POLARSSL_SUBDIR) backends BUILT_SOURCES=bind-dnssec.schema.sqlite3.sql.h version_generated.h @@ -69,8 +62,8 @@ ednssubnet.cc ednssubnet.hh cachecleaner.hh json.cc json.hh \ version.hh version.cc # -pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic -pdns_server_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib) +pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic +pdns_server_LDADD= $(POLARSSL_LIBS) $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib) if BOTAN110 pdns_server_SOURCES += botan110signers.cc botansigners.cc @@ -112,7 +105,7 @@ pdnssec_SOURCES=pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc dnsparser.hh pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) -pdnssec_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib) +pdnssec_LDADD= $(POLARSSL_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib) if BOTAN110 pdnssec_SOURCES += botan110signers.cc botansigners.cc @@ -159,8 +152,7 @@ nsec3dig_SOURCES=nsec3dig.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc d dnswriter.hh dnssecinfra.cc \ misc.cc misc.hh rcpgenerator.cc rcpgenerator.hh base64.cc base64.hh unix_utility.cc \ logger.cc statbag.cc qtype.cc sillyrecords.cc nsecrecords.cc base32.cc -nsec3dig_LDFLAGS= -Lext/polarssl-1.1.2/library -nsec3dig_LDADD= -lpolarssl +nsec3dig_LDADD= $(POLARSSL_LIBS) toysdig_SOURCES=toysdig.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnslabeltext.cc dnswriter.hh \ misc.cc misc.hh rcpgenerator.cc rcpgenerator.hh base64.cc base64.hh unix_utility.cc \ @@ -180,12 +172,7 @@ tsig_tests_SOURCES=tsig-tests.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords. aes/aescrypt.c aes/aes.h aes/aeskey.c aes/aes_modes.c aes/aesopt.h \ aes/aestab.c aes/aestab.h aes/brg_endian.h aes/brg_types.h aes/dns_random.cc \ randomhelper.cc dns.cc -if HAVE_LIBPOLARSSL -tsig_tests_LDFLAGS= -else -tsig_tests_LDFLAGS= -Lext/polarssl-1.1.2/library -endif -tsig_tests_LDADD= -lpolarssl +tsig_tests_LDADD= $(POLARSSL_LIBS) speedtest_SOURCES=speedtest.cc dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnslabeltext.cc dnswriter.hh \ @@ -268,7 +255,7 @@ testrunner_SOURCES=testrunner.cc test-misc_hh.cc test-nameserver_cc.cc test-dnsr aes/aestab.c aes/aestab.h aes/brg_endian.h aes/brg_types.h test-rcpgenerator_cc.cc testrunner_LDFLAGS= @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) -testrunner_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) +testrunner_LDADD= $(POLARSSL_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) pdns_recursor_SOURCES=syncres.cc resolver.hh misc.cc unix_utility.cc qtype.cc \ logger.cc statbag.cc arguments.cc lwres.cc pdns_recursor.cc reczones.cc lwres.hh \ diff --git a/pdns/backends/bind/Makefile.am b/pdns/backends/bind/Makefile.am index 5076b2a47..bb03083cb 100644 --- a/pdns/backends/bind/Makefile.am +++ b/pdns/backends/bind/Makefile.am @@ -1,5 +1,5 @@ noinst_LTLIBRARIES = libbind2backend.la -AM_CPPFLAGS=-I../.. $(BOOST_CPPFLAGS) @THREADFLAGS@ +AM_CPPFLAGS=-I../.. $(BOOST_CPPFLAGS) $(POLARSSL_CFLAGS) @THREADFLAGS@ BUILT_SOURCES=bind-dnssec.schema.sqlite3.sql.h bindparser.h @@ -43,25 +43,13 @@ zone2ldap_SOURCES=bindparser.yy bindlexer.l bind-dnssec.schema.sqlite3.sql.h \ ../../aes/aestab.c ../../aes/aestab.h ../../aes/brg_endian.h ../../aes/brg_types.h # ../../dbdnsseckeeper.cc zone2ldap_LDFLAGS=@THREADFLAGS@ -if HAVE_LIBPOLARSSL -zone2ldap_LDADD= -else -zone2ldap_LDADD= ../../ext/polarssl-1.1.2/library/libpolarssl.a -endif +zone2ldap_LDADD= $(POLARSSL_LIBS) zone2sql_LDFLAGS=@THREADFLAGS@ -if HAVE_LIBPOLARSSL -zone2sql_LDADD= -else -zone2sql_LDADD= ../../ext/polarssl-1.1.2/library/libpolarssl.a -endif +zone2sql_LDADD= $(POLARSSL_LIBS) zone2json_LDFLAGS=@THREADFLAGS@ -if HAVE_LIBPOLARSSL -zone2json_LDADD= -else -zone2json_LDADD= ../../ext/polarssl-1.1.2/library/libpolarssl.a -endif +zone2json_LDADD= $(POLARSSL_LIBS) AM_LFLAGS = -s -i AM_YFLAGS = -d --verbose --debug diff --git a/pdns/dnssecinfra.cc b/pdns/dnssecinfra.cc index e7024e7af..0b2ed39cc 100644 --- a/pdns/dnssecinfra.cc +++ b/pdns/dnssecinfra.cc @@ -9,11 +9,7 @@ #include #include "dnssecinfra.hh" #include "dnsseckeeper.hh" -#ifdef HAVE_LIBPOLARSSL #include -#else -#include "ext/polarssl-1.1.2/include/polarssl/sha1.h" -#endif #include // for 'operator+=()' #include #include "base64.hh" diff --git a/pdns/md5.hh b/pdns/md5.hh index 46b47f9c3..be3a767cc 100644 --- a/pdns/md5.hh +++ b/pdns/md5.hh @@ -3,11 +3,7 @@ #include #include -#ifdef HAVE_LIBPOLARSSLSSL #include -#else -#include "ext/polarssl-1.1.2/include/polarssl/md5.h" -#endif class MD5Summer { diff --git a/pdns/polarrsakeyinfra.cc b/pdns/polarrsakeyinfra.cc index 82354b0b4..13a25a077 100644 --- a/pdns/polarrsakeyinfra.cc +++ b/pdns/polarrsakeyinfra.cc @@ -1,4 +1,3 @@ -#ifdef HAVE_LIBPOLARSSLSSL #include #include #include @@ -6,15 +5,6 @@ #include #include #include -#else -#include "ext/polarssl-1.1.2/include/polarssl/rsa.h" -#include "ext/polarssl-1.1.2/include/polarssl/base64.h" -#include "ext/polarssl-1.1.2/include/polarssl/sha1.h" -#include "ext/polarssl-1.1.2/include/polarssl/sha2.h" -#include "ext/polarssl-1.1.2/include/polarssl/sha4.h" -#include "ext/polarssl-1.1.2/include/polarssl/entropy.h" -#include "ext/polarssl-1.1.2/include/polarssl/ctr_drbg.h" -#endif #include // for 'operator+=()' #include #include "dnssecinfra.hh"