- Fix configure checks for cpg and SaCkpt libraries

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=9
This commit is contained in:
Tim Serong 2010-06-27 10:07:30 +00:00 committed by Git OBS Bridge
parent c8700c5230
commit 10bb8e77dd
3 changed files with 39 additions and 0 deletions

View File

@ -0,0 +1,32 @@
Index: ocfs2-tools/configure.in
===================================================================
--- ocfs2-tools.orig/configure.in
+++ ocfs2-tools/configure.in
@@ -255,9 +255,12 @@ if test "x$cpg_found" = "xyes"; then
# TRY="$TRY"
saved_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $TRY -lcpg"
+ saved_LIBS="$LIBS"
+ LDFLAGS="$LDFLAGS $TRY"
+ LIBS="-lcpg"
AC_LINK_IFELSE([AC_LANG_CALL([], [cpg_initialize])],
cpg_found=yes)
+ LIBS="$saved_LIBS"
LDFLAGS="$saved_LDFLAGS"
if test "x$cpg_found" = "xyes"; then
@@ -294,9 +297,12 @@ if test "x$ckpt_found" = "xyes"; then
# TRY="$TRY"
saved_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $TRY -lSaCkpt"
+ saved_LIBS="$LIBS"
+ LDFLAGS="$LDFLAGS $TRY"
+ LIBS="-lSaCkpt"
AC_LINK_IFELSE([AC_LANG_CALL([], [saCkptInitialize])],
ckpt_found=yes)
+ LIBS="$saved_LIBS"
LDFLAGS="$saved_LDFLAGS"
if test "x$ckpt_found" = "xyes"; then

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Jun 27 09:58:09 UTC 2010 - tserong@novell.com
- Fix configure checks for cpg and SaCkpt libraries
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 14 15:19:45 UTC 2010 - lmb@novell.com Mon Jun 14 15:19:45 UTC 2010 - lmb@novell.com

View File

@ -70,6 +70,7 @@ Patch330: 0030-dx_dirs-fix-ocfs2_swap_dx_entry_list-for-big-endian.patch
Patch331: 0031-dx_dirs-enable-metaecc-and-indexed-dirs-support-as-d.patch Patch331: 0031-dx_dirs-enable-metaecc-and-indexed-dirs-support-as-d.patch
Patch401: version-1.4.3.patch Patch401: version-1.4.3.patch
Patch402: reflink-no-syscall.patch Patch402: reflink-no-syscall.patch
Patch500: fix-configure-check-libs.patch
Url: http://oss.oracle.com/projects/ocfs2-tools/ Url: http://oss.oracle.com/projects/ocfs2-tools/
Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3 Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
PreReq: %insserv_prereq %fillup_prereq PreReq: %insserv_prereq %fillup_prereq
@ -189,6 +190,7 @@ Authors:
%patch331 -p1 %patch331 -p1
%patch401 -p1 %patch401 -p1
%patch402 -p0 %patch402 -p0
%patch500 -p1
%build %build
%{?suse_update_config:%{suse_update_config -f}} %{?suse_update_config:%{suse_update_config -f}}