opkg: fix configure checks for gpgme

git-svn-id: http://opkg.googlecode.com/svn/trunk@20 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

diff --git a/Makefile.am b/Makefile.am
index c6218c17918e4e50e9d553c8b94f169acc5c7eac..bb33843876149fc444eded0d27442157ebcce840 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,7 +52,7 @@ libopkg_include_HEADERS= \
 #\ replace/replace.h
 
 #libopkg_la_LIBADD = libbb/libbb.la replace/libreplace.a
-libopkg_la_LIBADD = libbb/libbb.la $(CURL_LIBS)
+libopkg_la_LIBADD = libbb/libbb.la $(CURL_LIBS) $(GPGME_LIBS)
 
 opkg_core_sources = args.c args.h opkg.c \
                    user.c user.h 
@@ -97,9 +97,9 @@ libopkg_la_SOURCES = $(opkg_libcore_sources) $(opkg_cmd_sources) $(opkg_db_sourc
 
 opkg_cl_SOURCES = opkg-frontend.c
 
-libopkg_la_CFLAGS = -DOPKG_LIB $(ALL_CFLAGS)  $(CURL_CFLAGS)
+libopkg_la_CFLAGS = -DOPKG_LIB $(ALL_CFLAGS)  $(CURL_CFLAGS) $(GPGME_CFLAGS)
 
-opkg_CFLAGS = $(ALL_CFLAGS) $(CURL_CFLAGS)
+opkg_CFLAGS = $(ALL_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS)
 
 opkg_cl_CFLAGS = -DOPKG_LIB $(ALL_CFLAGS)
 

diff --git a/configure.ac b/configure.ac
index 2048313873ec329cc95c31dc4bc59536cb2cad23..3e1d0bb20660f9ba41d184d23023f3cd8a325263 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,8 @@ else
   AC_MSG_ERROR(GPGME $min_gpgme_version or later needed)
 fi
 
-
+AC_SUBST(GPGME_CFLAGS)
+AC_SUBST(GPGME_LIBS)
 
 
 # Checks for header files