3 files changed, 20 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index a9c1d03ba..7b23fc332 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20070325
+ - (dtucker) [Makefile.in configure.ac] Replace single-purpose LIBSELINUX,
+   LIBWRAP and LIBPAM variables in Makefile with the general-purpose
+   SSHDLIBS.  "I like" djm@
+
 20070321
  - (dtucker) OpenBSD CVS Sync
    - dtucker@cvs.openbsd.org 2007/03/09 05:20:06
@@ -2863,4 +2868,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4647 2007/03/21 10:45:48 dtucker Exp $
+$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 @@
-# $Id: Makefile.in,v 1.283 2006/10/23 21:44:47 tim Exp $
+# $Id: Makefile.in,v 1.284 2007/03/25 08:26:01 dtucker Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -44,11 +44,8 @@ LD=@LD@
 CFLAGS=@CFLAGS@
 CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
 LIBS=@LIBS@
-LIBSELINUX=@LIBSELINUX@
 SSHDLIBS=@SSHDLIBS@
 LIBEDIT=@LIBEDIT@
-LIBPAM=@LIBPAM@
-LIBWRAP=@LIBWRAP@
 AR=@AR@
 AWK=@AWK@
 RANLIB=@RANLIB@
@@ -139,7 +136,7 @@ ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
         $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
 sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
-        $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBSELINUX) $(SSHDLIBS) $(LIBS)
+        $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS)
 
 scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
         $(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 @@
-# $Id: configure.ac,v 1.373 2007/03/21 10:39:57 dtucker Exp $
+# $Id: configure.ac,v 1.374 2007/03/25 08:26:01 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.373 $)
+AC_REVISION($Revision: 1.374 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -1109,8 +1109,7 @@ AC_ARG_WITH(tcp-wrappers,
                                         CPPFLAGS="-I${withval} ${CPPFLAGS}"
                                 fi
                         fi
-                        LIBWRAP="-lwrap"
-                        LIBS="$LIBWRAP $LIBS"
+                        LIBS="-lwrap $LIBS"
                         AC_MSG_CHECKING(for libwrap)
                         AC_TRY_LINK(
                                 [
@@ -1126,7 +1125,7 @@ AC_ARG_WITH(tcp-wrappers,
                                         AC_DEFINE(LIBWRAP, 1,
                                                 [Define if you want
                                                 TCP Wrappers support])
-                                        AC_SUBST(LIBWRAP)
+                                        SSHDLIBS="$SSHDLIBS -lwrap"
                                         TCPW_MSG="yes"
                                 ],
                                 [
@@ -2028,7 +2027,7 @@ AC_ARG_WITH(pam,
 
                         PAM_MSG="yes"
 
-                        LIBPAM="-lpam"
+                        SSHDLIBS="$SSHDLIBS -lpam"
                         AC_DEFINE(USE_PAM, 1,
                                 [Define if you want to enable PAM support])
 
@@ -2038,11 +2037,10 @@ AC_ARG_WITH(pam,
                                         # libdl already in LIBS
                                         ;;
                                 *)
-                                        LIBPAM="$LIBPAM -ldl"
+                                        SSHDLIBS="$SSHDLIBS -ldl"
                                         ;;
                                 esac
                         fi
-                        AC_SUBST(LIBPAM)
                 fi
         ]
 )
@@ -3157,19 +3155,18 @@ LIBSELINUX=""
 AC_ARG_WITH(selinux,
         [  --with-selinux   Enable SELinux support],
         [ if test "x$withval" != "xno" ; then
+                save_LIBS="$LIBS"
                 AC_DEFINE(WITH_SELINUX,1,[Define if you want SELinux support.])
                 SELINUX_MSG="yes"
                 AC_CHECK_HEADER([selinux/selinux.h], ,
                     AC_MSG_ERROR(SELinux support requires selinux.h header))
                 AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ],
                     AC_MSG_ERROR(SELinux support requires libselinux library))
-                save_LIBS="$LIBS"
-                LIBS="$LIBS $LIBSELINUX"
+                SSHDLIBS="$SSHDLIBS $LIBSELINUX"
                 AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level)
                 LIBS="$save_LIBS"
         fi ]
 )
-AC_SUBST(LIBSELINUX)
 
 # Check whether user wants Kerberos 5 support
 KRB5_MSG="no"
@@ -4005,7 +4002,10 @@ echo "          Compiler: ${CC}"
 echo "    Compiler flags: ${CFLAGS}"
 echo "Preprocessor flags: ${CPPFLAGS}"
 echo "      Linker flags: ${LDFLAGS}"
-echo "         Libraries: ${LIBWRAP} ${LIBPAM} ${LIBS}"
+echo "         Libraries: ${LIBS}"
+if test ! -z "${SSHDLIBS}"; then
+echo "         +for sshd: ${SSHDLIBS}"
+fi
 
 echo ""