X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=config%2Famanda%2Fswig.m4;h=cdc7f5d81bdbc11edb0cc9ee4e7a0c979f764851;hb=b116e9366c7b2ea2c2eb53b0a13df4090e176235;hp=ee579753db5d4ec36d5d8d47f3caf4b5cf11a51f;hpb=fd48f3e498442f0cbff5f3606c7c403d0566150e;p=debian%2Famanda

diff --git a/config/amanda/swig.m4 b/config/amanda/swig.m4
index ee57975..cdc7f5d 100644
--- a/config/amanda/swig.m4
+++ b/config/amanda/swig.m4
@@ -14,8 +14,8 @@ AC_DEFUN([AMANDA_SETUP_SWIG],
     AC_REQUIRE([AMANDA_PROG_SWIG])
     AC_REQUIRE([AMANDA_PROG_PERL])
 
-    # If we want cygwin to copy ddl to modules directory.
-    WANT_CYGWIN_COPY_PERL_DLL="false"
+    WANT_CYGWIN_COPY_PERL_DLL=false
+    WANT_MANDATORY_THREAD_CHECK=false
 
     # test for ExtUtils::Embed
     AC_PERL_MODULE_VERSION([ExtUtils::Embed 0.0], [], [
@@ -31,7 +31,7 @@ AC_DEFUN([AMANDA_SETUP_SWIG],
     fi
 
     case "$host" in
-	*freebsd@<:@123456@:>@*) # up to and including FreeBSD 6.*
+	*freebsd@<:@123456@:>@.*) # up to and including FreeBSD 6.*
 	    # Before 7.0, FreeBSD systems don't include a DT_NEEDS segment in
 	    # libgthread to automatically pull in the desired threading library.
 	    # Instead, they assume that any application linking against
@@ -58,15 +58,26 @@ AC_DEFUN([AMANDA_SETUP_SWIG],
 	    #   http://lists.freebsd.org/pipermail/freebsd-stable/2006-June/026229.html
 
 	    PERLEXTLIBS="-lpthread"
+	    WANT_MANDATORY_THREAD_CHECK=true
 	    ;;
+
+	*freebsd*) # all FreeBSD not matched above
+	    # for all FreeBSD (including 1.0-6.0, above), we want to run the
+	    # thread-check rule in perl/Makefile.am to double-check that a Perl
+	    # script can call a C extension that uses threads.
+	    WANT_MANDATORY_THREAD_CHECK=true
+	    ;;
+
 	*-pc-cygwin)
 	    # When need -lperl and the '-L' where it is located,
 	    # we don't want the DynaLoader.a
 	    PERLEXTLIBS=`perl -MExtUtils::Embed -e ldopts | sed -e 's/^.*-L/-L/'`
+	    # we want cygwin to copy ddl to modules directory.
 	    WANT_CYGWIN_COPY_PERL_DLL="true";
 	    ;;
     esac
     AM_CONDITIONAL(WANT_CYGWIN_COPY_PERL_DLL,$WANT_CYGWIN_COPY_PERL_DLL)
+    AM_CONDITIONAL(WANT_MANDATORY_THREAD_CHECK,$WANT_MANDATORY_THREAD_CHECK)
 
     AC_ARG_WITH(perlextlibs,
 	AC_HELP_STRING([--with-perlextlibs=libs],[extra LIBS for Perl extensions]),