[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/21] Fix test for dbus when cross building
From: |
John Darrington |
Subject: |
[PATCH 10/21] Fix test for dbus when cross building |
Date: |
Sun, 12 Jan 2014 12:00:23 +0100 |
* configure.ac: Replace ad hoc test for dbus with one using PKG_CHECK_MODULES
---
configure.ac | 26 ++------------------------
1 file changed, 2 insertions(+), 24 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4b89c19..5889603 100644
--- a/configure.ac
+++ b/configure.ac
@@ -508,35 +508,13 @@ PKG_CHECK_MODULES([FONTCONFIG], [fontconfig],
AC_SUBST(HAVE_FONTCONFIG)
dnl DBus support
-HAVE_DBUS=""
-DBUS_CFLAGS=""
-DBUS_LIBS=""
AC_ARG_ENABLE([dbus], AC_HELP_STRING([--disable-dbus],
[Do not use dbus to communicate with external services]))
if test "$enable_dbus" != "no"; then
- if test "x$PKGCONFIG" != x; then
- AC_MSG_CHECKING(for dbus with pkg-config)
- if $PKGCONFIG --exists dbus-1; then
- AC_MSG_RESULT(yes)
- DBUS_CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1`"
- DBUS_LIBS="`$PKGCONFIG --libs dbus-1`"
- HAVE_DBUS=-DHAVE_DBUS
- else
- AC_MSG_RESULT(no)
- fi
- fi
- if test -z "$HAVE_DBUS"; then
- AC_CHECK_LIB([dbus], [dbus_message_iter_get_basic], [
- AC_CHECK_HEADER([dbus-1.0/dbus/dbus.h], [
- DBUS_LIBS="-ldbus-1 -lpthread -lrt"
- HAVE_DBUS="-DHAVE_DBUS"
- ])
- ])
- fi
+ PKG_CHECK_MODULES([DBUS], [dbus-1],
+ [HAVE_DBUS="-DHAVE_DBUS"],[true])
fi
AC_SUBST(HAVE_DBUS)
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
AC_CHECK_LIB(dl, dlopen)
--
1.7.10.4
- Re: Cross-compilation fails for Ghostscript 09.05, (continued)
- Re: Cross-compilation fails for Ghostscript 09.05, John Darrington, 2014/01/12
- [no subject], John Darrington, 2014/01/12
- [PATCH 02/21] Makefile.in (top_srcdir): New variable, John Darrington, 2014/01/12
- [PATCH 06/21] configure: Fix endianess test while cross-compiling, John Darrington, 2014/01/12
- [PATCH 07/21] Fix test for fontconfig when cross building, John Darrington, 2014/01/12
- [PATCH 09/21] Simplify the conditional inclusion of the contrib directory., John Darrington, 2014/01/12
- [PATCH 08/21] configure.ac, Makefile.in: Use CC_FOR_BUILD for native compilation., John Darrington, 2014/01/12
- [PATCH 04/21] Fix crash on startup if the configuration file is missing., John Darrington, 2014/01/12
- [PATCH 13/21] Improve reliability of freetype library (esp. wrt cross-building), John Darrington, 2014/01/12
- [PATCH 05/21] base/lib.mak: Fix broken build dependency, John Darrington, 2014/01/12
- [PATCH 10/21] Fix test for dbus when cross building,
John Darrington <=
- [PATCH 11/21] Fix incorrect determination of host/build OS, John Darrington, 2014/01/12
- [PATCH 17/21] Avoid redundancy in package version number/string, John Darrington, 2014/01/12
- [PATCH 16/21] Remove the code running ./configure from autogen.sh - I am of the opinion, that the bootstrap process and the configuration should be kept seperate. It should be possible to bootstrap without configuring., John Darrington, 2014/01/12
- [PATCH 20/21] Remove 'exe' suffix from GS variable., John Darrington, 2014/01/12
- [PATCH 21/21] Do install contrib drivers if the --disable-contrib option was chosen., John Darrington, 2014/01/12
- [PATCH 14/21] Remove broken test for OpenJpeg library., John Darrington, 2014/01/12
- [PATCH 12/21] Minor re-ordering of configure.ac, John Darrington, 2014/01/12
- [PATCH 03/21] doc/gs-vms.htp: Gnu policy is not to acknowledge trademarks., John Darrington, 2014/01/12
- [PATCH 15/21] Correct bad directories for ROMFS_OBJS, John Darrington, 2014/01/12
- [PATCH 18/21] Remove hard coded variables for tools (eg: SHELL)., John Darrington, 2014/01/12