diff options
| author | David Shaw <[email protected]> | 2002-07-04 14:37:40 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-07-04 14:37:40 +0000 |
| commit | 5d74fb31d873df9fdbba918334bcacd7790b26ae (patch) | |
| tree | 90d6d89cf71ba1c2857f7fe6b43d42faa47b9c96 | |
| parent | * gpgkeys_ldap.c (get_key), gpgkeys_hkp.c (get_key): Display keyserver URI (diff) | |
| download | gnupg-5d74fb31d873df9fdbba918334bcacd7790b26ae.tar.gz gnupg-5d74fb31d873df9fdbba918334bcacd7790b26ae.zip | |
* configure.ac: --enable-exec-path should be a 'with'. Fix 'no' cases of
--with-exec-path and --with-photo-viewer.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 20 |
2 files changed, 14 insertions, 9 deletions
@@ -1,5 +1,8 @@ 2002-07-04 David Shaw <[email protected]> + * configure.ac: --enable-exec-path should be a 'with'. Fix 'no' + cases of --with-exec-path and --with-photo-viewer. + * README: Document --disable-exec, --disable-photo-viewers, --disable-keyserver-helpers, --enable-exec-path, and --with-photo-viewer. diff --git a/configure.ac b/configure.ac index d8631d3a2..7551e5002 100644 --- a/configure.ac +++ b/configure.ac @@ -131,15 +131,15 @@ fi if test "$use_exec" = yes ; then AC_MSG_CHECKING([whether to use a restricted exec-path]) - AC_ARG_ENABLE(exec-path, - [ --enable-exec-path=PATH restrict exec-path to PATH], - [if test "$enableval" = yes ; then - enableval=no - else - AC_DEFINE_UNQUOTED(USE_EXEC_PATH,"$enableval", + AC_ARG_WITH(exec-path, + [ --with-exec-path=PATH restrict exec-path to PATH], + [if test "$withval" = yes ; then + withval=no + elif test "$withval" != no ; then + AC_DEFINE_UNQUOTED(FIXED_EXEC_PATH,"$withval", [if set, restrict exec-path to this value]) - fi],enableval=no) - AC_MSG_RESULT($enableval) + fi],withval=no) + AC_MSG_RESULT($withval) AC_MSG_CHECKING([whether to enable photo ID viewing]) AC_ARG_ENABLE(photo-viewers, @@ -154,7 +154,9 @@ if test "$use_exec" = yes ; then AC_MSG_CHECKING([whether to use a fixed photo ID viewer]) AC_ARG_WITH(photo-viewer, [ --with-photo-viewer=FIXED_VIEWER set a fixed photo ID viewer], - [if test "$withval" != yes ; then + [if test "$withval" = yes ; then + withval=no + elif test "$withval" != no ; then AC_DEFINE_UNQUOTED(FIXED_PHOTO_VIEWER,"$withval", [if set, restrict photo-viewer to this]) fi],withval=no) |