Add dirty hack to properly compile static binary with selinux and libgcrypt.

(unfortunately libgcrypt-config --libs have no --static switch...)

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

diff --git a/configure.in b/configure.in
index 3a5be93c5ded66774acd5d36768c5c9df34b960f..eab08b1d35691477244f574de19f398cc2592bef 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -36,8 +36,7 @@ UUID_LIBS="$LIBS"
 LIBS="$saved_LIBS"
 AC_SUBST(UUID_LIBS)
 
-AC_CHECK_FUNCS(setlocale)
-
+AC_CHECK_FUNCS([setlocale, posix_memalign])
 
 AC_C_CONST
 AC_C_BIGENDIAN
@@ -104,8 +103,10 @@ if test "x$enable_selinux" != xno; then
                AC_SEARCH_LIBS([pthread_mutex_lock], [pthread],
                        [test "$ac_cv_search_pthread_mutex_lock" = "none required" || LIB_PTHREAD=-lpthread])
                LIBS="$saved_LIBS2"
+               SELINUX_STATIC_LIBS="-lselinux -lsepol"
        fi
 fi
+AC_SUBST(SELINUX_STATIC_LIBS)
 LIBDEVMAPPER_LIBS="$LIBS $LIB_PTHREAD"
 LIBS="$saved_LIBS"
 AC_SUBST(LIBDEVMAPPER_LIBS)
@@ -114,7 +115,6 @@ AC_SUBST(LIBDEVMAPPER_CFLAGS)
 AM_CONDITIONAL(BUILD_LIBDEVMAPPER, test x$build_static = xyes)
 AM_CONDITIONAL(SHARED_LIBDEVMAPPER, test x$build_shared = xyes)
 
-AC_CHECK_FUNCS([posix_memalign])
 dnl ==========================================================================
 
 AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static = xyes)

diff --git a/src/Makefile.am b/src/Makefile.am
index 4b7605840b584407a63dec84bf4e8be6a413fab1..06d7082427e3094428be14a3a9ebf0a0b452672f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,16 +13,19 @@ cryptsetup_SOURCES = \
        cryptsetup.c                            \
        cryptsetup.h
 
-cryptsetup_LDADD = \
-       @POPT_LIBS@                             \
-       $(top_builddir)/lib/libcryptsetup.la
-
 if STATIC_CRYPTSETUP
 _STATIC_FLAGS = -all-static
+_STATIC_LDADD = -lgpg-error @SELINUX_STATIC_LIBS@
 endif
 
+cryptsetup_LDADD = \
+       @POPT_LIBS@                             \
+       $(top_builddir)/lib/libcryptsetup.la    \
+       $(_STATIC_LDADD)
+
+
 cryptsetup_LDFLAGS = \
-       $(_STATIC_FLAGS) 
+       $(_STATIC_FLAGS)
 
 cryptsetup_CFLAGS = -Wall