--- config.m4.orig	2007-05-04 15:23:41.000000000 +0200
+++ config.m4	2008-11-02 09:21:21.000000000 +0100
@@ -5,8 +5,8 @@
 [  --with-gnupg[=dir]       Include gnupg support])
 
 if test "$PHP_GNUPG" != "no"; then
-  SEARCH_PATH="/usr/local/include /usr/include /usr/local/include/gpgme/ /usr/include/gpgme/"
-  SEARCH_FOR="gpgme.h"
+  SEARCH_PATH="/usr/local /usr /usr/local"
+  SEARCH_FOR="/include/gpgme.h"
   if test -r $PHP_GNUPG/$SEARCH_FOR; then
     GNUPG_DIR=$PHP_GNUPG
   else
@@ -24,7 +24,7 @@
     AC_MSG_ERROR([Please reinstall the gpgme distribution])
   fi
 
-  PHP_ADD_INCLUDE($GNUPG_DIR)
+  PHP_ADD_INCLUDE($GNUPG_DIR/include)
 
   LIBNAME=gpgme
   LIBSYMBOL=gpgme_check_version