Attachment 5177 Details for Bug 6856 – Patch for v3-3

[patch] Patch for v3-3

tmp.diff (text/plain), 2.20 KB, created by Stefan Metzmacher on 2010-01-14 03:44:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2010-01-14 03:44:44 UTC

Size: 2.20 KB

patch

obsolete

>From 5f92056d4de360d56e8c7e7880342ce145821781 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Wed, 28 Oct 2009 11:21:27 +0100
>Subject: [PATCH] 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@samba.org>
>(cherry picked from commit ee13e9c0becc2b4a4d3b233613d5e3e9bfb54938)
>
>Fix bug #6856.
>(cherry picked from commit b71f0e5f6f715d7c061d3a845f1e983e2472c1b0)
>---
> source/configure.in |   30 +++++-------------------------
> 1 files changed, 5 insertions(+), 25 deletions(-)
>
>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
>-- 
>1.6.3.3
>

Flags:

kseeger: review+

Actions: View

Attachments on bug 6856: 4903 | 5177