Skip to content
This repository
Browse code

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.
  • Loading branch information...
commit 04afd2846dd563296c40667557ef4ac0d47aeb0c 1 parent 6eeb413
Michael Rash authored

Showing 1 changed file with 15 additions and 6 deletions. Show diff stats Hide diff stats

  1. +15 6 configure.ac
21 configure.ac
@@ -165,12 +165,6 @@ case "$host" in
165 165 # gcc: now: linker input file unused because linking not done
166 166 use_ro_relocations=no
167 167 use_immediate_binding=no
168   - if [ test "x$CPPFLAGS" = "x" ] ; then
169   - CPPFLAGS="-I/usr/local/include -I/usr/local/include/gpgme"
170   - fi
171   - if [ test "x$LDFLAGS" = "x" ] ; then
172   - LDFLAGS="-L/usr/local/lib"
173   - fi
174 168 ;;
175 169 esac
176 170
@@ -480,6 +474,21 @@ AS_IF([test "x$GPG_EXE" != x],
480 474 ], [ gpg_exe="(not found)"]
481 475 )
482 476
  477 +if [test "$have_gpgme" = "yes" ]; then
  478 +case "$host" in
  479 +*-*-linux*)
  480 + ;;
  481 +*-*-freebsd*)
  482 + if [ test "x$CPPFLAGS" = "x" ] ; then
  483 + CPPFLAGS="-I/usr/local/include -I/usr/local/include/gpgme"
  484 + fi
  485 + if [ test "x$LDFLAGS" = "x" ] ; then
  486 + LDFLAGS="-L/usr/local/lib"
  487 + fi
  488 + ;;
  489 +esac
  490 +fi
  491 +
483 492 dnl Check for libpcap, gdbm (or ndbm) if we are building the server component
484 493 dnl
485 494 AS_IF([test "$want_server" = yes], [

0 comments on commit 04afd28

Please sign in to comment.
Something went wrong with that request. Please try again.