diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | Makefile.in | 7 | ||||
-rw-r--r-- | configure.ac | 24 |
3 files changed, 20 insertions, 18 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20070325 | ||
2 | - (dtucker) [Makefile.in configure.ac] Replace single-purpose LIBSELINUX, | ||
3 | LIBWRAP and LIBPAM variables in Makefile with the general-purpose | ||
4 | SSHDLIBS. "I like" djm@ | ||
5 | |||
1 | 20070321 | 6 | 20070321 |
2 | - (dtucker) OpenBSD CVS Sync | 7 | - (dtucker) OpenBSD CVS Sync |
3 | - dtucker@cvs.openbsd.org 2007/03/09 05:20:06 | 8 | - dtucker@cvs.openbsd.org 2007/03/09 05:20:06 |
@@ -2863,4 +2868,4 @@ | |||
2863 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 2868 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
2864 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 2869 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
2865 | 2870 | ||
2866 | $Id: ChangeLog,v 1.4647 2007/03/21 10:45:48 dtucker Exp $ | 2871 | $Id: ChangeLog,v 1.4648 2007/03/25 08:26:01 dtucker Exp $ |
diff --git a/Makefile.in b/Makefile.in index fb6426b27..6630baa86 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.283 2006/10/23 21:44:47 tim Exp $ | 1 | # $Id: Makefile.in,v 1.284 2007/03/25 08:26:01 dtucker Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -44,11 +44,8 @@ LD=@LD@ | |||
44 | CFLAGS=@CFLAGS@ | 44 | CFLAGS=@CFLAGS@ |
45 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ | 45 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
46 | LIBS=@LIBS@ | 46 | LIBS=@LIBS@ |
47 | LIBSELINUX=@LIBSELINUX@ | ||
48 | SSHDLIBS=@SSHDLIBS@ | 47 | SSHDLIBS=@SSHDLIBS@ |
49 | LIBEDIT=@LIBEDIT@ | 48 | LIBEDIT=@LIBEDIT@ |
50 | LIBPAM=@LIBPAM@ | ||
51 | LIBWRAP=@LIBWRAP@ | ||
52 | AR=@AR@ | 49 | AR=@AR@ |
53 | AWK=@AWK@ | 50 | AWK=@AWK@ |
54 | RANLIB=@RANLIB@ | 51 | RANLIB=@RANLIB@ |
@@ -139,7 +136,7 @@ ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) | |||
139 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 136 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
140 | 137 | ||
141 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) | 138 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) |
142 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBSELINUX) $(SSHDLIBS) $(LIBS) | 139 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) |
143 | 140 | ||
144 | scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o | 141 | scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o |
145 | $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 142 | $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
diff --git a/configure.ac b/configure.ac index f155ada60..a2a988c7d 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.373 2007/03/21 10:39:57 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.374 2007/03/25 08:26:01 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.373 $) | 18 | AC_REVISION($Revision: 1.374 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -1109,8 +1109,7 @@ AC_ARG_WITH(tcp-wrappers, | |||
1109 | CPPFLAGS="-I${withval} ${CPPFLAGS}" | 1109 | CPPFLAGS="-I${withval} ${CPPFLAGS}" |
1110 | fi | 1110 | fi |
1111 | fi | 1111 | fi |
1112 | LIBWRAP="-lwrap" | 1112 | LIBS="-lwrap $LIBS" |
1113 | LIBS="$LIBWRAP $LIBS" | ||
1114 | AC_MSG_CHECKING(for libwrap) | 1113 | AC_MSG_CHECKING(for libwrap) |
1115 | AC_TRY_LINK( | 1114 | AC_TRY_LINK( |
1116 | [ | 1115 | [ |
@@ -1126,7 +1125,7 @@ AC_ARG_WITH(tcp-wrappers, | |||
1126 | AC_DEFINE(LIBWRAP, 1, | 1125 | AC_DEFINE(LIBWRAP, 1, |
1127 | [Define if you want | 1126 | [Define if you want |
1128 | TCP Wrappers support]) | 1127 | TCP Wrappers support]) |
1129 | AC_SUBST(LIBWRAP) | 1128 | SSHDLIBS="$SSHDLIBS -lwrap" |
1130 | TCPW_MSG="yes" | 1129 | TCPW_MSG="yes" |
1131 | ], | 1130 | ], |
1132 | [ | 1131 | [ |
@@ -2028,7 +2027,7 @@ AC_ARG_WITH(pam, | |||
2028 | 2027 | ||
2029 | PAM_MSG="yes" | 2028 | PAM_MSG="yes" |
2030 | 2029 | ||
2031 | LIBPAM="-lpam" | 2030 | SSHDLIBS="$SSHDLIBS -lpam" |
2032 | AC_DEFINE(USE_PAM, 1, | 2031 | AC_DEFINE(USE_PAM, 1, |
2033 | [Define if you want to enable PAM support]) | 2032 | [Define if you want to enable PAM support]) |
2034 | 2033 | ||
@@ -2038,11 +2037,10 @@ AC_ARG_WITH(pam, | |||
2038 | # libdl already in LIBS | 2037 | # libdl already in LIBS |
2039 | ;; | 2038 | ;; |
2040 | *) | 2039 | *) |
2041 | LIBPAM="$LIBPAM -ldl" | 2040 | SSHDLIBS="$SSHDLIBS -ldl" |
2042 | ;; | 2041 | ;; |
2043 | esac | 2042 | esac |
2044 | fi | 2043 | fi |
2045 | AC_SUBST(LIBPAM) | ||
2046 | fi | 2044 | fi |
2047 | ] | 2045 | ] |
2048 | ) | 2046 | ) |
@@ -3157,19 +3155,18 @@ LIBSELINUX="" | |||
3157 | AC_ARG_WITH(selinux, | 3155 | AC_ARG_WITH(selinux, |
3158 | [ --with-selinux Enable SELinux support], | 3156 | [ --with-selinux Enable SELinux support], |
3159 | [ if test "x$withval" != "xno" ; then | 3157 | [ if test "x$withval" != "xno" ; then |
3158 | save_LIBS="$LIBS" | ||
3160 | AC_DEFINE(WITH_SELINUX,1,[Define if you want SELinux support.]) | 3159 | AC_DEFINE(WITH_SELINUX,1,[Define if you want SELinux support.]) |
3161 | SELINUX_MSG="yes" | 3160 | SELINUX_MSG="yes" |
3162 | AC_CHECK_HEADER([selinux/selinux.h], , | 3161 | AC_CHECK_HEADER([selinux/selinux.h], , |
3163 | AC_MSG_ERROR(SELinux support requires selinux.h header)) | 3162 | AC_MSG_ERROR(SELinux support requires selinux.h header)) |
3164 | AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ], | 3163 | AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ], |
3165 | AC_MSG_ERROR(SELinux support requires libselinux library)) | 3164 | AC_MSG_ERROR(SELinux support requires libselinux library)) |
3166 | save_LIBS="$LIBS" | 3165 | SSHDLIBS="$SSHDLIBS $LIBSELINUX" |
3167 | LIBS="$LIBS $LIBSELINUX" | ||
3168 | AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) | 3166 | AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) |
3169 | LIBS="$save_LIBS" | 3167 | LIBS="$save_LIBS" |
3170 | fi ] | 3168 | fi ] |
3171 | ) | 3169 | ) |
3172 | AC_SUBST(LIBSELINUX) | ||
3173 | 3170 | ||
3174 | # Check whether user wants Kerberos 5 support | 3171 | # Check whether user wants Kerberos 5 support |
3175 | KRB5_MSG="no" | 3172 | KRB5_MSG="no" |
@@ -4005,7 +4002,10 @@ echo " Compiler: ${CC}" | |||
4005 | echo " Compiler flags: ${CFLAGS}" | 4002 | echo " Compiler flags: ${CFLAGS}" |
4006 | echo "Preprocessor flags: ${CPPFLAGS}" | 4003 | echo "Preprocessor flags: ${CPPFLAGS}" |
4007 | echo " Linker flags: ${LDFLAGS}" | 4004 | echo " Linker flags: ${LDFLAGS}" |
4008 | echo " Libraries: ${LIBWRAP} ${LIBPAM} ${LIBS}" | 4005 | echo " Libraries: ${LIBS}" |
4006 | if test ! -z "${SSHDLIBS}"; then | ||
4007 | echo " +for sshd: ${SSHDLIBS}" | ||
4008 | fi | ||
4009 | 4009 | ||
4010 | echo "" | 4010 | echo "" |
4011 | 4011 | ||