summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnas Nashif <anas.nashif@intel.com>2013-02-19 16:27:38 (GMT)
committerAnas Nashif <anas.nashif@intel.com>2013-02-19 16:32:54 (GMT)
commitbb91c3c1d65044fff2e16d1d9d957ef84ee430de (patch)
treeed37164ba869e80c544b19c588a6891614f99acf
parente2791a2f0d7fe53f7e1183dd25d011ab82272555 (diff)
downloadgpgme-bb91c3c1d65044fff2e16d1d9d957ef84ee430de.zip
gpgme-bb91c3c1d65044fff2e16d1d9d957ef84ee430de.tar.gz
gpgme-bb91c3c1d65044fff2e16d1d9d957ef84ee430de.tar.bz2
remove extraneous libs
-rw-r--r--configure.ac4
-rw-r--r--src/Makefile.am3
-rw-r--r--src/gpgme-config.in2
3 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index bc57bbd..ab6ffc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,7 @@ AM_MAINTAINER_MODE
AC_CANONICAL_HOST
# Enable GNU extensions on systems that have them.
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
AH_VERBATIM([_REENTRANT],
[/* To allow the use of GPGME in multithreaded programs we have to use
@@ -89,7 +89,7 @@ AH_VERBATIM([_REENTRANT],
# define _REENTRANT 1
#endif])
-AC_PROG_CC
+AC_PROG_CC_STDC
AC_PROG_CXX
AC_CHECK_PROGS(GITLOG_TO_CHANGELOG, gitlog-to-changelog,
[build-aux/gitlog-to-changelog])
diff --git a/src/Makefile.am b/src/Makefile.am
index ea8e70e..0b70ff8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -196,12 +196,13 @@ libgpgme_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers $(gpgme_deps)
libgpgme_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
@GPG_ERROR_LIBS@
+libgpgme_pthread_la_CFLAGS = -pthread
libgpgme_pthread_la_LDFLAGS = $(no_undefined) $(export_symbols) \
$(libgpgme_version_script_cmd) -version-info \
@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
libgpgme_pthread_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers
libgpgme_pthread_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
- -lpthread @GPG_ERROR_LIBS@
+ @GPG_ERROR_LIBS@
if BUILD_W32_GLIB
libgpgme_glib_la_LDFLAGS = $(no_undefined) \
diff --git a/src/gpgme-config.in b/src/gpgme-config.in
index 4be1e08..15d8b3b 100644
--- a/src/gpgme-config.in
+++ b/src/gpgme-config.in
@@ -23,7 +23,7 @@ libs="-L@libdir@"
# Network libraries.
assuan_cflags="@LIBASSUAN_CFLAGS@"
-assuan_libs="@LIBASSUAN_LIBS@"
+#assuan_libs="@LIBASSUAN_LIBS@"
# Configure libgpg-error.
gpg_error_cflags="@GPG_ERROR_CFLAGS@"