aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-07-12 23:18:20 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-07-12 23:18:20 +0000
commit42f23f2f68533a73f2537cec672c2bcfa5f65fa0 (patch)
treed11b14211c2ee933ebcf466d0e98bcc0fcc26eb3
parent66fb6a95c73837a7b5b7981bee9a9fd7a252d311 (diff)
downloadpaludis-42f23f2f68533a73f2537cec672c2bcfa5f65fa0.tar.gz
paludis-42f23f2f68533a73f2537cec672c2bcfa5f65fa0.tar.xz
Add PALUDIS_HASH_IS_* and PALUDIS_ENABLE_THREADS to pkgconfig.
-rw-r--r--configure.ac8
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 64608e2..bab8148 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_LANG([C++])
PALUDIS_CXXFLAGS=
PALUDIS_PC_CFLAGS=
-PALUDIS_PC_LIBS=
+PALUDIS_PC_LIBS="-lpaludis -lpaludisutil -lpaludisenvironments"
PALUDIS_PC_VERSION=
dnl }}}
@@ -162,6 +162,7 @@ int main(int, char **)
[
AC_MSG_RESULT([std::tr1::unordered_map])
PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_HASH_IS_STD_TR1_UNORDERED=1"
+ PALUDIS_PC_CFLAGS="${PALUDIS_PC_CFLAGS} -DPALUDIS_HASH_IS_STD_TR1_UNORDERED=1"
],
[
AC_COMPILE_IFELSE([
@@ -175,6 +176,7 @@ int main(int, char **)
[
AC_MSG_RESULT([__gnu_cxx::hash_map])
PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_HASH_IS_GNU_CXX_HASH=1"
+ PALUDIS_PC_CFLAGS="${PALUDIS_PC_CFLAGS} -DPALUDIS_HASH_IS_GNU_CXX_HASH=1"
],
[
AC_COMPILE_IFELSE([
@@ -188,6 +190,7 @@ int main(int, char **)
[
AC_MSG_RESULT([std::hash_map])
PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_HASH_IS_STD_HASH=1"
+ PALUDIS_PC_CFLAGS="${PALUDIS_PC_CFLAGS} -DPALUDIS_HASH_IS_STD_HASH=1"
],
[
AC_MSG_RESULT([no, falling back to std::map (slower)])
@@ -600,7 +603,9 @@ int main(int, char **)
CXXFLAGS=$save_CXXFLAGS
LDFLAGS=$save_LDFLAGS
PALUDIS_CXXFLAGS="$PALUDIS_CXXFLAGS -DPALUDIS_ENABLE_THREADS=1 -pthread"
+ PALUDIS_PC_CFLAGS="${PALUDIS_PC_CFLAGS} -DPALUDIS_ENABLE_THREADS=1 -pthread"
PTHREAD_LIBS="-pthread -lpthread"
+ PALUDIS_PC_LIBS="${PALUDIS_PC_LIBS} -pthread -lpthread"
PALUDIS_ENABLE_THREADS=1
else
PALUDIS_ENABLE_THREADS=0
@@ -1156,7 +1161,6 @@ dnl }}}
dnl {{{ pkg-config
AC_SUBST([PALUDIS_PC_CFLAGS])
-PALUDIS_PC_LIBS="-lpaludis -lpaludisutil -lpaludisenvironments"
AC_SUBST([PALUDIS_PC_LIBS])
PALUDIS_PC_VERSION="${VERSION_FULL}"
AC_SUBST([PALUDIS_PC_VERSION])