]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Replace libdir usage with pkglibdir 1447/head
authorChristian Hofstaedtler <christian@hofstaedtler.name>
Sun, 1 Jun 2014 19:30:30 +0000 (21:30 +0200)
committerChristian Hofstaedtler <christian@hofstaedtler.name>
Sun, 1 Jun 2014 20:14:07 +0000 (22:14 +0200)
pkglibdir is where package-only libs should go (plugins, etc.), but we
were using libdir for this. Users on multiarch systems really want to
override libdir, and they also don't want their multiarch libdir to end
up as an rpath.

27 files changed:
configure.ac
debian-pdns/rules
debian/config/pdns.conf
debian/rules
m4/pdns_with_mysql.m4
m4/pdns_with_postgresql.m4
modules/bindbackend/Makefile.am
modules/db2backend/Makefile.am
modules/geobackend/Makefile.am
modules/gmysqlbackend/Makefile.am
modules/goraclebackend/Makefile.am
modules/gpgsqlbackend/Makefile.am
modules/gsqlite3backend/Makefile.am
modules/ldapbackend/Makefile.am
modules/lmdbbackend/Makefile.am
modules/luabackend/Makefile.am
modules/mydnsbackend/Makefile.am
modules/opendbxbackend/Makefile.am
modules/oraclebackend/Makefile.am
modules/pipebackend/Makefile.am
modules/randombackend/Makefile.am
modules/remotebackend/Makefile.am
modules/tinydnsbackend/Makefile.am
pdns/Makefile.am
pdns/pdns.conf-dist
pdns/pdnssec.cc
pdns/receiver.cc

index 819cf63a8f7e557393c82eff583cb1a2c07fee6f..84dec815232ee90363c96cba4bd383c051749f60 100644 (file)
@@ -35,6 +35,10 @@ LT_INIT
 
 AM_CONDITIONAL([RELEASE_BUILD], [test "$PACKAGE_VERSION" != "git"])
 
+# Define full_libdir to be the fully expanded (${exec_prefix}, etc.)
+# "system" library path.
+# We use this to search for other libraries.
+eval full_libdir="\"$libdir\""
 
 # detect pkg-config explicitly
 PKG_PROG_PKG_CONFIG
index f64a34f20e6d9b87f8f6720ace14e0507143115e..d0554c65577472dfe5b4004c9a71b52a990ae9f2 100755 (executable)
@@ -46,7 +46,7 @@ build-static stamp-build-static:
                PKG_CONFIG_PATH=/opt/botan-1.10/lib/pkgconfig/ \
                --prefix=/usr \
                --libexecdir='$${prefix}/lib' \
-               --libdir='$${prefix}/lib/powerdns' \
+               --libdir='$${prefix}/lib' \
                --sysconfdir=/etc/powerdns \
                --infodir='$${datadir}/info' \
                --mandir='$${datadir}/man' \
@@ -65,7 +65,7 @@ build stamp-build: configure
        ./configure \
                --prefix=/usr \
                --libexecdir='$${prefix}/lib' \
-               --libdir='$${prefix}/lib/powerdns' \
+               --libdir='$${prefix}/lib' \
                --sysconfdir=/etc/powerdns \
                --infodir='$${datadir}/info' \
                --mandir='$${datadir}/man' \
index f27b56a4c8286872b287c2f848243bbcc03cffd5..6fb80f48ff60d184f219e5e4ef190d24beba6daf 100644 (file)
 #################################
 # module-dir   Default directory for modules
 #
-# module-dir=/usr/lib/powerdns
+# module-dir=/usr/lib/pdns
 
 #################################
 # negquery-cache-ttl   Seconds to store negative query results in the QueryCache
index 8cb3ae833e8d3debeb653a861b6daba8fa3d7f2b..1b987e45d12c2b04fd31845d4e40b051eb1527de 100755 (executable)
@@ -20,7 +20,7 @@ ifdef STATIC
                 --sysconfdir=/etc/powerdns \
                 --mandir=\$${prefix}/share/man \
                 --infodir=\$${prefix}/share/info \
-                --libdir='$${prefix}/lib/powerdns' \
+                --libdir='$${prefix}/lib' \
                 --libexecdir='$${prefix}/lib' \
                 --with-modules="$(backends)" \
                 --with-pgsql-includes=`pg_config --includedir` \
@@ -39,7 +39,7 @@ else
                --sysconfdir=/etc/powerdns \
                --mandir=\$${prefix}/share/man \
                --infodir=\$${prefix}/share/info \
-               --libdir='$${prefix}/lib/powerdns' \
+               --libdir='$${prefix}/lib' \
                --libexecdir='$${prefix}/lib' \
                --with-dynmodules="$(backends)" \
                --with-modules="" \
index b4d106399f744644b4438fd85f2f33bf021b623c..a0ddb733da2c6d3173cab48096b44f2455d09945 100644 (file)
@@ -9,7 +9,7 @@ AC_DEFUN([PDNS_WITH_MYSQL],[
     [
       MYSQL_lib_check="/usr/local/mysql/lib/mysql /usr/local/lib/mysql /opt/mysql/lib/mysql \
         /usr/lib/mysql /usr/lib64/mysql /usr/local/mysql/lib /usr/local/lib /opt/mysql/lib /usr/lib \
-        /usr/sfw/lib/ /usr/lib/x86_64-linux-gnu/"
+        /usr/sfw/lib/ $full_libdir"
       MYSQL_inc_check="/usr/local/mysql/include/mysql /usr/local/include/mysql \
         /opt/mysql/include/mysql /opt/mysql/include /usr/include/mysql /usr/sfw/include/mysql"
     ]
index 139f137c419f57678c4b5a50f3a1d87407a1d200..1192d0cd9dece52aaeb43903b67d76bcf09dc687 100644 (file)
@@ -6,7 +6,7 @@ AC_DEFUN([PDNS_WITH_POSTGRESQL],[
    [PGSQL_lib_check="$withval/lib/pgsql $with_pgsql/lib"
     PGSQL_inc_check="$withval/include/pgsql"
    ],
-   [PGSQL_lib_check="/usr/local/pgsql/lib/pgsql /usr/local/lib/pgsql /opt/pgsql/lib/pgsql /usr/lib/pgsql /usr/local/pgsql/lib /usr/local/lib /opt/pgsql/lib /usr/lib /usr/lib64"
+   [PGSQL_lib_check="/usr/local/pgsql/lib/pgsql /usr/local/lib/pgsql /opt/pgsql/lib/pgsql /usr/lib/pgsql /usr/local/pgsql/lib /usr/local/lib /opt/pgsql/lib /usr/lib /usr/lib64 $full_libdir"
     PGSQL_inc_check="/usr/local/pgsql/include/pgsql /usr/include /usr/local/include/postgresql/ /usr/local/include /opt/pgsql/include/pgsql /opt/pgsql/include /usr/include/pgsql/ /usr/include/postgresql"
    ]
   )
@@ -43,6 +43,9 @@ AC_DEFUN([PDNS_WITH_POSTGRESQL],[
     /usr/lib64)
       PGSQL_lib=""
       ;;
+    $full_libdir)
+      PGSQL_lib=""
+      ;;
     /*)
       PGSQL_lib="-L$PGSQL_libdir -Wl,-rpath,$PGSQL_libdir"
       LDFLAGS="$PGSQL_lib $LDFLAGS"
index 9ba4ff1357c294ee6b203c40ab8d59ab66a32658..6cf2e5ef01e59b444c809aed2f2f5a8e07f45fd6 100644 (file)
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libbindbackend.la
+pkglib_LTLIBRARIES = libbindbackend.la
 AM_CPPFLAGS=-I../../pdns $(BOOST_CPPFLAGS) $(POLARSSL_CFLAGS) @THREADFLAGS@
 
 AM_LFLAGS = -i
index f6e2f823d00e7bd1d8ed9974397af91abe98874f..01e31d14e34e2aade30f8c1da4c81d8f8c107ca8 100644 (file)
@@ -1,5 +1,5 @@
 AM_CPPFLAGS=@THREADFLAGS@
-lib_LTLIBRARIES = libdb2backend.la 
+pkglib_LTLIBRARIES = libdb2backend.la
 
 libdb2backend_la_SOURCES=DB2Backend.cc DB2Backend.hh DB2Exception.cc DB2Exception.hh
 libdb2backend_la_LDFLAGS=-module -avoid-version -ldb2
index f1541069b91c35f61e8cd492b7fb00ab492640c7..4fd6311315945e038663c36444faec750ea25e44 100644 (file)
@@ -1,5 +1,5 @@
 AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS)
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
-lib_LTLIBRARIES = libgeobackend.la
+pkglib_LTLIBRARIES = libgeobackend.la
 libgeobackend_la_SOURCES=geobackend.cc geobackend.hh ippreftree.cc ippreftree.hh
 libgeobackend_la_LDFLAGS=-module -avoid-version
index 5a8dbf0071720de77409fc9630982afc4ab7cb8a..4dff48244a3966baa2685615092e637a58e9f75b 100644 (file)
@@ -1,5 +1,5 @@
 AM_CPPFLAGS=@MYSQL_inc@ @THREADFLAGS@ $(BOOST_CPPFLAGS)
-lib_LTLIBRARIES = libgmysqlbackend.la
+pkglib_LTLIBRARIES = libgmysqlbackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS \
        schema.mysql.sql nodnssec-3.x_to_3.4_schema.mysql.sql dnssec-3.x_to_3.4_schema.mysql.sql
index bb10cfa88e2d58c10c6d9eca7abb6692377fc855..0b2ae22688a744c5cc3ec63d58dcde20bf78783e 100644 (file)
@@ -1,5 +1,5 @@
 AM_CPPFLAGS=$(ORACLE_CFLAGS) @THREADFLAGS@
-lib_LTLIBRARIES = libgoraclebackend.la
+pkglib_LTLIBRARIES = libgoraclebackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 
index 96cafb3c3afaa44beb6b35870bc1a98ead012319..105986ec6144e93e968e086d063319bc4127a5ac 100644 (file)
@@ -1,5 +1,5 @@
 AM_CPPFLAGS=-I@PGSQL_incdir@ @THREADFLAGS@
-lib_LTLIBRARIES = libgpgsqlbackend.la
+pkglib_LTLIBRARIES = libgpgsqlbackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS \
        schema.pgsql.sql nodnssec-3.x_to_3.4_schema.pgsql.sql dnssec-3.x_to_3.4_schema.pgsql.sql
index 02ea5e7f7b49179e1da8b53c81888d2e1b61d16e..c1e9b9ac202826e3acd669ff03926c9ed56d3373 100644 (file)
@@ -1,5 +1,5 @@
 AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS)
-lib_LTLIBRARIES = libgsqlite3backend.la
+pkglib_LTLIBRARIES = libgsqlite3backend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS \
        schema.sqlite3.sql nodnssec-3.x_to_3.4_schema.sqlite3.sql dnssec-3.x_to_3.4_schema.sqlite3.sql
index 8709848bb9a2fea466e7e536b6cc41042d097940..8e9cb4a55f0668396ee9ac9007eb57c092354ba6 100644 (file)
@@ -2,7 +2,7 @@ AM_CPPFLAGS=@THREADFLAGS@
 
 EXTRA_DIST = OBJECTFILES OBJECTLIBS
 
-lib_LTLIBRARIES = libldapbackend.la
+pkglib_LTLIBRARIES = libldapbackend.la
 libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh powerldap.hh powerldap.cc utils.hh
 libldapbackend_la_LDFLAGS =-module -avoid-version
 libldapbackend_la_LIBADD =-l@LIBLDAP@
index 2aac8f8d6632414f02df5f4b6f4c7ffb85b84af6..922822bb9714c5624b2090c8b583f7d61e9a53a2 100644 (file)
@@ -1,5 +1,5 @@
 AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS)
-lib_LTLIBRARIES = liblmdbbackend.la
+pkglib_LTLIBRARIES = liblmdbbackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 
index 2b220bdd575830b89651c99bbc6f7f3afd742658..22cd5900a53069c9029f1220ff0079cb798b01fa 100644 (file)
@@ -3,7 +3,7 @@ AM_CPPFLAGS=$(LUA_CFLAGS) @THREADFLAGS@
 EXTRA_DIST=OBJECTFILES OBJECTLIBS 
 
 
-lib_LTLIBRARIES = libluabackend.la
+pkglib_LTLIBRARIES = libluabackend.la
 
 libluabackend_la_SOURCES=luabackend.cc luabackend.hh minimal.cc reload.cc lua_functions.cc master.cc private.cc slave.cc supermaster.cc dnssec.cc \
        lua_functions.hh 
index 5b4ec1bf92b9fd38446648f24c8793bb1032836b..f16f220a5d4b7c6e1b204afe1424f8d4e8f25d61 100644 (file)
@@ -1,5 +1,5 @@
 AM_CPPFLAGS=@MYSQL_inc@ @THREADFLAGS@
-lib_LTLIBRARIES = libmydnsbackend.la 
+pkglib_LTLIBRARIES = libmydnsbackend.la
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 libmydnsbackend_la_SOURCES=mydnsbackend.cc mydnsbackend.hh 
 libmydnsbackend_la_LDFLAGS=-module -avoid-version @MYSQL_lib@
index db3a964c5d3610cab9a8bd0d015f51e002a0f99c..f58c0eefe77272e608ad279582688a7c84e4b390 100644 (file)
@@ -2,7 +2,7 @@ AM_CPPFLAGS=@THREADFLAGS@
 
 EXTRA_DIST = OBJECTFILES OBJECTLIBS
 
-lib_LTLIBRARIES = libopendbxbackend.la
+pkglib_LTLIBRARIES = libopendbxbackend.la
 libopendbxbackend_la_SOURCES = odbxbackend.hh odbxbackend.cc odbxprivate.cc
 libopendbxbackend_la_LDFLAGS =-module -avoid-version
 libopendbxbackend_la_LIBADD =-l@LIBOPENDBX@
index 7e5adcb28c9fb8fd00ae7c1e537b6d0e295fd66e..0d8978a955dbc4067ea68159371e93721137e32b 100644 (file)
@@ -1,6 +1,6 @@
 AM_CPPFLAGS=$(ORACLE_CFLAGS) @THREADFLAGS@
 
-lib_LTLIBRARIES = liboraclebackend.la
+pkglib_LTLIBRARIES = liboraclebackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS schema.sql dropschema.sql
 
index 91a0403099b35e53dacf15e4d953f7c616e71a2a..941af1f175fa85b346656841d46c75fa85ebf338 100644 (file)
@@ -5,7 +5,7 @@ AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS)
 #endif
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS backend.pl
-lib_LTLIBRARIES = libpipebackend.la
+pkglib_LTLIBRARIES = libpipebackend.la
 
 libpipebackend_la_SOURCES=pipebackend.cc pipebackend.hh coprocess.cc coprocess.hh
 libpipebackend_la_LDFLAGS=-module -avoid-version
index 8c5d2cb961e768f2d1c050c278470b12befae426..b4112ad7e6c29f852938ba4a0a1ebbe4009b1daa 100644 (file)
@@ -2,7 +2,7 @@ AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS)
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 
-lib_LTLIBRARIES = librandombackend.la
+pkglib_LTLIBRARIES = librandombackend.la
 
 librandombackend_la_SOURCES=randombackend.cc
 librandombackend_la_LDFLAGS=-module -avoid-version
index f6b74cc466116d8b5d48251269dc527e63cade9d..c0d90cdd6e4e6c3853d4df1816ed69af92a7ba01 100644 (file)
@@ -11,7 +11,7 @@ EXTRA_LTLIBRARIES=libtestremotebackend.la
 clean-local:
        rm -f $(EXTRA_PROGRAMS)
 
-lib_LTLIBRARIES = libremotebackend.la 
+pkglib_LTLIBRARIES = libremotebackend.la
 
 libremotebackend_la_SOURCES=remotebackend.hh remotebackend.cc unixconnector.cc httpconnector.cc pipeconnector.cc zmqconnector.cc
 
index 13654a0a6a4ca22f8ba09f7cd92e8670e1247fa1..db853966a8b24de9ad4e73ce987c95dda5e4b594 100644 (file)
@@ -1,5 +1,5 @@
 AM_CPPFLAGS=@CDB_CFLAGS@ @THREADFLAGS@
-lib_LTLIBRARIES = libtinydnsbackend.la
+pkglib_LTLIBRARIES = libtinydnsbackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 
index 785f8e653d87e6a8d7319a16505c0d441d7159b1..64c518192e586cf6a23c5d7af451f5082f51efa7 100644 (file)
@@ -1,4 +1,4 @@
-AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS) -Iext/rapidjson/include -Iext/yahttp
+AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DPKGLIBDIR=\"$(pkglibdir)\" -DLOCALSTATEDIR=\"@socketdir@\" @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS) -Iext/rapidjson/include -Iext/yahttp
 
 YAHTTP_LIBS = -Lext/yahttp/yahttp -lyahttp
 
index 08c475835946e327a78102dd5bc5d2876fa29748..d525a71ef59cde1bf4289fdb36c5a935854529fa 100644 (file)
 #################################
 # module-dir   Default directory for modules
 #
-# module-dir=/usr/local/lib
+# module-dir=/usr/local/lib/pdns
 
 #################################
 # negquery-cache-ttl   Seconds to store negative query results in the QueryCache
index c32e8fa5f4c4feadd328e58c8311675190356c3f..d3c7df5575fb64fb48a119501b334afdfd8c769c 100644 (file)
@@ -133,7 +133,7 @@ void loadMainConfig(const std::string& configdir)
   ::arg().set("default-zsk-algorithms","Default ZSK algorithms")="rsasha256";
   ::arg().set("default-zsk-size","Default KSK size (0 means default)")="0";
   ::arg().set("max-ent-entries", "Maximum number of empty non-terminals in a zone")="100000";
-  ::arg().set("module-dir","Default directory for modules")=LIBDIR;
+  ::arg().set("module-dir","Default directory for modules")=PKGLIBDIR;
   ::arg().set("entropy-source", "If set, read entropy from this file")="/dev/urandom";
 
   ::arg().setSwitch("direct-dnskey","Fetch DNSKEY RRs from backend during DNSKEY synthesis")="no";
index 5d5e8846b87699fff14e283d26d3b12874579cfe..28fe649045905e9450a42e7a983579e30ba3b40c 100644 (file)
@@ -346,7 +346,7 @@ static void UNIX_declareArguments()
   ::arg().set("config-dir","Location of configuration directory (pdns.conf)")=SYSCONFDIR;
   ::arg().set("config-name","Name of this virtual configuration - will rename the binary image")="";
   ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
-  ::arg().set("module-dir","Default directory for modules")=LIBDIR;
+  ::arg().set("module-dir","Default directory for modules")=PKGLIBDIR;
   ::arg().set("chroot","If set, chroot to this directory for more security")="";
   ::arg().set("logging-facility","Log under a specific facility")="";
   ::arg().set("daemon","Operate as a daemon")="no";