diff options
| author | David Shaw <dshaw@jabberwocky.com> | 2002-07-30 18:04:18 +0200 |
|---|---|---|
| committer | David Shaw <dshaw@jabberwocky.com> | 2002-07-30 18:04:18 +0200 |
| commit | 1f703dadd1b5830c6fa9bd036d08a2aab1985287 (patch) | |
| tree | d8acbb0ea081beb8b249480518c11f7f100b3251 | |
| parent | * NEWS: changes since 1.1.90. (diff) | |
| download | gnupg2-1f703dadd1b5830c6fa9bd036d08a2aab1985287.tar.xz gnupg2-1f703dadd1b5830c6fa9bd036d08a2aab1985287.zip | |
* README, configure.ac: --with-exec-path is now clarified into
--disable-keyserver-path
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | README | 9 | ||||
| -rw-r--r-- | configure.ac | 19 |
3 files changed, 15 insertions, 16 deletions
@@ -1,5 +1,8 @@ 2002-07-30 David Shaw <dshaw@jabberwocky.com> + * README, configure.ac: --with-exec-path is now clarified into + --disable-keyserver-path + * NEWS: changes since 1.1.90. 2002-07-24 David Shaw <dshaw@jabberwocky.com> @@ -519,11 +519,10 @@ Disable only keyserver helpers (not including HKP). - --enable-exec-path=PATH - Force the exec search path to be set to PATH. - Note that this only really applies to keyserver - helpers as the photo-viewer can include its own - path. + --disable-keyserver-path + Disables the user's ability to use the exec-path + feature to add additional search directories when + executing a keyserver helper. --with-photo-viewer=FIXED_VIEWER Force the photo viewer to be FIXED_VIEWER and diff --git a/configure.ac b/configure.ac index 4f076b3a3..0918e2782 100644 --- a/configure.ac +++ b/configure.ac @@ -130,17 +130,6 @@ if test "$use_exec" = no ; then fi if test "$use_exec" = yes ; then - AC_MSG_CHECKING([whether to use a restricted exec-path]) - 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],withval=no) - AC_MSG_RESULT($withval) - AC_MSG_CHECKING([whether to enable photo ID viewing]) AC_ARG_ENABLE(photo-viewers, [ --disable-photo-viewers disable photo ID viewers], @@ -197,6 +186,14 @@ if test "$use_exec" = yes ; then try_mailto=$enableval, try_mailto=yes) AC_MSG_RESULT($try_mailto) fi + + AC_MSG_CHECKING([whether to disable keyserver exec-path]) + AC_ARG_ENABLE(keyserver-path, + [ --disable-keyserver-path disable the exec-path option for keyserver helpers], + [if test "$enableval" = no ; then + AC_DEFINE(DISABLE_KEYSERVER_PATH,1,[define to disable exec-path for keyserver helpers]) + fi],enableval=yes) + AC_MSG_RESULT($enableval) fi AC_MSG_CHECKING([whether included zlib is requested]) |