[Libreoffice-commits] .: configure.in set_soenv.in

[Jan Holesovsky]

 configure.in |   25 -------------------------
 set_soenv.in |    1 -
 2 files changed, 26 deletions(-)

New commits:
commit a376c9257d555a9ddf0bfc17be4166fc81e1ff37
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Mar 24 22:33:03 2011 +0100

    Kill the remnants of the PAM removal (--enable-crypt-link and CRYPT_LINK).

diff --git a/configure.in b/configure.in
index e28100f..efe1e1a 100755
--- a/configure.in
+++ b/configure.in
@@ -364,12 +364,6 @@ AC_ARG_ENABLE(rpath,
         [Disable the use of relative paths in shared libraries.]),
 ,)
 
-AC_ARG_ENABLE(crypt-link,
-    AS_HELP_STRING([--disable-crypt-link],
-        [Disable linking with libcrypt instead of dynamically open it (needed for
-         ancient GNU/Linux distributions without crypt()/libcrypt).]),
-,enable_crypt_link=yes)
-
 AC_ARG_ENABLE(xrender-link,
     AS_HELP_STRING([--enable-xrender-link],
         [Link with libXrender instead of dynamically open it.]),
@@ -2375,25 +2369,6 @@ fi
 AC_SUBST([VALGRIND_CFLAGS])
 
 dnl ===================================================================
-dnl Whether to link to libcrypt.
-dnl ===================================================================
-
-
-if test "$_os" = "Linux"; then
-    AC_MSG_CHECKING([whether to link to libcrypt])
-    if test -n "$enable_crypt_link" -a "$enable_crypt_link" != "no"; then
-        AC_MSG_RESULT([yes])
-        CRYPT_LINK=YES
-        AC_CHECK_LIB(crypt, crypt, [],
-            [AC_MSG_ERROR(libcrypt not found or functional)], [])
-    else
-        AC_MSG_RESULT([no, dynamically open it])
-        CRYPT_LINK=NO
-    fi
-fi
-AC_SUBST(CRYPT_LINK)
-
-dnl ===================================================================
 dnl Testing for c++ compiler and version...
 dnl ===================================================================
 if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
diff --git a/set_soenv.in b/set_soenv.in
index 2d37314..280f802 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1996,7 +1996,6 @@ ToFile( "MYTHES_CFLAGS",     "@MYTHES_CFLAGS@",    "e" );
 ToFile( "MYTHES_LIBS",       "@MYTHES_LIBS@",      "e" );
 ToFile( "SYSTEM_LIBTEXTCAT", "@SYSTEM_LIBTEXTCAT@","e" );
 ToFile( "SYSTEM_LIBTEXTCAT_DATA","@SYSTEM_LIBTEXTCAT_DATA@","e" );
-ToFile( "CRYPT_LINK",        "@CRYPT_LINK@",       "e" );
 ToFile( "XAU_LIBS",          "@XAU_LIBS@",         "e" );
 ToFile( "GXX_INCLUDE_PATH",  PathFormat("@GXX_INCLUDE_PATH@"), "e" );
 ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS,  "e" );