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

diff --git a/configure.ac b/configure.ac
index ff59221f0fa8115628d68c6a9c21a3072058d35c..c95281480c6ec023b7c0bf7f53f2738dbf38b1bf 100644 (file)
--- 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 7a34972824ebf0ee39732efea517ab770711e34a..eda04ad7add5ef9bb9cf9d7ffe92d2c37dab22e6 100644 (file)
--- 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