r810 - lvm2/trunk/debian/patches

[Bastian Blank]

Author: waldi
Date: Wed May 19 11:20:40 2010
New Revision: 810

Log:
debian/patches/libs-cleanup.patch: Rename flags.

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

Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch	Wed May 19 11:11:34 2010	(r809)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch	Wed May 19 11:20:40 2010	(r810)
@@ -34,8 +34,8 @@
 -		SELINUX_LIBS=
 -		HAVE_SELINUX=no ])
 +	AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-+	LIBS_SELINUX="$(pkg-config --libs libselinux)"
-+	LIBS_SELINUX_STATIC="$(pkg-config --libs --static libselinux)"
++	LDFLAGS_SELINUX="$(pkg-config --libs libselinux)"
++	LDFLAGS_SELINUX_STATIC="$(pkg-config --libs --static libselinux)"
  fi
  
  ################################################################################
@@ -94,7 +94,7 @@
  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_CHECK_LIB([readline], [readline], [LDFLAGS_READLINE="-lreadline"], AC_MSG_ERROR(bailing out))
 +	AC_DEFINE([READLINE_SUPPORT], 1, [Define to 1 to include the LVM readline shell.])
  fi
  
@@ -103,9 +103,9 @@
  AC_SUBST(JOBS)
  AC_SUBST(LDDEPS)
  AC_SUBST(LIBS)
-+AC_SUBST(LIBS_READLINE)
-+AC_SUBST(LIBS_SELINUX)
-+AC_SUBST(LIBS_SELINUX_STATIC)
++AC_SUBST(LDFLAGS_READLINE)
++AC_SUBST(LDFLAGS_SELINUX)
++AC_SUBST(LDFLAGS_SELINUX_STATIC)
  AC_SUBST(LIB_SUFFIX)
  AC_SUBST(LOCALEDIR)
  AC_SUBST(LVM1)
@@ -131,7 +131,7 @@
  
  include $(top_builddir)/make.tmpl
  
-+LDFLAGS += @LIBS_SELINUX@
++LDFLAGS += @LDFLAGS_SELINUX@
 +
  DEFS += -DDM_DEVICE_UID=@DM_DEVICE_UID@ -DDM_DEVICE_GID=@DM_DEVICE_GID@ \
  	-DDM_DEVICE_MODE=@DM_DEVICE_MODE@
@@ -167,7 +167,7 @@
  endif
  
 -LVMLIBS += -ldevmapper
-+LVMLIBS += -ldevmapper @LIBS_READLINE@
++LVMLIBS += -ldevmapper @LDFLAGS_READLINE@
  
  DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"