[SCM] Samba Shared Repository - branch v3-3-stable updated

[Karolin Seeger]

The branch, v3-3-stable has been updated
       via  3df467f... WHATSNEW: Update release notes.
       via  1cbac36... s3:configure: only check for gpfs_gpl.h
      from  ed0611f... WHATSNEW: Prepare release notes for Samba 3.3.10.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable


- Log -----------------------------------------------------------------
commit 3df467f2f38809d0b41c76463bd73c36e1853238
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Jan 14 11:10:27 2010 +0100

    WHATSNEW: Update release notes.
    
    Karolin
    (cherry picked from commit f3ed684b73b233cc2a652f6980e3a854e63eac6b)

commit 1cbac364a7cb3f5314ab0d76da1f65a9e678df6b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Oct 28 11:21:27 2009 +0100

    s3:configure: only check for gpfs_gpl.h
    
    The header is everything we need in order to build vfs_gpfs.
    
    metze
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit ee13e9c0becc2b4a4d3b233613d5e3e9bfb54938)
    
    Fix bug #6856.
    (cherry picked from commit b71f0e5f6f715d7c061d3a845f1e983e2472c1b0)
    (cherry picked from commit 3f0de150f64f93c7874290160359a89b518864b5)

-----------------------------------------------------------------------

Summary of changes:
 WHATSNEW.txt        |    1 +
 source/configure.in |   30 +++++-------------------------
 2 files changed, 6 insertions(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 325c136..8c42cbf 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -75,6 +75,7 @@ o   Jim McDonough <jmcd at samba.org>
 o   Stefan Metzmacher <metze at samba.org>
     * BUG 6157: Restore Samba 3.0.x behavior and use the first "uid" value.
     * BUG 6642: Fix opening the quota magic file.
+    * BUG 6856: Fix the build of the GPFS VFS module with headers only.
     * BUG 6919: Fix remote quota management.
 
 
diff --git a/source/configure.in b/source/configure.in
index 650a38f..5585a02 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -1064,33 +1064,13 @@ AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
 AC_CHECK_FUNCS(backtrace_symbols)
 AC_CHECK_LIB(exc, trace_back_stack)
 
-printf "%s" "checking for GPFS GPL libs... "
-save_LIBS="$LIBS"
-LIBS="$LIBS -lgpfs_gpl"
-AC_TRY_LINK([#include <gpfs_gpl.h>],
-          [gpfs_set_share(0,GPFS_SHARE_READ,GPFS_DENY_NONE)],
-          samba_cv_HAVE_GPFS=yes,
-          samba_cv_HAVE_GPFS=no)
-echo $samba_cv_HAVE_GPFS
-if test x"$samba_cv_HAVE_GPFS" = x"yes"; then
-    AC_DEFINE(HAVE_GPFS,1,[Whether GPFS GPL libs are available])
+#############################
+# check if building with gpfs
+AC_CHECK_HEADERS(gpfs_gpl.h)
+if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
+    AC_DEFINE(HAVE_GPFS,1,[Whether GPFS GPL headers are available])
     default_shared_modules="$default_shared_modules vfs_gpfs"
 fi
-LIBS="$save_LIBS"
-
-printf "%s" "checking for GPFS libs (with 3.2.1 PTF8 available as GPL)... "
-save_LIBS="$LIBS"
-LIBS="$LIBS -lgpfs"
-AC_TRY_LINK([#include <gpfs.h>],
-          [gpfs_set_share(0,GPFS_SHARE_READ,GPFS_DENY_NONE)],
-          samba_cv_HAVE_GPFS=yes,
-          samba_cv_HAVE_GPFS=no)
-echo $samba_cv_HAVE_GPFS
-if test x"$samba_cv_HAVE_GPFS" = x"yes"; then
-    AC_DEFINE(HAVE_GPFS,1,[Whether GPFS GPL libs are available])
-    default_shared_modules="$default_shared_modules vfs_gpfs"
-fi
-LIBS="$save_LIBS"
 
 # Note that all the libunwind symbols in the API are defined to internal
 # platform-specific version, so we must include libunwind.h before checking


-- 
Samba Shared Repository