On Mon, Aug 15, 2011 at 09:10:34PM +0200, Rémy Oudompheng wrote: > Signed-off-by: Rémy Oudompheng <[email protected]> > --- > configure.ac | 7 +- > m4/gpgme.m4 | 307 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 308 insertions(+), 6 deletions(-) > create mode 100644 m4/gpgme.m4
I believe Allan had a good reason for using the custom rule, I just don't recall what it was... > > diff --git a/configure.ac b/configure.ac > index 2d52d6a..ba6c15f 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -160,12 +160,7 @@ AM_CONDITIONAL([HAVE_LIBSSL], [test "x$with_openssl" = > "xyes"]) > AC_MSG_CHECKING(whether to link with libgpgme) > AS_IF([test "x$with_gpgme" != "xno"], > [AC_MSG_RESULT(yes) > - AC_CHECK_LIB([gpgme], [gpgme_check_version], , > - [if test "x$with_gpgme" != "xcheck"; then > - AC_MSG_FAILURE([--with-ggpme was given, but -lgpgme was not > found]) > - fi], > - [-lgpgme]) > - with_gpgme=$ac_cv_lib_gpgme_gpgme_check_version], > + AM_PATH_GPGME([], [with_gpgme=yes], [with_gpgme=no])], > AC_MSG_RESULT(no)) > AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$with_gpgme" = "xyes"]) > > diff --git a/m4/gpgme.m4 b/m4/gpgme.m4 > new file mode 100644 > index 0000000..44bf43c > --- /dev/null > +++ b/m4/gpgme.m4 > @@ -0,0 +1,307 @@ > +# gpgme.m4 - autoconf macro to detect GPGME. > +# Copyright (C) 2002, 2003, 2004 g10 Code GmbH > +# > +# This file is free software; as a special exception the author gives > +# unlimited permission to copy and/or distribute it, with or without > +# modifications, as long as this notice is preserved. > +# > +# This file is distributed in the hope that it will be useful, but > +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the > +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. > + > + > +AC_DEFUN([_AM_PATH_GPGME_CONFIG], > +[ AC_ARG_WITH(gpgme-prefix, > + AC_HELP_STRING([--with-gpgme-prefix=PFX], > + [prefix where GPGME is installed (optional)]), > + gpgme_config_prefix="$withval", gpgme_config_prefix="") > + if test "x$gpgme_config_prefix" != x ; then > + GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config" > + fi > + AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) > + > + if test "$GPGME_CONFIG" != "no" ; then > + gpgme_version=`$GPGME_CONFIG --version` > + fi > + gpgme_version_major=`echo $gpgme_version | \ > + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` > + gpgme_version_minor=`echo $gpgme_version | \ > + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` > + gpgme_version_micro=`echo $gpgme_version | \ > + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` > +]) > + > +dnl AM_PATH_GPGME([MINIMUM-VERSION, > +dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) > +dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS. > +dnl > +AC_DEFUN([AM_PATH_GPGME], > +[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl > + tmp=ifelse([$1], ,1:0.4.2,$1) > + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then > + req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` > + min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` > + else > + req_gpgme_api=0 > + min_gpgme_version="$tmp" > + fi > + > + AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version) > + ok=no > + if test "$GPGME_CONFIG" != "no" ; then > + req_major=`echo $min_gpgme_version | \ > + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` > + req_minor=`echo $min_gpgme_version | \ > + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` > + req_micro=`echo $min_gpgme_version | \ > + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` > + if test "$gpgme_version_major" -gt "$req_major"; then > + ok=yes > + else > + if test "$gpgme_version_major" -eq "$req_major"; then > + if test "$gpgme_version_minor" -gt "$req_minor"; then > + ok=yes > + else > + if test "$gpgme_version_minor" -eq "$req_minor"; then > + if test "$gpgme_version_micro" -ge "$req_micro"; then > + ok=yes > + fi > + fi > + fi > + fi > + fi > + fi > + if test $ok = yes; then > + # If we have a recent GPGME, we should also check that the > + # API is compatible. > + if test "$req_gpgme_api" -gt 0 ; then > + tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` > + if test "$tmp" -gt 0 ; then > + if test "$req_gpgme_api" -ne "$tmp" ; then > + ok=no > + fi > + fi > + fi > + fi > + if test $ok = yes; then > + GPGME_CFLAGS=`$GPGME_CONFIG --cflags` > + GPGME_LIBS=`$GPGME_CONFIG --libs` > + AC_MSG_RESULT(yes) > + ifelse([$2], , :, [$2]) > + else > + GPGME_CFLAGS="" > + GPGME_LIBS="" > + AC_MSG_RESULT(no) > + ifelse([$3], , :, [$3]) > + fi > + AC_SUBST(GPGME_CFLAGS) > + AC_SUBST(GPGME_LIBS) > +]) > + > +dnl AM_PATH_GPGME_PTH([MINIMUM-VERSION, > +dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) > +dnl Test for libgpgme and define GPGME_PTH_CFLAGS and GPGME_PTH_LIBS. > +dnl > +AC_DEFUN([AM_PATH_GPGME_PTH], > +[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl > + tmp=ifelse([$1], ,1:0.4.2,$1) > + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then > + req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` > + min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` > + else > + req_gpgme_api=0 > + min_gpgme_version="$tmp" > + fi > + > + AC_MSG_CHECKING(for GPGME Pth - version >= $min_gpgme_version) > + ok=no > + if test "$GPGME_CONFIG" != "no" ; then > + if `$GPGME_CONFIG --thread=pth 2> /dev/null` ; then > + req_major=`echo $min_gpgme_version | \ > + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` > + req_minor=`echo $min_gpgme_version | \ > + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` > + req_micro=`echo $min_gpgme_version | \ > + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` > + if test "$gpgme_version_major" -gt "$req_major"; then > + ok=yes > + else > + if test "$gpgme_version_major" -eq "$req_major"; then > + if test "$gpgme_version_minor" -gt "$req_minor"; then > + ok=yes > + else > + if test "$gpgme_version_minor" -eq "$req_minor"; then > + if test "$gpgme_version_micro" -ge "$req_micro"; then > + ok=yes > + fi > + fi > + fi > + fi > + fi > + fi > + fi > + if test $ok = yes; then > + # If we have a recent GPGME, we should also check that the > + # API is compatible. > + if test "$req_gpgme_api" -gt 0 ; then > + tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` > + if test "$tmp" -gt 0 ; then > + if test "$req_gpgme_api" -ne "$tmp" ; then > + ok=no > + fi > + fi > + fi > + fi > + if test $ok = yes; then > + GPGME_PTH_CFLAGS=`$GPGME_CONFIG --thread=pth --cflags` > + GPGME_PTH_LIBS=`$GPGME_CONFIG --thread=pth --libs` > + AC_MSG_RESULT(yes) > + ifelse([$2], , :, [$2]) > + else > + GPGME_PTH_CFLAGS="" > + GPGME_PTH_LIBS="" > + AC_MSG_RESULT(no) > + ifelse([$3], , :, [$3]) > + fi > + AC_SUBST(GPGME_PTH_CFLAGS) > + AC_SUBST(GPGME_PTH_LIBS) > +]) > + > +dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION, > +dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) > +dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS > +dnl and GPGME_PTHREAD_LIBS. > +dnl > +AC_DEFUN([AM_PATH_GPGME_PTHREAD], > +[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl > + tmp=ifelse([$1], ,1:0.4.2,$1) > + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then > + req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` > + min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` > + else > + req_gpgme_api=0 > + min_gpgme_version="$tmp" > + fi > + > + AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version) > + ok=no > + if test "$GPGME_CONFIG" != "no" ; then > + if `$GPGME_CONFIG --thread=pthread 2> /dev/null` ; then > + req_major=`echo $min_gpgme_version | \ > + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` > + req_minor=`echo $min_gpgme_version | \ > + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` > + req_micro=`echo $min_gpgme_version | \ > + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` > + if test "$gpgme_version_major" -gt "$req_major"; then > + ok=yes > + else > + if test "$gpgme_version_major" -eq "$req_major"; then > + if test "$gpgme_version_minor" -gt "$req_minor"; then > + ok=yes > + else > + if test "$gpgme_version_minor" -eq "$req_minor"; then > + if test "$gpgme_version_micro" -ge "$req_micro"; then > + ok=yes > + fi > + fi > + fi > + fi > + fi > + fi > + fi > + if test $ok = yes; then > + # If we have a recent GPGME, we should also check that the > + # API is compatible. > + if test "$req_gpgme_api" -gt 0 ; then > + tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` > + if test "$tmp" -gt 0 ; then > + if test "$req_gpgme_api" -ne "$tmp" ; then > + ok=no > + fi > + fi > + fi > + fi > + if test $ok = yes; then > + GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --thread=pthread --cflags` > + GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs` > + AC_MSG_RESULT(yes) > + ifelse([$2], , :, [$2]) > + else > + GPGME_PTHREAD_CFLAGS="" > + GPGME_PTHREAD_LIBS="" > + AC_MSG_RESULT(no) > + ifelse([$3], , :, [$3]) > + fi > + AC_SUBST(GPGME_PTHREAD_CFLAGS) > + AC_SUBST(GPGME_PTHREAD_LIBS) > +]) > + > + > +dnl AM_PATH_GPGME_GLIB([MINIMUM-VERSION, > +dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) > +dnl Test for libgpgme-glib and define GPGME_GLIB_CFLAGS and GPGME_GLIB_LIBS. > +dnl > +AC_DEFUN([AM_PATH_GPGME_GLIB], > +[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl > + tmp=ifelse([$1], ,1:0.4.2,$1) > + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then > + req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` > + min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` > + else > + req_gpgme_api=0 > + min_gpgme_version="$tmp" > + fi > + > + AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version) > + ok=no > + if test "$GPGME_CONFIG" != "no" ; then > + req_major=`echo $min_gpgme_version | \ > + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` > + req_minor=`echo $min_gpgme_version | \ > + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` > + req_micro=`echo $min_gpgme_version | \ > + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` > + if test "$gpgme_version_major" -gt "$req_major"; then > + ok=yes > + else > + if test "$gpgme_version_major" -eq "$req_major"; then > + if test "$gpgme_version_minor" -gt "$req_minor"; then > + ok=yes > + else > + if test "$gpgme_version_minor" -eq "$req_minor"; then > + if test "$gpgme_version_micro" -ge "$req_micro"; then > + ok=yes > + fi > + fi > + fi > + fi > + fi > + fi > + if test $ok = yes; then > + # If we have a recent GPGME, we should also check that the > + # API is compatible. > + if test "$req_gpgme_api" -gt 0 ; then > + tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` > + if test "$tmp" -gt 0 ; then > + if test "$req_gpgme_api" -ne "$tmp" ; then > + ok=no > + fi > + fi > + fi > + fi > + if test $ok = yes; then > + GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags` > + GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs` > + AC_MSG_RESULT(yes) > + ifelse([$2], , :, [$2]) > + else > + GPGME_GLIB_CFLAGS="" > + GPGME_GLIB_LIBS="" > + AC_MSG_RESULT(no) > + ifelse([$3], , :, [$3]) > + fi > + AC_SUBST(GPGME_GLIB_CFLAGS) > + AC_SUBST(GPGME_GLIB_LIBS) > +]) > + > -- > 1.7.3.5 > >
