patch-configure_in 1.3 KB

12345678910111213141516171819202122232425262728293031
  1. --- cryptsetup-1.1.0.orig/configure.in 2010-01-17 11:26:31.000000000 +0100
  2. +++ cryptsetup-1.1.0/configure.in 2010-02-14 18:24:56.000000000 +0100
  3. @@ -80,7 +80,7 @@ LIBS=$saved_LIBS
  4. if test "x$enable_selinux" != xno; then
  5. AC_CHECK_LIB(sepol, sepol_bool_set)
  6. AC_CHECK_LIB(selinux, is_selinux_enabled)
  7. - if test x$enable_static = xyes; then
  8. + if test x$enable_static_cryptsetup = xyes; then
  9. SELINUX_STATIC_LIBS=$LIBS
  10. # Check if we need -pthread with --enable-static and selinux
  11. saved_LIBS2=$LIBS
  12. @@ -91,7 +91,7 @@ if test "x$enable_selinux" != xno; then
  13. fi
  14. fi
  15. -if test x$enable_static = xyes; then
  16. +if test x$enable_static_cryptsetup = xyes; then
  17. saved_LIBS2=$LIBS
  18. LIBS="$LIBS -static"
  19. # Check if it there is still not some missing dependency like static selinux libs
  20. @@ -135,8 +135,8 @@ CS_NUM_WITH([luks1-keybits],[key length
  21. dnl ==========================================================================
  22. -AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static = xyes)
  23. -AM_CONDITIONAL(DYNAMIC_CRYPTSETUP, test x$enable_static = xno)
  24. +AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static_cryptsetup = xyes)
  25. +AM_CONDITIONAL(DYNAMIC_CRYPTSETUP, test x$enable_static_cryptsetup = xno)
  26. dnl ==========================================================================