diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2014-09-29 00:06:30 +0200 |
|---|---|---|
| committer | Andrew Gregory <andrew.gregory.8@gmail.com> | 2017-05-11 06:45:30 +0200 |
| commit | 1a2770afa84537b6f06d286f600172da8c31ea1f (patch) | |
| tree | c314a0218c4ee4458d1733eee8d36956f0859df5 | |
| parent | db7f5b98fb97c2cd63ef0c092777e46bfc2bd211 (diff) | |
| download | pacman-1a2770afa84537b6f06d286f600172da8c31ea1f.tar.gz pacman-1a2770afa84537b6f06d286f600172da8c31ea1f.tar.xz | |
wip: updated build tools for multithread
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | lib/libalpm/Makefile.am | 4 | ||||
| -rw-r--r-- | lib/libalpm/alpm.h | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 57f068d3..1fcfc5b9 100644 --- a/configure.ac +++ b/configure.ac @@ -260,14 +260,14 @@ AS_IF([test "x$with_gpgme" != "xno"], have_gpgme=no AS_IF([test "x$with_gpgme" != "xno"], - [AM_PATH_GPGME([1.3.0], + [AM_PATH_GPGME_PTHREAD([1.3.0], [LIBS_save="$LIBS" CPPFLAGS_save="$CPPFLAGS" CFLAGS_save="$CFLAGS" - LIBS="$LIBS $GPGME_LIBS" - CPPFLAGS="$CPPFLAGS $GPGME_CPPFLAGS" - CFLAGS="$CFLAGS $GPGME_CFLAGS" + LIBS="$LIBS $GPGME_PTHREAD_LIBS" + CPPFLAGS="$CPPFLAGS $GPGME_PTHREAD_CPPFLAGS" + CFLAGS="$CFLAGS $GPGME_PTHREAD_CFLAGS" AC_MSG_CHECKING([for sane gpgme]) AC_LINK_IFELSE( @@ -279,8 +279,8 @@ AS_IF([test "x$with_gpgme" != "xno"], AC_DEFINE([HAVE_LIBGPGME], [1], [Define if gpgme should be used to provide GPG signature support.])], [AC_MSG_RESULT([no]) have_gpgme=no - unset GPGME_LIBS - unset GPGME_CFLAGS] + unset GPGME_PTHREAD_LIBS + unset GPGME_PTHREAD_CFLAGS] AS_IF([test "x$with_gpgme" = "xyes"], [AC_MSG_FAILURE([*** gpgme >= 1.3.0 is needed for GPG signature support])]) ) diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index f4f20e61..5c57246e 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -62,7 +62,7 @@ libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) libalpm_la_CFLAGS = \ $(AM_CFLAGS) \ - $(GPGME_CFLAGS) \ + $(GPGME_PTHREAD_CFLAGS) \ $(LIBARCHIVE_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(LIBSSL_CFLAGS) \ @@ -70,7 +70,7 @@ libalpm_la_CFLAGS = \ libalpm_la_LIBADD = \ $(LTLIBINTL) \ - $(GPGME_LIBS) \ + $(GPGME_PTHREAD_LIBS) \ $(LIBARCHIVE_LIBS) \ $(LIBCURL_LIBS) \ $(LIBSSL_LIBS) \ diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2637a055..664399c0 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -23,6 +23,8 @@ #ifndef ALPM_H #define ALPM_H +#define HAVE_PTHREAD /* XXX testing */ + #ifdef __cplusplus extern "C" { #endif |