tsocket/bsd: fix do_bind logic for AF_INET

[abartlet/samba.git/.git] / source3 / configure.in

diff --git a/source3/configure.in b/source3/configure.in
index 14b57b688a19e9fa2483086055a67a25b510e72d..0de367ade1cfadb8151b747b72d2dc59a47559c6 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1658,6 +1658,17 @@ DSO_EXPORTS=""
                        PICFLAG="-fPIC"
                        AC_DEFINE(STAT_ST_BLOCKSIZE,512)
                        AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
+                       for flags in "-expect_unresolved '*'" "-Wl,-expect_unresolved,'*'" ; do
+                               saved_ldflags="$LDFLAGS"
+                               AC_MSG_CHECKING([if $flags works])
+                               LDFLAGS="$flags $saved_ldflags"
+                               AC_TRY_LINK([],[],
+                                       [AC_MSG_RESULT([yes])
+                                       LDSHFLAGS_Z_NODEFS=$flags],
+                                       AC_MSG_RESULT([no]))
+                               LDFLAGS="$saved_ldflags"
+                               test x"$LDSHFLAGS_Z_NODEFS" != x && break
+                       done
                        ;;
                *sco*) AC_DEFINE(SCO,1,[Whether the host os is sco unix])
                        AC_DEFINE(STAT_ST_BLOCKSIZE,512)
@@ -5285,7 +5296,7 @@ AC_CHECK_HEADERS(ctdb.h ctdb_private.h,,,[
 #include <ctdb.h>
 ])
 
-AC_HAVE_DECL(CTDB_CONTROL_TRANS2_COMMIT_RETRY,[
+AC_HAVE_DECL(CTDB_CONTROL_TRANS3_COMMIT,[
 #include "confdefs.h"
 #define NO_CONFIG_H
 #include "replace.h"
@@ -5296,27 +5307,10 @@ AC_HAVE_DECL(CTDB_CONTROL_TRANS2_COMMIT_RETRY,[
 #include <ctdb.h>
 #include <ctdb_private.h>
 ])
-if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" = x"yes"; then
+if test x"$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" = x"yes"; then
        ctdb_broken=no
 else
-       ctdb_broken="missing transaction support"
-fi
-
-AC_HAVE_DECL(CTDB_CONTROL_TRANS2_ACTIVE,[
-#include "confdefs.h"
-#define NO_CONFIG_H
-#include "replace.h"
-#include "system/wait.h"
-#include "system/network.h"
-#include <talloc.h>
-#include <tdb.h>
-#include <ctdb.h>
-#include <ctdb_private.h>
-])
-if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" = x"yes"; then
-       ctdb_broken=no
-else
-       ctdb_broken="transaction support too old"
+       ctdb_broken="ctdb transaction support missing or too old"
 fi
 
 # in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client