Fix build for non-standard gcrypt library location.

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@158 36d66b0a-2a48-0410-832c-cd162a569da5

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5f44d11203b64253e44f528ff4a9e6fb57871a93..72210fb6c8075ac0bc858d7f3f88ee13b8c916dc 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -28,7 +28,7 @@ libcryptsetup_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/lib/libcryptsetup.sym \
        -version-info 1:0:0
 
-libcryptsetup_la_CFLAGS = -Wall
+libcryptsetup_la_CFLAGS = -Wall @LIBGCRYPT_CFLAGS@
 
 libcryptsetup_la_LIBADD = \
        @UUID_LIBS@                             \

diff --git a/luks/Makefile.am b/luks/Makefile.am
index 19dce325601eb8392b8e591f560e77752bc5dc99..7ce43cadcbbcca19bd4f7dcbaaa7a480c7038de0 100644 (file)
--- a/luks/Makefile.am
+++ b/luks/Makefile.am
@@ -2,7 +2,7 @@ moduledir = $(libdir)/cryptsetup
 
 noinst_LTLIBRARIES = libluks.la
 
-libluks_la_CFLAGS = -Wall
+libluks_la_CFLAGS = -Wall @LIBGCRYPT_CFLAGS@
 
 libluks_la_SOURCES = \
        af.c \

diff --git a/src/Makefile.am b/src/Makefile.am
index 06d7082427e3094428be14a3a9ebf0a0b452672f..a61c59e972219cc11be4fcdb899e72dbb50c8f6e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@ cryptsetup_SOURCES = \
 
 if STATIC_CRYPTSETUP
 _STATIC_FLAGS = -all-static
-_STATIC_LDADD = -lgpg-error @SELINUX_STATIC_LIBS@
+_STATIC_LDADD = @LIBGCRYPT_LIBS@ @SELINUX_STATIC_LIBS@
 endif
 
 cryptsetup_LDADD = \