[Ocfs2-tools-commits] jlbec commits r1157 - in trunk: . extras

[svn-commits@oss.oracle.com]

Author: jlbec
Date: 2006-02-20 18:49:53 -0600 (Mon, 20 Feb 2006)
New Revision: 1157

Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/extras/Makefile
Log:

o Revert the previous change and use com_err.pc, which SuSE has fixed.



Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2006-02-20 23:16:57 UTC (rev 1156)
+++ trunk/Config.make.in	2006-02-21 00:49:53 UTC (rev 1157)
@@ -44,6 +44,7 @@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@ 
 
+COM_ERR_CFLAGS = @COM_ERR_CFLAGS@
 COM_ERR_LIBS = @COM_ERR_LIBS@
 UUID_LIBS = @UUID_LIBS@
 

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-02-20 23:16:57 UTC (rev 1156)
+++ trunk/configure.in	2006-02-21 00:49:53 UTC (rev 1157)
@@ -77,52 +77,17 @@
 AC_SUBST(OCFS2_DEBUG)
 AC_MSG_RESULT($enable_debug)
 
-AC_MSG_CHECKING(whether to build fsck dynamically)
-AC_ARG_ENABLE([dynamic-fsck], [  --enable-dynamic-fsck=[yes/no]    Build fsck dynamically [default=no]],,enable_dynamic_fsck=no)
-OCFS2_DYNAMIC_FSCK=
-if test "x$enable_dynamic_fsck" = "xyes"; then
-    OCFS2_DYNAMIC_FSCK=yes
-fi
-AC_SUBST(OCFS2_DYNAMIC_FSCK)
-AC_MSG_RESULT($enable_dynamic_fsck)
-
-AC_MSG_CHECKING(whether to build cluster control tools dynamically)
-AC_ARG_ENABLE([dynamic-ctl], [  --enable-dynamic-ctl=[yes/no]    Build cluster control tools dynamically [default=no]],,enable_dynamic_ctl=no)
-OCFS2_DYNAMIC_CTL=
-if test "x$enable_dynamic_ctl" = "xyes"; then
-    OCFS2_DYNAMIC_CTL=yes
-fi
-AC_SUBST(OCFS2_DYNAMIC_CTL)
-AC_MSG_RESULT($enable_dynamic_ctl)
-
-# Test statically building com_err
-old_CFLAGS="$CFLAGS"
-if test "x$OCFS2_DYNAMIC_CTL" != "xyes" -o "x$OCFS2_DYNAMIC_FSCK" != "xyes"; then
-    CFLAGS="$CFLAGS -static"
-fi
-
 COM_ERR_LIBS=
-PTHREADS=
-AC_CHECK_LIB(com_err, com_err, COM_ERR_LIBS=-lcom_err)
-if test "x$COM_ERR_LIBS" = "x"; then
-  AC_MSG_RESULT([what about the broken SuSE com_err... ])
-
-  # Don't let caching fool us
-  unset ac_cv_lib_com_err_com_err
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lpthread"
-  AC_CHECK_LIB(com_err, com_err, COM_ERR_LIBS="-lcom_err -lpthread")
+PKG_CHECK_MODULES(COM_ERR, com_err,, [
+  AC_CHECK_LIB(com_err, com_err, COM_ERR_LIBS=-lcom_err)
   if test "x$COM_ERR_LIBS" = "x"; then
     AC_MSG_ERROR([Unable to find com_err library])
   fi
-  LIBS="$old_LIBS"
-fi
+])
 AC_CHECK_HEADER(et/com_err.h, :,
   AC_MSG_ERROR([Unable to find com_err headers]))
 AC_SUBST(COM_ERR_LIBS)
 
-CFLAGS="$old_CFLAGS $PTHREADS"
-
 UUID_LIBS=
 AC_CHECK_LIB(uuid, uuid_unparse, UUID_LIBS=-luuid)
 if test "x$UUID_LIBS" = "x"; then
@@ -140,6 +105,25 @@
 fi
 AC_SUBST(OCFS2_DEBUG_EXE)
 AC_MSG_RESULT($enable_debugexe)
+
+AC_MSG_CHECKING(whether to build fsck dynamically)
+AC_ARG_ENABLE([dynamic-fsck], [  --enable-dynamic-fsck=[yes/no]    Build fsck dynamically [default=no]],,enable_dynamic_fsck=no)
+OCFS2_DYNAMIC_FSCK=
+if test "x$enable_dynamic_fsck" = "xyes"; then
+    OCFS2_DYNAMIC_FSCK=yes
+fi
+AC_SUBST(OCFS2_DYNAMIC_FSCK)
+AC_MSG_RESULT($enable_dynamic_fsck)
+
+AC_MSG_CHECKING(whether to build cluster control tools dynamically)
+AC_ARG_ENABLE([dynamic-ctl], [  --enable-dynamic-ctl=[yes/no]    Build cluster control tools dynamically [default=no]],,enable_dynamic_ctl=no)
+OCFS2_DYNAMIC_CTL=
+if test "x$enable_dynamic_ctl" = "xyes"; then
+    OCFS2_DYNAMIC_CTL=yes
+fi
+AC_SUBST(OCFS2_DYNAMIC_CTL)
+AC_MSG_RESULT($enable_dynamic_ctl)
+
 GLIB_REQUIRED_VERSION=2.2.3
 
 AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, have_glib=yes, have_glib=no)

Modified: trunk/extras/Makefile
===================================================================
--- trunk/extras/Makefile	2006-02-20 23:16:57 UTC (rev 1156)
+++ trunk/extras/Makefile	2006-02-21 00:49:53 UTC (rev 1157)
@@ -39,27 +39,27 @@
 ENCODE_LOCKRES_OBJS  = $(subst .c,.o,$(ENCODE_LOCKRES_CFILES))
 MARK_JOURNAL_DIRTY_OBJS = $(subst .c,.o,$(MARK_JOURNAL_DIRTY_CFILES))
 LIBOCFS2 = ../libocfs2/libocfs2.a
-LIBS = $(LIBOCFS2) $(COM_ERR_LIBS)
+EXTRAS_LIBS = $(LIBOCFS2) $(COM_ERR_LIBS)
 
-find_hardlinks: $(FIND_HARDLINKS_OBJS) $(LIBS)
-	$(LINK) 
+find_hardlinks: $(FIND_HARDLINKS_OBJS) $(LIBOCFS2)
+	$(LINK) $(EXTRAS_LIBS)
 
-find_dup_extents: $(FIND_DUP_EXTENTS_OBJS) $(LIBS)
-	$(LINK) 
+find_dup_extents: $(FIND_DUP_EXTENTS_OBJS) $(LIBOCFS2)
+	$(LINK) $(EXTRAS_LIBS)
 
-find_inode_paths: $(FIND_INODE_PATHS_OBJS) $(LIBS)
-	$(LINK) 
+find_inode_paths: $(FIND_INODE_PATHS_OBJS) $(LIBOCFS2)
+	$(LINK) $(EXTRAS_LIBS)
 
-set_random_bits: $(SET_RANDOM_BITS_OBJS) $(LIBS)
-	$(LINK) 
+set_random_bits: $(SET_RANDOM_BITS_OBJS) $(LIBOCFS2)
+	$(LINK) $(EXTRAS_LIBS)
 
-decode_lockres: $(DECODE_LOCKRES_OBJS) $(LIBS)
-	$(LINK) 
+decode_lockres: $(DECODE_LOCKRES_OBJS) $(LIBOCFS2)
+	$(LINK) $(EXTRAS_LIBS)
 
-encode_lockres: $(ENCODE_LOCKRES_OBJS) $(LIBS)
-	$(LINK) 
+encode_lockres: $(ENCODE_LOCKRES_OBJS) $(LIBOCFS2)
+	$(LINK) $(EXTRAS_LIBS)
 
-mark_journal_dirty: $(MARK_JOURNAL_DIRTY_OBJS) $(LIBS)
-	$(LINK)
+mark_journal_dirty: $(MARK_JOURNAL_DIRTY_OBJS) $(LIBOCFS2)
+	$(LINK) $(EXTRAS_LIBS)
 
 include $(TOPDIR)/Postamble.make