Parcourir la source

[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.
Stephen Morris il y a 11 ans
Parent
commit
016c6b9735
2 fichiers modifiés avec 12 ajouts et 1 suppressions
  1. 11 0
      configure.ac
  2. 1 1
      src/lib/hooks/tests/test_libraries.h.in

+ 11 - 0
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>

+ 1 - 1
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