github-mirrors/php-gnupg
1
0
Fork 0
mirror of https://github.com/php-gnupg/php-gnupg.git synced 2024-11-22 14:27:09 +00:00
Code Issues Projects Releases Packages Activity

Fix --with-gnupg=dir to use correct dir

Browse source
This commit is contained in:
Jakub Zelenka 2018-06-05 17:56:58 +01:00
parent 15b69c66ea
commit 585c11c84a
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
config.m4
View file

@ -15,8 +15,9 @@ PHP_ARG_WITH(gnupg, for gnupg support,
[ --with-gnupg[=dir] Include gnupg support]) [ --with-gnupg[=dir] Include gnupg support])
if test "$PHP_GNUPG" != "no"; then if test "$PHP_GNUPG" != "no"; then
SEARCH_PATH="/usr/local/include /usr/include /usr/local/include/gpgme/ /usr/include/gpgme/" SEARCH_PATH="/usr/local /usr /opt"
SEARCH_FOR="gpgme.h" SEARCH_FOR="include/gpgme.h"
SEARCH_FOR_ALT="include/gpgme/gpgme.h"
if test -r $PHP_GNUPG/$SEARCH_FOR; then if test -r $PHP_GNUPG/$SEARCH_FOR; then
GNUPG_DIR=$PHP_GNUPG GNUPG_DIR=$PHP_GNUPG
else else
@ -26,6 +27,10 @@ if test "$PHP_GNUPG" != "no"; then
GNUPG_DIR=$i GNUPG_DIR=$i
AC_MSG_RESULT(found in $i) AC_MSG_RESULT(found in $i)
fi fi
if test -r $i/$SEARCH_FOR_ALT; then
GNUPG_DIR=$i
AC_MSG_RESULT(found in $i)
fi
done done
fi fi
@ -41,12 +46,12 @@ if test "$PHP_GNUPG" != "no"; then
PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
[ [
PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $GNUPG_DIR/lib, GNUPG_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $GNUPG_DIR/$PHP_LIBDIR, GNUPG_SHARED_LIBADD)
AC_DEFINE(HAVE_GNUPGLIB,1,[ ]) AC_DEFINE(HAVE_GNUPGLIB,1,[ ])
],[ ],[
AC_MSG_ERROR([wrong gpgme lib version or lib not found]) AC_MSG_ERROR([wrong gpgme lib version or lib not found])
],[ ],[
-L$GNUPG_DIR/lib -lm $GNUPG_DL -L$GNUPG_DIR/$PHP_LIBDIR -lm $GNUPG_DL
]) ])
PHP_SUBST(GNUPG_SHARED_LIBADD) PHP_SUBST(GNUPG_SHARED_LIBADD)
@ -70,6 +75,6 @@ if test "$with_gpg" != "no"; then
fi fi
fi fi
if test -x "$ac_cv_path_GNUPG_PATH"; then if test -x "$ac_cv_path_GNUPG_PATH"; then
AC_DEFINE_UNQUOTED([GNUPG_PATH], ["$ac_cv_path_GNUPG_PATH"], [Path to gpg v1.x]) AC_DEFINE_UNQUOTED([GNUPG_PATH], ["$ac_cv_path_GNUPG_PATH"], [Path to gpg binary])
fi fi
fi fi