GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* gpgme-config.in: Made --prefix work for --libs.

Browse Source
This commit is contained in:
Werner Koch 2002-08-23 19:48:30 +00:00
parent d0020f11e0
commit bcba2d8e2d
3 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gpgme/ChangeLog
View File

@ -1,3 +1,7 @@
2002-08-23 Werner Koch <wk@gnupg.org>
* gpgme-config.in: Made --prefix work for --libs.
2002-08-21 Marcus Brinkmann <marcus@g10code.de> 2002-08-21 Marcus Brinkmann <marcus@g10code.de>
* ath.h: Update list of symbols that get a prefix: Rename the * ath.h: Update list of symbols that get a prefix: Rename the

38
gpgme/gpgme-config.in
View File

@ -1,17 +1,32 @@
#!/bin/sh #!/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@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
includes=""
libdirs=""
exec_prefix_set=no exec_prefix_set=no
echo_libs=no
gpgme_libs="@GPGME_LIBS@" echo_cflags=no
gpgme_cflags="@GPGME_CFLAGS@" echo_prefix=no
echo_exec_prefix=no
usage() usage()
{ {
cat <<EOF cat <<EOF
Usage: gpgme-config [OPTIONS] Usage: $PGM [OPTIONS]
Options: Options:
[--prefix[=DIR]] [--prefix[=DIR]]
[--exec-prefix[=DIR]] [--exec-prefix[=DIR]]
@ -77,17 +92,24 @@ fi
if test "$echo_cflags" = "yes"; then if test "$echo_cflags" = "yes"; then
if test "@includedir@" != "/usr/include" ; then if test "@includedir@" != "/usr/include" ; then
includes="-I@includedir@" includes="-I@includedir@"
for i in $gpgme_cflags ; do for i in $cflags ; do
if test "$i" = "-I@includedir@" ; then if test "$i" = "-I@includedir@" ; then
includes="" includes=""
fi fi
done done
fi fi
echo $includes $gpgme_cflags echo $includes $cflags
fi fi
if test "$echo_libs" = "yes"; then 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 fi

6
gpgme/gpgme.m4
View File

@ -31,11 +31,11 @@ AC_DEFUN(AM_PATH_GPGME,
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
gpgme_config_version=`$GPGME_CONFIG $gpgme_config_args --version` gpgme_config_version=`$GPGME_CONFIG $gpgme_config_args --version`
major=`echo $gpgme_config_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 | \ 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 | \ 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 if test "$major" -gt "$req_major"; then
ok=yes ok=yes
else else