diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | acconfig.h | 4 | ||||
| -rw-r--r-- | configure.in | 22 |
3 files changed, 30 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2000-08-01 Dan Winship <danw@helixcode.com> + + * configure.in, acconfig.h: Add checks for GPG, PGP 5 and PGP 2. + Only record the first one found. + 2000-08-01 Damon Chaplin <damon@helixcode.com> * configure.in (AC_OUTPUT): removed calendar/doc/* diff --git a/acconfig.h b/acconfig.h index ef8526ea5d..70c43a6dfb 100644 --- a/acconfig.h +++ b/acconfig.h @@ -19,6 +19,10 @@ #undef USE_BROKEN_THREADS #undef BONOBO_POST_0_15 #undef MOVEMAIL_PATH +#undef PGP_PROGRAM +#undef GPG_PATH +#undef PGP5_PATH +#undef PGP_PATH /* Define this if you want to build against the development gtk */ #undef HAVE_DEVGTK diff --git a/configure.in b/configure.in index 8a3fc77018..a428c67173 100644 --- a/configure.in +++ b/configure.in @@ -530,7 +530,27 @@ else ;; esac fi - + +dnl ********** +dnl GPGPGPGPGP +dnl ********** +AC_PATH_PROG(GPG, gpg) +if test -n "$GPG"; then + AC_DEFINE_UNQUOTED(GPG_PATH, "$GPG") + AC_DEFINE(PGP_PROGRAM, "GPG") +else + AC_PATH_PROG(PGP5, pgp5) + if test -n "$PGP5"; then + AC_DEFINE_UNQUOTED(PGP5_PATH, "$PGP5") + AC_DEFINE(PGP_PROGRAM, "PGP") + else + AC_PATH_PROG(PGP, pgp) + if test -n "$PGP"; then + AC_DEFINE_UNQUOTED(PGP_PATH, "$PGP") + AC_DEFINE(PGP_PROGRAM, "PGP") + fi + fi +fi dnl ****************************** dnl Makefiles |