BIND 10 trac2980, updated. 016c6b97353dd57158d1da0f574912f2823e74e1 [2980] Distinguish between BSD variants

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Jul 9 23:44:54 UTC 2013


The branch, trac2980 has been updated
       via  016c6b97353dd57158d1da0f574912f2823e74e1 (commit)
      from  bfcf73f7b86036c774b90e1df948e12399269385 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 016c6b97353dd57158d1da0f574912f2823e74e1
Author: Stephen Morris <stephen at isc.org>
Date:   Wed Jul 10 00:43:01 2013 +0100

    [2980] Distinguish between BSD variants
    
    Only OSX uses ".dylib" as a suffix for shared libraries.  Adjust
    configure.ac so that the operating system can be better determined,
    and ensure the hooks tests use the correct suffic for the test shared
    libraries.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                            |   11 +++++++++++
 src/lib/hooks/tests/test_libraries.h.in |    2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index aa67652..ced1e2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -470,6 +470,17 @@ AM_COND_IF([OS_BSD], [AC_DEFINE([OS_BSD], [1], [Running on BSD?])])
 AM_CONDITIONAL(OS_SOLARIS, test $OS_TYPE = Solaris)
 AM_COND_IF([OS_SOLARIS], [AC_DEFINE([OS_SOLARIS], [1], [Running on Solaris?])])
 
+# Deal with variants
+AM_CONDITIONAL(OS_FREEBSD, test $system = FreeBSD)
+AM_COND_IF([OS_FREEBSD], [AC_DEFINE([OS_FREEBSD], [1], [Running on FreeBSD?])])
+AM_CONDITIONAL(OS_NETBSD, test $system = NetBSD)
+AM_COND_IF([OS_NETBSD], [AC_DEFINE([OS_NETBSD], [1], [Running on NetBSD?])])
+AM_CONDITIONAL(OS_OPENBSD, test $system = OpenBSD)
+AM_COND_IF([OS_OPENBSD], [AC_DEFINE([OS_OPENBSD], [1], [Running on OpenBSD?])])
+AM_CONDITIONAL(OS_OSX, test $system = Darwin)
+AM_COND_IF([OS_OSX], [AC_DEFINE([OS_OSX], [1], [Running on OSX?])])
+
+
 AC_MSG_CHECKING(for sa_len in struct sockaddr)
 AC_TRY_COMPILE([
 #include <sys/types.h>
diff --git a/src/lib/hooks/tests/test_libraries.h.in b/src/lib/hooks/tests/test_libraries.h.in
index 8d9b932..bb6a24a 100644
--- a/src/lib/hooks/tests/test_libraries.h.in
+++ b/src/lib/hooks/tests/test_libraries.h.in
@@ -22,7 +22,7 @@ namespace {
 
 // Take care of differences in DLL naming between operating systems.
 
-#ifdef OS_BSD
+#ifdef OS_OSX
 #define DLL_SUFFIX ".dylib"
 
 #else



More information about the bind10-changes mailing list