summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorticktock35 <ticktock35@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2008-12-14 23:19:59 (EST)
committer ticktock35 <ticktock35@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2008-12-14 23:19:59 (EST)
commit41a2d0807aace08c3f2895d7768594c929edf3cd (patch)
tree7b7c079b0b46f345de6c5d2f6d7388c28822889a
parent44d7bd09843dbc56f3799326553ad1c18f1ec501 (diff)
opkg: fix configure checks for gpgme
git-svn-id: http://opkg.googlecode.com/svn/trunk@20 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
-rw-r--r--Makefile.am6
-rw-r--r--configure.ac3
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index c6218c1..bb33843 100644
--- 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 2048313..3e1d0bb 100644
--- 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