diff options
| author |   Michael Kohl <citizen428@gentoo.org> | 2004-10-22 07:21:24 +0000 |
|---|---|---|
| committer | Michael Kohl <citizen428@gentoo.org> | 2004-10-22 07:21:24 +0000 |
| commit | b9498a243fe0170b8ff7f32cb0931bdb7e6fac3c (patch) | |
| tree | 7f7ab2940650a7238f957fba3d134093a3392522 /mail-client | |
| parent | Re-submitting the patch, messed up the first time (diff) | |
| download | historical-b9498a243fe0170b8ff7f32cb0931bdb7e6fac3c.tar.gz historical-b9498a243fe0170b8ff7f32cb0931bdb7e6fac3c.tar.bz2 historical-b9498a243fe0170b8ff7f32cb0931bdb7e6fac3c.zip | |
Fixing bug #68363
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/elmo/Manifest | 7 | ||||
| -rw-r--r-- | mail-client/elmo/files/configure.in.patch | 75 |
2 files changed, 79 insertions, 3 deletions
diff --git a/mail-client/elmo/Manifest b/mail-client/elmo/Manifest index 7d0eb98e2558..4fcd1af3bb4a 100644 --- a/mail-client/elmo/Manifest +++ b/mail-client/elmo/Manifest @@ -15,10 +15,11 @@ MD5 eac6978f5d09308fe2a5363f92aeb520 files/digest-elmo-0.5 118 MD5 87f647529d55e01dcfc9554b3932c1fc files/digest-elmo-0.6 60 MD5 0d662e42a7373a07a363f75e07e1b428 files/digest-elmo-1.3.1-r1 62 MD5 ae516ca333aa45e8df3b9964414f04ff files/digest-elmo-1.3.2-r1 62 +MD5 030a20e67a5eb594c5aa4216043285d0 files/configure.in.patch 1991 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBeLSL/UDVUK2NELYRAsUbAKDPPqOY3xzlTmWozifUvgXfAGkr1ACgvEYJ -v95+TMF0HGLRI0MQiA30AGg= -=3Zup +iD8DBQFBeLUA/UDVUK2NELYRAlS5AJ0eryjE/PZ/LjWUDCJIL/kCP6eTvwCgjrqZ +ZhGG1tle1B52Yv7IOcjmKYw= +=9hoq -----END PGP SIGNATURE----- diff --git a/mail-client/elmo/files/configure.in.patch b/mail-client/elmo/files/configure.in.patch new file mode 100644 index 000000000000..047041ed91a3 --- /dev/null +++ b/mail-client/elmo/files/configure.in.patch @@ -0,0 +1,75 @@ +--- configure.in.orig 2004-09-26 13:18:47.215194296 +0930 ++++ configure.in 2004-09-26 14:25:58.656947352 +0930 +@@ -50,34 +50,25 @@ + dnl GnuPG support + dnl + +-GPGME4="notdefined" +-have_gpgme=no +-AC_CHECK_HEADER(gpgme.h, [ +- AC_DEFINE(HAVE_GPGME_H, 1, [Has gpgme.h]) +- GPGME4="no" +- ]) +- +-AC_CHECK_HEADER(gpgme4/gpgme.h, [ +- AC_DEFINE(HAVE_GPGME4_H, 1, [Has gpgme4/gpgme.h]) +- GPGME4="yes" +- ]) +- +-have_gpgme=no +-if test "$GPGME4" == "no" ; then +- AM_PATH_GPGME([0.4.2], have_gpgme=yes, have_gpgme=no) +- if test "$have_gpgme" = yes; then +- AC_DEFINE(HAVE_GPGME, 1, [Use libgpgme.so]) +- AC_DEFINE([GPG_SUPPORT], [1], [Define to 1 if gpgme library is present.]) +- fi +-else if test "$GPGME4" == "yes" ; then +- AC_CHECK_LIB(gpgme4, gpgme_check_version, [ +- have_gpgme=yes +- GPGME_LIBS="-lgpgme4" +- AC_SUBST(GPGME_LIBS) +- AC_DEFINE(HAVE_GPGME4, 1, [Use libgpgme4.so]) +- AC_DEFINE([GPG_SUPPORT], [1], [Define to 1 if gpgme library is present.]) +- ]) +-fi ++ ++AC_ARG_WITH(gpgme, ++ AC_HELP_STRING([--without-gpgme], ++ [without GnuPG (GPGME library) support]), ++ [with_gpgme=${withval}], ++ [with_gpgme=yes]) ++ ++ ++if test "$with_gpgme" = "yes"; then ++ AM_PATH_GPGME(0.4.3, ++ [LIBS="$LIBS $GPGME_LIBS" ++ CFLAGS="$CFLAGS $GPGME_CFLAGS" ++ with_gpgme=yes], ++ [AC_MSG_ERROR(Cannot find an up to date GPGME) ++ with_gpgme=no]) ++ ++ if test "$with_gpgme" = "yes"; then ++ AC_DEFINE([GPG_SUPPORT], [1], [Define to 1 if gpgme library is present.]) ++ fi + fi + + dnl +@@ -209,8 +200,8 @@ + [additional debugging support])]) + if test "x$enable_debug" = xyes; then + AC_DEFINE([DEBUG], [1], [turns on debugging facilities]) +- CFLAGS="-gdwarf-2 -g3 -O0" +- CXXFLAGS="-gdwarf-2 -g3 -O0" ++ CFLAGS="$CFLAGS -gdwarf-2 -g3" ++ CXXFLAGS="$CXXFLAGS -gdwarf-2 -g3" + else + enable_debug=no + fi +@@ -289,6 +280,6 @@ + + echo + echo " Debugging information: $enable_debug" +-echo " GPG support: $have_gpgme" ++echo " GPG support: $with_gpgme" + echo " OpenSSL support: $ac_use_openssl" + echo |