diff options
author | Tim Rice <tim@multitalents.net> | 2005-03-17 16:44:25 -0800 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2005-03-17 16:44:25 -0800 |
commit | 35cc69dcb49394f8ce5950e42adc90866901256d (patch) | |
tree | 2485cc380c738307e41529fdb792fb2d90e64b25 | |
parent | 8bb561b5009dec1a763b6978aebbb26323982219 (diff) |
- (tim) [configure.ac] make some configure options a little more error proof.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | configure.ac | 36 |
2 files changed, 25 insertions, 14 deletions
@@ -3,6 +3,7 @@ | |||
3 | Make --without-opensc work. | 3 | Make --without-opensc work. |
4 | - (tim) [configure.ac] portability changes on test statements. Some shells | 4 | - (tim) [configure.ac] portability changes on test statements. Some shells |
5 | have problems with -a operator. | 5 | have problems with -a operator. |
6 | - (tim) [configure.ac] make some configure options a little more error proof. | ||
6 | 7 | ||
7 | 20050314 | 8 | 20050314 |
8 | - (dtucker) OpenBSD CVS Sync | 9 | - (dtucker) OpenBSD CVS Sync |
@@ -2370,4 +2371,4 @@ | |||
2370 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2371 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2371 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2372 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2372 | 2373 | ||
2373 | $Id: ChangeLog,v 1.3722 2005/03/18 00:23:19 tim Exp $ | 2374 | $Id: ChangeLog,v 1.3723 2005/03/18 00:44:25 tim Exp $ |
diff --git a/configure.ac b/configure.ac index ca41ecc77..b3f7b5f22 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.252 2005/03/18 00:23:19 tim Exp $ | 1 | # $Id: configure.ac,v 1.253 2005/03/18 00:44:26 tim Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -472,7 +472,8 @@ esac | |||
472 | AC_ARG_WITH(cflags, | 472 | AC_ARG_WITH(cflags, |
473 | [ --with-cflags Specify additional flags to pass to compiler], | 473 | [ --with-cflags Specify additional flags to pass to compiler], |
474 | [ | 474 | [ |
475 | if test "x$withval" != "xno" ; then | 475 | if test -n "$withval" && test "x$withval" != "xno" && \ |
476 | test "x${withval}" != "xyes"; then | ||
476 | CFLAGS="$CFLAGS $withval" | 477 | CFLAGS="$CFLAGS $withval" |
477 | fi | 478 | fi |
478 | ] | 479 | ] |
@@ -480,7 +481,8 @@ AC_ARG_WITH(cflags, | |||
480 | AC_ARG_WITH(cppflags, | 481 | AC_ARG_WITH(cppflags, |
481 | [ --with-cppflags Specify additional flags to pass to preprocessor] , | 482 | [ --with-cppflags Specify additional flags to pass to preprocessor] , |
482 | [ | 483 | [ |
483 | if test "x$withval" != "xno"; then | 484 | if test -n "$withval" && test "x$withval" != "xno" && \ |
485 | test "x${withval}" != "xyes"; then | ||
484 | CPPFLAGS="$CPPFLAGS $withval" | 486 | CPPFLAGS="$CPPFLAGS $withval" |
485 | fi | 487 | fi |
486 | ] | 488 | ] |
@@ -488,7 +490,8 @@ AC_ARG_WITH(cppflags, | |||
488 | AC_ARG_WITH(ldflags, | 490 | AC_ARG_WITH(ldflags, |
489 | [ --with-ldflags Specify additional flags to pass to linker], | 491 | [ --with-ldflags Specify additional flags to pass to linker], |
490 | [ | 492 | [ |
491 | if test "x$withval" != "xno" ; then | 493 | if test -n "$withval" && test "x$withval" != "xno" && \ |
494 | test "x${withval}" != "xyes"; then | ||
492 | LDFLAGS="$LDFLAGS $withval" | 495 | LDFLAGS="$LDFLAGS $withval" |
493 | fi | 496 | fi |
494 | ] | 497 | ] |
@@ -496,7 +499,8 @@ AC_ARG_WITH(ldflags, | |||
496 | AC_ARG_WITH(libs, | 499 | AC_ARG_WITH(libs, |
497 | [ --with-libs Specify additional libraries to link with], | 500 | [ --with-libs Specify additional libraries to link with], |
498 | [ | 501 | [ |
499 | if test "x$withval" != "xno" ; then | 502 | if test -n "$withval" && test "x$withval" != "xno" && \ |
503 | test "x${withval}" != "xyes"; then | ||
500 | LIBS="$LIBS $withval" | 504 | LIBS="$LIBS $withval" |
501 | fi | 505 | fi |
502 | ] | 506 | ] |
@@ -795,7 +799,7 @@ AC_ARG_WITH(tcp-wrappers, | |||
795 | saved_LDFLAGS="$LDFLAGS" | 799 | saved_LDFLAGS="$LDFLAGS" |
796 | saved_CPPFLAGS="$CPPFLAGS" | 800 | saved_CPPFLAGS="$CPPFLAGS" |
797 | if test -n "${withval}" && \ | 801 | if test -n "${withval}" && \ |
798 | test "${withval}" != "yes"; then | 802 | test "x${withval}" != "xyes"; then |
799 | if test -d "${withval}/lib"; then | 803 | if test -d "${withval}/lib"; then |
800 | if test -n "${need_dash_r}"; then | 804 | if test -n "${need_dash_r}"; then |
801 | LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" | 805 | LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" |
@@ -1585,7 +1589,8 @@ entropy_timeout=200 | |||
1585 | AC_ARG_WITH(entropy-timeout, | 1589 | AC_ARG_WITH(entropy-timeout, |
1586 | [ --with-entropy-timeout Specify entropy gathering command timeout (msec)], | 1590 | [ --with-entropy-timeout Specify entropy gathering command timeout (msec)], |
1587 | [ | 1591 | [ |
1588 | if test "x$withval" != "xno" ; then | 1592 | if test -n "$withval" && test "x$withval" != "xno" && \ |
1593 | test "x${withval}" != "xyes"; then | ||
1589 | entropy_timeout=$withval | 1594 | entropy_timeout=$withval |
1590 | fi | 1595 | fi |
1591 | ] | 1596 | ] |
@@ -1596,7 +1601,8 @@ SSH_PRIVSEP_USER=sshd | |||
1596 | AC_ARG_WITH(privsep-user, | 1601 | AC_ARG_WITH(privsep-user, |
1597 | [ --with-privsep-user=user Specify non-privileged user for privilege separation], | 1602 | [ --with-privsep-user=user Specify non-privileged user for privilege separation], |
1598 | [ | 1603 | [ |
1599 | if test -n "$withval"; then | 1604 | if test -n "$withval" && test "x$withval" != "xno" && \ |
1605 | test "x${withval}" != "xyes"; then | ||
1600 | SSH_PRIVSEP_USER=$withval | 1606 | SSH_PRIVSEP_USER=$withval |
1601 | fi | 1607 | fi |
1602 | ] | 1608 | ] |
@@ -2490,7 +2496,8 @@ PRIVSEP_PATH=/var/empty | |||
2490 | AC_ARG_WITH(privsep-path, | 2496 | AC_ARG_WITH(privsep-path, |
2491 | [ --with-privsep-path=xxx Path for privilege separation chroot (default=/var/empty)], | 2497 | [ --with-privsep-path=xxx Path for privilege separation chroot (default=/var/empty)], |
2492 | [ | 2498 | [ |
2493 | if test "x$withval" != "$no" ; then | 2499 | if test -n "$withval" && test "x$withval" != "xno" && \ |
2500 | test "x${withval}" != "xyes"; then | ||
2494 | PRIVSEP_PATH=$withval | 2501 | PRIVSEP_PATH=$withval |
2495 | fi | 2502 | fi |
2496 | ] | 2503 | ] |
@@ -2500,7 +2507,8 @@ AC_SUBST(PRIVSEP_PATH) | |||
2500 | AC_ARG_WITH(xauth, | 2507 | AC_ARG_WITH(xauth, |
2501 | [ --with-xauth=PATH Specify path to xauth program ], | 2508 | [ --with-xauth=PATH Specify path to xauth program ], |
2502 | [ | 2509 | [ |
2503 | if test "x$withval" != "xno" ; then | 2510 | if test -n "$withval" && test "x$withval" != "xno" && \ |
2511 | test "x${withval}" != "xyes"; then | ||
2504 | xauth_path=$withval | 2512 | xauth_path=$withval |
2505 | fi | 2513 | fi |
2506 | ], | 2514 | ], |
@@ -2781,7 +2789,8 @@ fi | |||
2781 | AC_ARG_WITH(superuser-path, | 2789 | AC_ARG_WITH(superuser-path, |
2782 | [ --with-superuser-path= Specify different path for super-user], | 2790 | [ --with-superuser-path= Specify different path for super-user], |
2783 | [ | 2791 | [ |
2784 | if test "x$withval" != "xno" ; then | 2792 | if test -n "$withval" && test "x$withval" != "xno" && \ |
2793 | test "x${withval}" != "xyes"; then | ||
2785 | AC_DEFINE_UNQUOTED(SUPERUSER_PATH, "$withval") | 2794 | AC_DEFINE_UNQUOTED(SUPERUSER_PATH, "$withval") |
2786 | superuser_path=$withval | 2795 | superuser_path=$withval |
2787 | fi | 2796 | fi |
@@ -2837,7 +2846,8 @@ fi | |||
2837 | AC_ARG_WITH(pid-dir, | 2846 | AC_ARG_WITH(pid-dir, |
2838 | [ --with-pid-dir=PATH Specify location of ssh.pid file], | 2847 | [ --with-pid-dir=PATH Specify location of ssh.pid file], |
2839 | [ | 2848 | [ |
2840 | if test "x$withval" != "xno" ; then | 2849 | if test -n "$withval" && test "x$withval" != "xno" && \ |
2850 | test "x${withval}" != "xyes"; then | ||
2841 | piddir=$withval | 2851 | piddir=$withval |
2842 | if test ! -d $piddir ; then | 2852 | if test ! -d $piddir ; then |
2843 | AC_MSG_WARN([** no $piddir directory on this system **]) | 2853 | AC_MSG_WARN([** no $piddir directory on this system **]) |
@@ -2919,7 +2929,7 @@ AC_ARG_WITH(lastlog, | |||
2919 | [ | 2929 | [ |
2920 | if test "x$withval" = "xno" ; then | 2930 | if test "x$withval" = "xno" ; then |
2921 | AC_DEFINE(DISABLE_LASTLOG) | 2931 | AC_DEFINE(DISABLE_LASTLOG) |
2922 | else | 2932 | elif test -n "$withval" && test "x${withval}" != "xyes"; then |
2923 | conf_lastlog_location=$withval | 2933 | conf_lastlog_location=$withval |
2924 | fi | 2934 | fi |
2925 | ] | 2935 | ] |