On FreeBSD, made gpgme header path inclusion optional
If gpgme is installed on FreeBSD systems it appears that -I/usr/local/include/gpgme must be added to the include path, but this change only adds the path if gpgme is installed and going to be used.
This commit is contained in:
parent
6eeb413094
commit
04afd2846d
21
configure.ac
21
configure.ac
@ -165,12 +165,6 @@ case "$host" in
|
|||||||
# gcc: now: linker input file unused because linking not done
|
# gcc: now: linker input file unused because linking not done
|
||||||
use_ro_relocations=no
|
use_ro_relocations=no
|
||||||
use_immediate_binding=no
|
use_immediate_binding=no
|
||||||
if [ test "x$CPPFLAGS" = "x" ] ; then
|
|
||||||
CPPFLAGS="-I/usr/local/include -I/usr/local/include/gpgme"
|
|
||||||
fi
|
|
||||||
if [ test "x$LDFLAGS" = "x" ] ; then
|
|
||||||
LDFLAGS="-L/usr/local/lib"
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -480,6 +474,21 @@ AS_IF([test "x$GPG_EXE" != x],
|
|||||||
], [ gpg_exe="(not found)"]
|
], [ gpg_exe="(not found)"]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if [test "$have_gpgme" = "yes" ]; then
|
||||||
|
case "$host" in
|
||||||
|
*-*-linux*)
|
||||||
|
;;
|
||||||
|
*-*-freebsd*)
|
||||||
|
if [ test "x$CPPFLAGS" = "x" ] ; then
|
||||||
|
CPPFLAGS="-I/usr/local/include -I/usr/local/include/gpgme"
|
||||||
|
fi
|
||||||
|
if [ test "x$LDFLAGS" = "x" ] ; then
|
||||||
|
LDFLAGS="-L/usr/local/lib"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
dnl Check for libpcap, gdbm (or ndbm) if we are building the server component
|
dnl Check for libpcap, gdbm (or ndbm) if we are building the server component
|
||||||
dnl
|
dnl
|
||||||
AS_IF([test "$want_server" = yes], [
|
AS_IF([test "$want_server" = yes], [
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user