Changeset 129 for trunk/configure.ac

Timestamp:

Oct 21, 2007, 5:22:47 PM (17 years ago)

Author:

rainer

Message:

Detect whether the OS supports posix threads.

File:

• trunk/configure.ac (modified) (3 diffs)

trunk/configure.ac

@@ -13 +13 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.3.8)
+AM_INIT_AUTOMAKE(samhain, 2.3.7)
 AC_CANONICAL_HOST
 
@@ -746 +746 @@
 )
 
+
+dnl
+dnl  NETWORK OPTIONS
+dnl
+AC_ARG_ENABLE(network,
+        [  --enable-network=[[client|server]]   compile client or server [[no]]],
+        [
+        if test "x$enable_network" = xclient; then
+                mytclient="-DSH_WITH_CLIENT"
+                yulectl_prg=
+                setpwd_prg="samhain_setpwd"
+                sh_main_prg="samhain"
+                if test "x${sh_have_gmp}" = xyes
+                then
+                        LIBS="-lgmp $LIBS"
+                fi
+dnl             AC_CHECK_HEADER(sys/capability.h, 
+dnl                             [AC_CHECK_LIB(cap, cap_get_proc,,sh_use_lcaps="no")],
+dnl                             [sh_use_lcaps="no"])
+        elif test "x$enable_network" = xserver; then
+                mytclient="-DSH_WITH_SERVER"
+                yulectl_prg="yulectl"
+                setpwd_prg="samhain_setpwd"
+                sh_main_prg="yule"
+                if test "x${sh_have_gmp}" = xyes
+                then
+                        LIBS="-lgmp $LIBS"
+                fi
+                sh_use_lcaps="undef"
+        elif test "x$enable_network" = xno; then
+                mytclient="-DSH_STANDALONE"
+                yulectl_prg=
+                setpwd_prg=
+                sh_main_prg="samhain"
+dnl             AC_CHECK_HEADER(sys/capability.h, 
+dnl                             [AC_CHECK_LIB(cap, cap_get_proc,,sh_use_lcaps="no")],
+dnl                             [sh_use_lcaps="no"])
+        else
+                AC_MSG_ERROR([--enable-network=WHAT: WHAT must be client, server, or no])
+        fi
+        ],
+        [
+        mytclient="-DSH_STANDALONE"
+        setpwd_prg=
+        yulectl_prg=
+        sh_main_prg="samhain"
+dnl     AC_CHECK_HEADER(sys/capability.h, 
+dnl                     [AC_CHECK_LIB(cap, cap_get_proc,,sh_use_lcaps="no")],
+dnl                     [sh_use_lcaps="no"])
+        ],
+)
+
+if test x"${mytclient}" = x-DSH_STANDALONE -o x"${mytclient}" = x-DSH_WITH_CLIENT;
+then
+        ACX_PTHREAD
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        CC="$PTHREAD_CC"
+fi
+        
+AC_SUBST(setpwd_prg)
+AC_SUBST(yulectl_prg)
+AC_SUBST(sh_main_prg)
+AC_SUBST(mytclient)
+
+# needed for the rpm spec
+clmytclient=`echo ${mytclient} | sed s%\-%%`
+AC_SUBST(clmytclient)
 
 AC_ARG_ENABLE(static,
@@ -1427 +1495 @@
 
 
-dnl
-dnl  NETWORK OPTIONS
-dnl
-
-
-AC_ARG_ENABLE(network,
-        [  --enable-network=[[client|server]]   compile client or server [[no]]],
-        [
-        if test "x$enable_network" = xclient; then
-                mytclient="-DSH_WITH_CLIENT"
-                yulectl_prg=
-                setpwd_prg="samhain_setpwd"
-                sh_main_prg="samhain"
-                if test "x${sh_have_gmp}" = xyes
-                then
-                        LIBS="-lgmp $LIBS"
-                fi
-dnl             AC_CHECK_HEADER(sys/capability.h, 
-dnl                             [AC_CHECK_LIB(cap, cap_get_proc,,sh_use_lcaps="no")],
-dnl                             [sh_use_lcaps="no"])
-        elif test "x$enable_network" = xserver; then
-                mytclient="-DSH_WITH_SERVER"
-                yulectl_prg="yulectl"
-                setpwd_prg="samhain_setpwd"
-                sh_main_prg="yule"
-                if test "x${sh_have_gmp}" = xyes
-                then
-                        LIBS="-lgmp $LIBS"
-                fi
-                sh_use_lcaps="undef"
-        elif test "x$enable_network" = xno; then
-                mytclient="-DSH_STANDALONE"
-                yulectl_prg=
-                setpwd_prg=
-                sh_main_prg="samhain"
-dnl             AC_CHECK_HEADER(sys/capability.h, 
-dnl                             [AC_CHECK_LIB(cap, cap_get_proc,,sh_use_lcaps="no")],
-dnl                             [sh_use_lcaps="no"])
-        else
-                AC_MSG_ERROR([--enable-network=WHAT: WHAT must be client, server, or no])
-        fi
-        ],
-        [
-        mytclient="-DSH_STANDALONE"
-        setpwd_prg=
-        yulectl_prg=
-        sh_main_prg="samhain"
-dnl     AC_CHECK_HEADER(sys/capability.h, 
-dnl                     [AC_CHECK_LIB(cap, cap_get_proc,,sh_use_lcaps="no")],
-dnl                     [sh_use_lcaps="no"])
-        ],
-)
-AC_SUBST(setpwd_prg)
-AC_SUBST(yulectl_prg)
-AC_SUBST(sh_main_prg)
-AC_SUBST(mytclient)
-
-# needed for the rpm spec
-clmytclient=`echo ${mytclient} | sed s%\-%%`
-AC_SUBST(clmytclient)
-
 AC_ARG_ENABLE(udp,
         [  --enable-udp                 server can listen on port 514/udp [[no]]],