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

[Michael Meeks]

 configure.in |   32 --------------------------------
 set_soenv.in |    3 ---
 2 files changed, 35 deletions(-)

New commits:
commit 52846c4f0cbdb8f91133b4c2a9a4d99f321dcde6
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Oct 25 16:22:31 2010 +0100

    cleanup / remove obsolete pam config pieces

diff --git a/configure.in b/configure.in
index a52d6cf..e63c299 100644
--- a/configure.in
+++ b/configure.in
@@ -2147,38 +2147,6 @@ if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then
                     [AC_MSG_ERROR([cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?])], [])
 fi
 
-dnl ===================================================================
-dnl Check if PAM/pam_appl.h is available on Linux or FreeBSD
-dnl ===================================================================
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then
-  AC_MSG_CHECKING([whether to enable pam support])
-  if test -z "$enable_pam" || test "$enable_pam" != "no"; then
-    AC_MSG_RESULT([yes])
-    PAM=YES
-    AC_CHECK_HEADER(security/pam_appl.h, [],
-                    [AC_MSG_ERROR([pam_appl.h could not be found. libpam-dev or pam-devel missing?])], [])
-    AC_MSG_CHECKING([whether to link to libpam])
-    if test -n "$enable_pam_link" -a "$enable_pam_link" != "no"; then
-      AC_MSG_RESULT([yes])
-      PAM_LINK=YES
-      AC_CHECK_LIB(pam, pam_start, [],
-          [AC_MSG_ERROR(libpam not found or functional)], [])
-    else
-      AC_MSG_RESULT([no, dynamically open it])
-      PAM_LINK=NO
-    fi
-  else
-    AC_MSG_RESULT([no])
-    PAM=NO
-    PAM_LINK=NO
-    dnl check getspnam_r for needed args (4 or 5)
-    AX_FUNC_WHICH_GETSPNAM_R
-  fi
-fi
-AC_SUBST(PAM)
-AC_SUBST(NEW_SHADOW_API)
-AC_SUBST(PAM_LINK)
-
 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
diff --git a/set_soenv.in b/set_soenv.in
index 5a3313c..430003f 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1958,9 +1958,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( "PAM",               "@PAM@",              "e" );
-ToFile( "NEW_SHADOW_API",    "@NEW_SHADOW_API@",   "e" );
-ToFile( "PAM_LINK",          "@PAM_LINK@",         "e" );
 ToFile( "CRYPT_LINK",        "@CRYPT_LINK@",       "e" );
 ToFile( "XAU_LIBS",          "@XAU_LIBS@",         "e" );
 ToFile( "GXX_INCLUDE_PATH",  PathFormat("@GXX_INCLUDE_PATH@"), "e" );