From b10beb347238b153af8aa544fb276485b34e970e Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@stanford.edu>
Date: Sat, 5 Jan 2008 00:01:54 +0000
Subject: The wallet client can now get the server, port, principal, and remctl
 type from krb5.conf as well as from compile-time defaults and command-line
 options.

---
 configure.ac | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index dd4b502..cef61eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,18 +29,16 @@ AC_CHECK_FUNCS([setrlimit])
 AC_REPLACE_FUNCS([asprintf])
 
 AC_ARG_WITH([wallet-server],
-    AC_HELP_STRING([--with-wallet-server=HOST], [Default wallet server]),
-    [if test x"$withval" != xno ; then
-        AC_DEFINE_UNQUOTED([WALLET_SERVER], ["$withval"],
-            [Define to the default server host name.])
-     fi])
+    [AC_HELP_STRING([--with-wallet-server=HOST], [Default wallet server])],
+    [AS_IF([test x"$withval" != xno && test x"$withval" != xyes],
+        [AC_DEFINE_UNQUOTED([WALLET_SERVER], ["$withval"],
+            [Define to the default server host name.])])])
 AC_ARG_WITH([wallet-port],
-    AC_HELP_STRING([--with-wallet-port=PORT],
-        [Default wallet server port]),
-    [if test x"$withval" != xno ; then
-        AC_DEFINE_UNQUOTED([WALLET_PORT], [$withval],
-            [Define to the default server port.])
-     fi])
+    [AC_HELP_STRING([--with-wallet-port=PORT],
+        [Default wallet server port])],
+    [AS_IF([test x"$withval" != xno && test x"$withval" != xyes],
+        [AC_DEFINE_UNQUOTED([WALLET_PORT], [$withval],
+            [Define to the default server port.])])])
 
 RRA_LIB_REMCTL
 RRA_LIB_KRB5
@@ -54,10 +52,9 @@ AM_CONDITIONAL([AFS], [test x"$rra_afs" = xtrue])
 
 AC_ARG_VAR([REMCTLD], [Path to the remctld binary])
 AC_PATH_PROG([REMCTLD], [remctld], , [$PATH:/usr/sbin:/usr/local/sbin])
-if test x"$REMCTLD" != x ; then
-    AC_DEFINE_UNQUOTED([PATH_REMCTLD], ["$REMCTLD"],
-        [Define to the full path to remctld to run remctl tests.])
-fi
+AS_IF([test x"$REMCTLD" != x],
+    [AC_DEFINE_UNQUOTED([PATH_REMCTLD], ["$REMCTLD"],
+        [Define to the full path to remctld to run remctl tests.])])
 
 dnl Needed to get prototypes for functions like asprintf on Linux.
 AC_DEFINE([_GNU_SOURCE], [1], [Define to 1 on Linux to get full prototypes.])
-- 
cgit v1.2.3