diff options
Diffstat (limited to '')
| -rw-r--r-- | gpgme/ChangeLog | 4 | ||||
| -rw-r--r-- | gpgme/gpgme-config.in | 38 | ||||
| -rw-r--r-- | gpgme/gpgme.m4 | 6 |
3 files changed, 37 insertions, 11 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 63193cf8..30edecd2 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,7 @@ +2002-08-23 Werner Koch <[email protected]> + + * gpgme-config.in: Made --prefix work for --libs. + 2002-08-21 Marcus Brinkmann <[email protected]> * ath.h: Update list of symbols that get a prefix: Rename the diff --git a/gpgme/gpgme-config.in b/gpgme/gpgme-config.in index 67bce0f8..ffe3b593 100644 --- a/gpgme/gpgme-config.in +++ b/gpgme/gpgme-config.in @@ -1,17 +1,32 @@ #!/bin/sh +# Copyright (C) 1999, 2002 Free Software Foundation, Inc. +# +# 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. +PGM=gpgme-config +libs="@GPGME_CONFIG_LIBS@" +cflags="@GPGME_CONFIG_CFLAGS@" prefix=@prefix@ exec_prefix=@exec_prefix@ +includes="" +libdirs="" exec_prefix_set=no - -gpgme_libs="@GPGME_LIBS@" -gpgme_cflags="@GPGME_CFLAGS@" +echo_libs=no +echo_cflags=no +echo_prefix=no +echo_exec_prefix=no usage() { cat <<EOF -Usage: gpgme-config [OPTIONS] +Usage: $PGM [OPTIONS] Options: [--prefix[=DIR]] [--exec-prefix[=DIR]] @@ -77,17 +92,24 @@ fi if test "$echo_cflags" = "yes"; then if test "@includedir@" != "/usr/include" ; then includes="-I@includedir@" - for i in $gpgme_cflags ; do + for i in $cflags ; do if test "$i" = "-I@includedir@" ; then includes="" fi done fi - echo $includes $gpgme_cflags + echo $includes $cflags fi if test "$echo_libs" = "yes"; then - echo ${gpgme_libs} + if test "@libdir@" != "/usr/lib" ; then + libdirs="-L@libdir@" + for i in $libs ; do + if test "$i" = "-L@libdir@" ; then + libdirs="" + fi + done + fi + echo $libdirs $libs fi - diff --git a/gpgme/gpgme.m4 b/gpgme/gpgme.m4 index 63660d17..dbfb983b 100644 --- a/gpgme/gpgme.m4 +++ b/gpgme/gpgme.m4 @@ -31,11 +31,11 @@ AC_DEFUN(AM_PATH_GPGME, sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` gpgme_config_version=`$GPGME_CONFIG $gpgme_config_args --version` major=`echo $gpgme_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` minor=`echo $gpgme_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` micro=`echo $gpgme_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` if test "$major" -gt "$req_major"; then ok=yes else |