1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
diff -r fe06a2448c53 configure
diff -r fe06a2448c53 configure.ac
--- a/configure.ac Fri Sep 26 21:03:22 2014 -0600
+++ b/configure.ac Sat Sep 27 10:09:38 2014 -0600
@@ -226,7 +226,6 @@
shadow_defs=
shadow_funcs=
shadow_libs=
-shadow_libs_optional=
CONFIGURE_ARGS="$@"
dnl
@@ -1908,9 +1907,7 @@
;;
*-*-linux*|*-*-k*bsd*-gnu)
OSDEFS="${OSDEFS} -D_GNU_SOURCE"
- # Some Linux versions need to link with -lshadow
shadow_funcs="getspnam"
- shadow_libs_optional="-lshadow"
test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
;;
*-*-gnu*)
@@ -3430,13 +3427,6 @@
LIBS="$LIBS $shadow_libs"
found=no
AC_CHECK_FUNCS($shadow_funcs, [found=yes])
- if test "$found" = "yes" -a -n "$shadow_libs_optional"; then
- LIBS="$LIBS $shadow_libs_optional"
- AC_CHECK_FUNCS($shadow_funcs, [found=yes])
- if test "$found" = "yes"; then
- shadow_libs="$shadow_libs $shadow_libs_optional"
- fi
- fi
if test "$found" = "yes"; then
case "$shadow_funcs" in
*getprpwnam*) SECUREWARE=1;;
@@ -3449,7 +3439,7 @@
LIBS="$_LIBS"
fi
if test "$CHECKSHADOW" = "true"; then
- AC_SEARCH_LIBS([getspnam], [gen], [AC_DEFINE(HAVE_GETSPNAM)] [CHECKSHADOW=false; test -n "$ac_lib" && shadow_libs="${shadow_libs} $ac_res"])
+ AC_SEARCH_LIBS([getspnam], [gen shadow], [AC_DEFINE(HAVE_GETSPNAM)] [CHECKSHADOW=false; test -n "$ac_lib" && shadow_libs="${shadow_libs} $ac_res"])
fi
if test "$CHECKSHADOW" = "true"; then
AC_SEARCH_LIBS([getprpwnam], [sec security prot], [AC_DEFINE(HAVE_GETPRPWNAM)] [CHECKSHADOW=false; SECUREWARE=1; test -n "$ac_lib" && shadow_libs="${shadow_libs} $ac_res"])
|
GitWeb
