]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
add a --with-login-program configure argument
authorDamien Miller <djm@mindrot.org>
Tue, 16 Aug 2016 04:47:34 +0000 (14:47 +1000)
committerDamien Miller <djm@mindrot.org>
Tue, 16 Aug 2016 04:47:34 +0000 (14:47 +1000)
Saves messing around with LOGIN_PROGRAM env var, which come
packaging environments make hard to do during configure phase.

configure.ac

index 1f1941a15185a344e953f9b49870de7421118fdd..959826fe9dd17f85fdb70186bca510e96bb887c3 100644 (file)
@@ -80,15 +80,27 @@ if test -z "$AR" ; then
 fi
 
 # Use LOGIN_PROGRAM from environment if possible
-if test ! -z "$LOGIN_PROGRAM" ; then
-       AC_DEFINE_UNQUOTED([LOGIN_PROGRAM_FALLBACK], ["$LOGIN_PROGRAM"],
-               [If your header files don't define LOGIN_PROGRAM,
-               then use this (detected) from environment and PATH])
+login_program=$LOGIN_PROGRAM
+# Allow override on command-line
+AC_ARG_WITH([login-program],
+       [  --with-login-program=path Specify login program name ],
+       [
+               if test "x$withval" != "xno" && \
+                  test "x$withval" != "xyes" ; then
+                       login_program=$withval
+               fi
+       ]
+)
+# If no login_program specified then find one using the path.
+if test ! -z "$login_program" ; then
+       AC_DEFINE_UNQUOTED([LOGIN_PROGRAM_FALLBACK], ["$login_program"],
+               [login program to use if system headers lack LOGIN_PROGRAM])
 else
        # Search for login
        AC_PATH_PROG([LOGIN_PROGRAM_FALLBACK], [login])
        if test ! -z "$LOGIN_PROGRAM_FALLBACK" ; then
-               AC_DEFINE_UNQUOTED([LOGIN_PROGRAM_FALLBACK], ["$LOGIN_PROGRAM_FALLBACK"])
+               AC_DEFINE_UNQUOTED([LOGIN_PROGRAM_FALLBACK],
+                                  ["$LOGIN_PROGRAM_FALLBACK"])
        fi
 fi