address linking issues

diff --git a/bin/tests/system/dyndb/driver/.gitignore b/bin/tests/system/dyndb/driver/.gitignore
new file mode 100644 (file)
index 0000000..c3af857
--- /dev/null
+++ b/bin/tests/system/dyndb/driver/.gitignore
@@ -0,0 +1 @@
+lib/

diff --git a/bin/tests/system/dyndb/driver/Makefile.in b/bin/tests/system/dyndb/driver/Makefile.in
index 80fd181804ab529158fafce108a72902251b5b34..055d935361729bcf05ccdb781a00982dc5eb9328 100644 (file)
--- a/bin/tests/system/dyndb/driver/Makefile.in
+++ b/bin/tests/system/dyndb/driver/Makefile.in
@@ -40,16 +40,20 @@ SRCS =              db.c driver.c instance.c \
 OBJS =         db.@O@ driver.@O@ instance.@O@ \
                lock.@O@ log.@O@ syncptr.@O@ zone.@O@
 
-TARGETS =      sample.@SO@
+TARGETS =      lib/sample.@SO@
 
 @BIND9_MAKE_RULES@
 
 CFLAGS =       @CFLAGS@ @SO_CFLAGS@
 SO_LDFLAGS =   @LDFLAGS@ @SO_LDFLAGS@
 
+lib/sample.@SO@: sample.@SO@
+       $(SHELL) ${top_srcdir}/mkinstalldirs `pwd`/lib
+       ${LIBTOOL_MODE_INSTALL} ${INSTALL} sample.@SO@ `pwd`/lib
+
 sample.@SO@: ${OBJS}
        ${LIBTOOL_MODE_LINK} @SO_LD@ ${SO_LDFLAGS} -o $@ ${OBJS} \
                ${DNSLIBS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
 
 clean distclean::
-       rm -f ${OBJS} sample.so
+       rm -f ${OBJS} sample.so lib/sample.so

diff --git a/bin/tests/system/dyndb/ns1/named.conf b/bin/tests/system/dyndb/ns1/named.conf
index 78d8d5d5dd576c18e207bf9e16d7b900f57b8f77..a4f334b5c60a47e1452f5170dd971763719fb519 100644 (file)
--- a/bin/tests/system/dyndb/ns1/named.conf
+++ b/bin/tests/system/dyndb/ns1/named.conf
@@ -38,5 +38,5 @@ controls {
        inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
 };
 
-dyndb sample "../driver/sample.so" { ipv4.example.nil. in-addr.arpa. };
-dyndb sample2 "../driver/sample.so" { ipv6.example.nil. 8.b.d.0.1.0.0.2.ip6.arpa. };
+dyndb sample "../driver/lib/sample.so" { ipv4.example.nil. in-addr.arpa. };
+dyndb sample2 "../driver/lib/sample.so" { ipv6.example.nil. 8.b.d.0.1.0.0.2.ip6.arpa. };

diff --git a/configure b/configure
index 74964b41c5f22a6b623d537dba307208eac55b70..b0cc922cdd4cdd12e3ebc5b0fccae5060bea5af8 100755 (executable)
--- a/configure
+++ b/configure
@@ -20987,8 +20987,14 @@ if test "$dlopen" = "yes"; then
                        ;;
                *-freebsd*|*-openbsd*)
                        SO_CFLAGS="-fpic"
-                       SO_LDFLAGS="-shared"
-                       SO_LD="${CC}"
+                       elf=`${CC} -dM -E - < /dev/null | grep __ELF__`
+                       if test "$use_libtool" = "yes"; then
+                               SO_LDFLAGS="-Xcompiler -shared"
+                               SO_LD="${CC}"
+                       else
+                               SO_LDFLAGS="-shared"
+                               SO_LD="${CC}"
+                       fi
                        ;;
                *-netbsd*)
                        SO_CFLAGS="-fpic"

diff --git a/configure.in b/configure.in
index e528e8b48c59ec04ee940812949ce26347646b1e..e641b4fae2b85dd70f77987f744640cf11c1b45f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4374,8 +4374,14 @@ if test "$dlopen" = "yes"; then
                        ;;
                *-freebsd*|*-openbsd*)
                        SO_CFLAGS="-fpic"
-                       SO_LDFLAGS="-shared"
-                       SO_LD="${CC}"
+                       elf=`${CC} -dM -E - < /dev/null | grep __ELF__`
+                       if test "$use_libtool" = "yes"; then
+                               SO_LDFLAGS="-Xcompiler -shared"
+                               SO_LD="${CC}"
+                       else
+                               SO_LDFLAGS="-shared"
+                               SO_LD="${CC}"
+                       fi
                        ;;
                *-netbsd*)
                        SO_CFLAGS="-fpic"