From 642fb7d741c48f24a5bddbb3241743f0f6b8630b Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 1 Nov 2012 13:35:29 +0000 Subject: [PATCH] Filter out known build breakers for PG on OSX. (Justin Clift) git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2844 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- configure.ac | 2 ++ modules/gpgsqlbackend/Makefile.am | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ff59221f0..c95281480 100644 --- a/configure.ac +++ b/configure.ac @@ -119,6 +119,7 @@ AC_SUBST(LIBCRYPT) DYNLINKFLAGS="" THREADFLAGS="" +AM_CONDITIONAL([OS_MACOSX], false) case "$host_os" in solaris2.10) AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6]) @@ -151,6 +152,7 @@ darwin11* | darwin12*) DYNLINKFLAGS="-rdynamic" LDFLAGS="-pthread $LDFLAGS" CXXFLAGS="-pthread $CXXFLAGS -D__APPLE_USE_RFC_3542" + AM_CONDITIONAL([OS_MACOSX], true) ;; *) AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6]) diff --git a/modules/gpgsqlbackend/Makefile.am b/modules/gpgsqlbackend/Makefile.am index 7a3497282..eda04ad7a 100644 --- a/modules/gpgsqlbackend/Makefile.am +++ b/modules/gpgsqlbackend/Makefile.am @@ -7,8 +7,12 @@ INCLUDES=-I@PGSQL_incdir@ libgpgsqlbackend_la_SOURCES=gpgsqlbackend.cc gpgsqlbackend.hh \ spgsql.hh spgsql.cc -libgpgsqlbackend_la_LDFLAGS=-module -avoid-version @PGSQL_lib@ -Wl,-Bstatic -lpq \ - -Wl,-Bdynamic +## Filter out known build breakers for Mac OS X +if OS_MACOSX + libgpgsqlbackend_la_LDFLAGS=-module -avoid-version @PGSQL_lib@ -lpq +else + libgpgsqlbackend_la_LDFLAGS=-module -avoid-version @PGSQL_lib@ -Wl,-Bstatic -lpq -Wl,-Bdynamic +endif libgpgsqlbackend_la_LIBADD=-lssl @LIBCRYPT@ -lcrypto -- 2.40.0