aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-08-02 10:55:33 +0800
committerDan Winship <danw@src.gnome.org>2000-08-02 10:55:33 +0800
commitfad59bb3a344526f343b8e28a8d28059e81a42a9 (patch)
treede2d7d8908ced77164386c1652028dabd77a49c5
parent4e5b1da82e7ada3667bfa47471defd5932afc405 (diff)
downloadgsoc2013-evolution-fad59bb3a344526f343b8e28a8d28059e81a42a9.tar
gsoc2013-evolution-fad59bb3a344526f343b8e28a8d28059e81a42a9.tar.gz
gsoc2013-evolution-fad59bb3a344526f343b8e28a8d28059e81a42a9.tar.bz2
gsoc2013-evolution-fad59bb3a344526f343b8e28a8d28059e81a42a9.tar.lz
gsoc2013-evolution-fad59bb3a344526f343b8e28a8d28059e81a42a9.tar.xz
gsoc2013-evolution-fad59bb3a344526f343b8e28a8d28059e81a42a9.tar.zst
gsoc2013-evolution-fad59bb3a344526f343b8e28a8d28059e81a42a9.zip
Add checks for GPG, PGP 5 and PGP 2. Only record the first one found.
* configure.in, acconfig.c: Add checks for GPG, PGP 5 and PGP 2. Only record the first one found. svn path=/trunk/; revision=4465
-rw-r--r--ChangeLog5
-rw-r--r--acconfig.h4
-rw-r--r--configure.in22
3 files changed, 30 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f1e39ca41f..33f847e619 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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