eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-14 04:10:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix pkgconfig to use proper package version (Issue 60, thanks to Jan Engelhardt).

Browse Source 
git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@196 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2010-04-12 11:53:36 +00:00
parent 743fbbc451
commit 71c0c1f26d
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,3 +1,6 @@
2010-04-12 Milan Broz <mbroz@redhat.com>
* Fix package config to use proper package version.
2010-04-06 Milan Broz <mbroz@redhat.com> 2010-04-06 Milan Broz <mbroz@redhat.com>
* Prefer some device paths in status display. * Prefer some device paths in status display.
* Support device topology detectionfor data alignment. * Support device topology detectionfor data alignment.

11
configure.in
View File

@@ -1,5 +1,10 @@
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_INIT(cryptsetup,1.1.0) AC_INIT(cryptsetup,1.1.0)
dnl library version from <major>.<minor>.<release>[-<suffix>]
LIBCRYPTSETUP_VERSION=$(echo $PACKAGE_VERSION | cut -f1 -d-)
LIBCRYPTSETUP_VERSION_INFO=1:0:0
AC_CONFIG_SRCDIR(src/cryptsetup.c) AC_CONFIG_SRCDIR(src/cryptsetup.c)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
@@ -94,8 +99,10 @@ fi
LIBS=$saved_LIBS LIBS=$saved_LIBS
DEVMAPPER_LIBS="$DEVMAPPER_LIBS $LIB_PTHREAD" DEVMAPPER_LIBS="$DEVMAPPER_LIBS $LIB_PTHREAD"
AC_SUBST(DEVMAPPER_LIBS) AC_SUBST([DEVMAPPER_LIBS])
AC_SUBST(SELINUX_STATIC_LIBS) AC_SUBST([SELINUX_STATIC_LIBS])
AC_SUBST([LIBCRYPTSETUP_VERSION])
AC_SUBST([LIBCRYPTSETUP_VERSION_INFO])
dnl ========================================================================== dnl ==========================================================================
AC_DEFUN([CS_DEFINE], AC_DEFUN([CS_DEFINE],

2
lib/Makefile.am
View File

@@ -26,7 +26,7 @@ libcryptsetup_la_DEPENDENCIES = libcryptsetup.sym
libcryptsetup_la_LDFLAGS = \ libcryptsetup_la_LDFLAGS = \
$(_STATIC_LIBRARY) \ $(_STATIC_LIBRARY) \
-Wl,--version-script=$(top_srcdir)/lib/libcryptsetup.sym \ -Wl,--version-script=$(top_srcdir)/lib/libcryptsetup.sym \
-version-info 1:0:0 -version-info @LIBCRYPTSETUP_VERSION_INFO@
libcryptsetup_la_CFLAGS = -Wall @LIBGCRYPT_CFLAGS@ libcryptsetup_la_CFLAGS = -Wall @LIBGCRYPT_CFLAGS@

2
lib/libcryptsetup.pc.in
View File

@@ -5,6 +5,6 @@ includedir=@includedir@
Name: cryptsetup Name: cryptsetup
Description: cryptsetup library Description: cryptsetup library
Version: 1.0.0 Version: @LIBCRYPTSETUP_VERSION@
Cflags: -I${includedir} Cflags: -I${includedir}
Libs: -L${libdir} -lcryptsetup Libs: -L${libdir} -lcryptsetup