mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-03 12:11:33 +01:00
* README: Document --disable-exec, --disable-photo-viewers,
--disable-keyserver-helpers, --enable-exec-path, and --with-photo-viewer. * configure.ac: Add --with-photo-viewer to lock the viewer at compile time and --disable-keyserver-helpers and --disable-photo-viewers to allow disabling one without disabling the other.
This commit is contained in:
David Shaw
parent
f48b2851f6
commit
107e4a3f58
@ -1,3 +1,12 @@
|
|||||||
|
2002-07-04 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
|
* README:
|
||||||
|
|
||||||
|
* configure.ac: Add --with-photo-viewer to lock the viewer at
|
||||||
|
compile time and --disable-keyserver-helpers and
|
||||||
|
--disable-photo-viewers to allow disabling one without disabling
|
||||||
|
the other.
|
||||||
|
|
||||||
2002-07-03 David Shaw <dshaw@jabberwocky.com>
|
2002-07-03 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
* configure.ac: Allow setting USE_EXEC_PATH to lock the exec-path
|
* configure.ac: Allow setting USE_EXEC_PATH to lock the exec-path
|
||||||
|
|||||||
23
README
23
README
@ -507,6 +507,29 @@
|
|||||||
Do not use assembler modules. It is not possible
|
Do not use assembler modules. It is not possible
|
||||||
to use this on some CPU types.
|
to use this on some CPU types.
|
||||||
|
|
||||||
|
--disable-exec
|
||||||
|
Disable all remote program execution. This
|
||||||
|
disables photo ID viewing as well as all keyserver
|
||||||
|
types aside from HKP.
|
||||||
|
|
||||||
|
--disable-photo-viewers
|
||||||
|
Disable only photo ID viewing.
|
||||||
|
|
||||||
|
--disable-keyserver-helpers
|
||||||
|
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.
|
||||||
|
|
||||||
|
--with-photo-viewer=FIXED_VIEWER
|
||||||
|
Force the photo viewer to be FIXED_VIEWER and
|
||||||
|
disable any ability for the user to change it in
|
||||||
|
their options file.
|
||||||
|
|
||||||
|
|
||||||
Installation Problems
|
Installation Problems
|
||||||
---------------------
|
---------------------
|
||||||
|
|||||||
94
configure.ac
94
configure.ac
@ -122,48 +122,80 @@ fi
|
|||||||
|
|
||||||
AC_MSG_CHECKING([whether to enable external program execution])
|
AC_MSG_CHECKING([whether to enable external program execution])
|
||||||
AC_ARG_ENABLE(exec,
|
AC_ARG_ENABLE(exec,
|
||||||
[ --disable-exec disable external program execution],
|
[ --disable-exec disable all external program execution],
|
||||||
use_exec=$enableval, use_exec=yes)
|
use_exec=$enableval, use_exec=yes)
|
||||||
AC_MSG_RESULT($use_exec)
|
AC_MSG_RESULT($use_exec)
|
||||||
if test "$use_exec" = no ; then
|
if test "$use_exec" = no ; then
|
||||||
AC_DEFINE(NO_EXEC,1,[Define to disable external program execution])
|
AC_DEFINE(NO_EXEC,1,[Define to disable all external program execution])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$use_exec" = yes ; then
|
if test "$use_exec" = yes ; then
|
||||||
AC_MSG_CHECKING([for a restricted exec-path])
|
AC_MSG_CHECKING([whether to use a restricted exec-path])
|
||||||
AC_ARG_WITH(exec-path,
|
AC_ARG_ENABLE(exec-path,
|
||||||
[ --with-exec-path=PATH restrict exec-path to PATH],
|
[ --enable-exec-path=PATH restrict exec-path to PATH],
|
||||||
[if test "$withval" = yes ; then
|
[if test "$enableval" = yes ; then
|
||||||
withval=no
|
enableval=no
|
||||||
else
|
else
|
||||||
AC_DEFINE_UNQUOTED(USE_EXEC_PATH,"$withval",
|
AC_DEFINE_UNQUOTED(USE_EXEC_PATH,"$enableval",
|
||||||
[restrict exec-path to this])
|
[if set, restrict exec-path to this value])
|
||||||
fi],withval=no)
|
fi],enableval=no)
|
||||||
AC_MSG_RESULT($withval)
|
AC_MSG_RESULT($enableval)
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether LDAP keyserver support is requested])
|
AC_MSG_CHECKING([whether to enable photo ID viewing])
|
||||||
AC_ARG_ENABLE(ldap,
|
AC_ARG_ENABLE(photo-viewers,
|
||||||
[ --disable-ldap disable LDAP keyserver interface],
|
[ --disable-photo-viewers disable photo ID viewers],
|
||||||
try_ldap=$enableval, try_ldap=yes)
|
[if test "$enableval" = no ; then
|
||||||
AC_MSG_RESULT($try_ldap)
|
AC_DEFINE(DISABLE_PHOTO_VIEWER,1,[define to disable photo viewing])
|
||||||
|
fi],enableval=yes)
|
||||||
|
gnupg_cv_enable_photo_viewers=$enableval
|
||||||
|
AC_MSG_RESULT($enableval)
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether experimental external hkp keyserver support is requested])
|
if test "$gnupg_cv_enable_photo_viewers" = yes ; then
|
||||||
AC_ARG_ENABLE(external-hkp,
|
AC_MSG_CHECKING([whether to use a fixed photo ID viewer])
|
||||||
[ --enable-external-hkp enable experimental external HKP keyserver interface],
|
AC_ARG_WITH(photo-viewer,
|
||||||
try_hkp=$enableval, try_hkp=no)
|
[ --with-photo-viewer=FIXED_VIEWER set a fixed photo ID viewer],
|
||||||
AC_MSG_RESULT($try_hkp)
|
[if test "$withval" != yes ; then
|
||||||
|
AC_DEFINE_UNQUOTED(FIXED_PHOTO_VIEWER,"$withval",
|
||||||
if test "$try_hkp" = yes ; then
|
[if set, restrict photo-viewer to this])
|
||||||
GPGKEYS_HKP="gpgkeys_hkp"
|
fi],withval=no)
|
||||||
AC_DEFINE(USE_EXTERNAL_HKP,1,[define to use the experimental external HKP keyserver interface])
|
AC_MSG_RESULT($withval)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether email keyserver support is requested])
|
AC_MSG_CHECKING([whether to enable external keyserver helpers])
|
||||||
AC_ARG_ENABLE(mailto,
|
AC_ARG_ENABLE(keyserver-helpers,
|
||||||
[ --disable-mailto disable email keyserver interface],
|
[ --disable-keyserver-helpers disable all external keyserver support],
|
||||||
try_mailto=$enableval, try_mailto=yes)
|
[if test "$enableval" = no ; then
|
||||||
AC_MSG_RESULT($try_mailto)
|
AC_DEFINE(DISABLE_KEYSERVER_HELPERS,1,
|
||||||
fi
|
[define to disable keyserver helpers])
|
||||||
|
fi],enableval=yes)
|
||||||
|
gnupg_cv_enable_keyserver_helpers=$enableval
|
||||||
|
AC_MSG_RESULT($enableval)
|
||||||
|
|
||||||
|
if test "$gnupg_cv_enable_keyserver_helpers" = yes ; then
|
||||||
|
AC_MSG_CHECKING([whether LDAP keyserver support is requested])
|
||||||
|
AC_ARG_ENABLE(ldap,
|
||||||
|
[ --disable-ldap disable LDAP keyserver interface],
|
||||||
|
try_ldap=$enableval, try_ldap=yes)
|
||||||
|
AC_MSG_RESULT($try_ldap)
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([whether experimental external hkp keyserver support is requested])
|
||||||
|
AC_ARG_ENABLE(external-hkp,
|
||||||
|
[ --enable-external-hkp enable experimental external HKP keyserver interface],
|
||||||
|
try_hkp=$enableval, try_hkp=no)
|
||||||
|
AC_MSG_RESULT($try_hkp)
|
||||||
|
|
||||||
|
if test "$try_hkp" = yes ; then
|
||||||
|
GPGKEYS_HKP="gpgkeys_hkp"
|
||||||
|
AC_DEFINE(USE_EXTERNAL_HKP,1,[define to use the experimental external HKP keyserver interface])
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([whether email keyserver support is requested])
|
||||||
|
AC_ARG_ENABLE(mailto,
|
||||||
|
[ --disable-mailto disable email keyserver interface],
|
||||||
|
try_mailto=$enableval, try_mailto=yes)
|
||||||
|
AC_MSG_RESULT($try_mailto)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether included zlib is requested])
|
AC_MSG_CHECKING([whether included zlib is requested])
|
||||||
AC_ARG_WITH(included-zlib,
|
AC_ARG_WITH(included-zlib,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user