Tweak configure

diff --git a/bacula/autoconf/acconfig.h b/bacula/autoconf/acconfig.h
index 55a7c954cecd6fdb395a753407f94432ed389a8a..de62f6c49e9742e631ccc6fc6c134c81332fc30e 100644 (file)
--- a/bacula/autoconf/acconfig.h
+++ b/bacula/autoconf/acconfig.h
@@ -179,6 +179,7 @@
 #undef HAVE_SOCKLEN_T
 
 #undef HAVE_OLD_SOCKOPT
+#undef USE_THR_SETCONCURRENCY
  
 /* Defined if Gtk+-2.4 or greater is present */
 #undef HAVE_GTK_2_4

diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in
index c0fe5e92a3d73bd1eef56fe1efe1373196fad069..2b4f018fd3551d275ca555a4539ca6041b4258f5 100644 (file)
--- a/bacula/autoconf/config.h.in
+++ b/bacula/autoconf/config.h.in
@@ -179,6 +179,7 @@
 #undef HAVE_SOCKLEN_T
 
 #undef HAVE_OLD_SOCKOPT
+#undef USE_THR_SETCONCURRENCY
  
 /* Defined if Gtk+-2.4 or greater is present */
 #undef HAVE_GTK_2_4

diff --git a/bacula/autoconf/config.h.in.save b/bacula/autoconf/config.h.in.save
index 33dfaab478640790903dda7524d69e2629b28263..3590d47c0eb1ca3e433f3289f3e70a824b912215 100644 (file)
--- a/bacula/autoconf/config.h.in.save
+++ b/bacula/autoconf/config.h.in.save
@@ -176,6 +176,7 @@
 #undef HAVE_SOCKLEN_T
 
 #undef HAVE_OLD_SOCKOPT
+#undef USE_THR_SETCONCURRENCY
  
 /* Defined if Gtk+-2.4 or greater is present */
 #undef HAVE_GTK_2_4

diff --git a/bacula/configure b/bacula/configure
index 53f7c3aaf842417592fb3333b6fa0b6e4f276eb6..483d915eff9bae8fb7cddd643ef449b9d7fd346f 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -29763,10 +29763,17 @@ solaris)
        platforms/solaris/bacula-fd \
        platforms/solaris/bacula-sd \
        platforms/solaris/bacula-dir"
-   if test x$DISTVER = x5.6 ; then
+   case ${DISTVER} in
+   5.5|5.6)
        $as_echo "#define HAVE_OLD_SOCKOPT 1" >>confdefs.h
-
-   fi
+       $as_echo "#define USE_THR_SETCONCURRENCY 1" >>confdefs.h
+      ;;
+   5.7|5.8)
+       $as_echo "#define USE_THR_SETCONCURRENCY 1" >>confdefs.h
+      ;;
+   *)
+      ;;
+   esac
    LIBS="$LIBS -lresolv -lrt"
   ;;
 suse)