r803 - in lvm2/trunk/debian: . patches

[Bastian Blank]

Author: waldi
Date: Sat May 15 15:43:31 2010
New Revision: 803

Log:
* debian/changelog: Update.
* debian/patches/libs-cleanup.patch: Correctly use readline lib.

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/patches/libs-cleanup.patch

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Sat May 15 15:23:36 2010	(r802)
+++ lvm2/trunk/debian/changelog	Sat May 15 15:43:31 2010	(r803)
@@ -2,6 +2,7 @@
 
   * New upstream version.
   * Don't longer build static libraries.
+  * Fix readline support. (closes: #575640)
 
  -- Bastian Blank <waldi at debian.org>  Sat, 15 May 2010 14:38:31 +0000
 

Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch	Sat May 15 15:23:36 2010	(r802)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch	Sat May 15 15:43:31 2010	(r803)
@@ -8,6 +8,15 @@
  		LIB_SUFFIX=so
  		DEVMAPPER=yes
  		ODIRECT=yes
+@@ -307,7 +306,7 @@
+ AC_MSG_CHECKING(whether to enable readline)
+ AC_ARG_ENABLE([readline],
+   [  --disable-readline      Disable readline support],
+-  [READLINE=$enableval], [READLINE=maybe])
++  [READLINE=$enableval], [READLINE=yes])
+ AC_MSG_RESULT($READLINE)
+ 
+ ################################################################################
 @@ -823,18 +822,9 @@
  ################################################################################
  dnl -- Check for selinux
@@ -80,16 +89,17 @@
  dnl -- Internationalisation stuff
  AC_MSG_CHECKING(whether to enable internationalisation)
  AC_ARG_ENABLE(nls, [  --enable-nls            Enable Native Language Support],
-@@ -955,7 +902,7 @@
+@@ -955,7 +902,8 @@
  ################################################################################
  dnl -- Ensure additional headers required
  if test x$READLINE = xyes; then
 -	AC_CHECK_HEADERS(readline/readline.h readline/history.h,,AC_MSG_ERROR(bailing out))
 +	AC_CHECK_LIB([readline], [readline], [LIBS_READLINE="-lreadline"], AC_MSG_ERROR(bailing out))
++	AC_DEFINE([READLINE_SUPPORT], 1, [Define to 1 to include the LVM readline shell.])
  fi
  
  if test x$CLVMD != xnone; then
-@@ -1093,6 +1040,9 @@
+@@ -1093,6 +1041,9 @@
  AC_SUBST(JOBS)
  AC_SUBST(LDDEPS)
  AC_SUBST(LIBS)
@@ -150,3 +160,14 @@
  endif
  
  $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
+--- a/tools/Makefile.in
++++ b/tools/Makefile.in
+@@ -104,7 +104,7 @@
+ 	LVMLIBS += -ldevmapper-event
+ endif
+ 
+-LVMLIBS += -ldevmapper
++LVMLIBS += -ldevmapper @LIBS_READLINE@
+ 
+ DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
+