From 38363ca4258b06dfc80fa984c4b3362ea4ae99a9 Mon Sep 17 00:00:00 2001 From: Marco van Wieringen Date: Mon, 11 Apr 2011 20:31:54 +0200 Subject: [PATCH] Tweak configure --- bacula/autoconf/acconfig.h | 1 + bacula/autoconf/config.h.in | 1 + bacula/autoconf/config.h.in.save | 1 + bacula/configure | 13 ++++++++++--- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/bacula/autoconf/acconfig.h b/bacula/autoconf/acconfig.h index 55a7c954ce..de62f6c49e 100644 --- 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 c0fe5e92a3..2b4f018fd3 100644 --- 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 33dfaab478..3590d47c0e 100644 --- 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 53f7c3aaf8..483d915eff 100755 --- 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) -- 2.39.5