diff options
| author | Christophe Fergeau <teuf@gnome.org> | 2005-10-12 09:38:28 +0000 |
|---|---|---|
| committer | Christophe Fergeau <teuf@gnome.org> | 2005-10-12 09:38:28 +0000 |
| commit | 1bdf691f8f1ee181089d0e1fb42681e5346e8783 (patch) | |
| tree | 7a10fa9bd5c01dcb232b756c0d186a4779718f36 | |
| parent | 0057ef9059d368c2e7eb34eba3660a062813223a (diff) | |
| download | libgpod-1bdf691f8f1ee181089d0e1fb42681e5346e8783.tar.gz libgpod-1bdf691f8f1ee181089d0e1fb42681e5346e8783.tar.xz libgpod-1bdf691f8f1ee181089d0e1fb42681e5346e8783.zip | |
2005-10-12 Christophe Fergeau <teuf@gnome.org>
* configure.ac:
* src/Makefile.am:
* tests/Makefile.am: fix compilation when hal is available, needs to
be tested on systems without hal
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1119 f01d2545-417e-4e96-918e-98f8d0dbbcb6
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 |
4 files changed, 22 insertions, 11 deletions
@@ -1,3 +1,10 @@ +2005-10-12 Christophe Fergeau <teuf@gnome.org> + + * configure.ac: + * src/Makefile.am: + * tests/Makefile.am: fix compilation when hal is available, needs to + be tested on systems without hal + 2005-10-11 Christophe Fergeau <teuf@gnome.org> * src/itdb_itunesdb.c: (get_mhip): added missing parameter to diff --git a/configure.ac b/configure.ac index 6242295..7900cf0 100644 --- a/configure.ac +++ b/configure.ac @@ -54,8 +54,6 @@ AC_PROG_INTLTOOL([0.21]) PKG_CHECK_MODULES(LIBGPOD, glib-2.0 gobject-2.0) LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS -Wall" -AC_SUBST(LIBGPOD_CFLAGS) -AC_SUBST(LIBGPOD_LIBS) dnl ************************************************** dnl * GDKPIXBUF is optional @@ -66,14 +64,20 @@ AM_CONDITIONAL(HAVE_GDKPIXBUF, test x"$have_gdkpixbuf" = xyes) if test x"$have_gdkpixbuf" = xyes; then AC_DEFINE_UNQUOTED(HAVE_GDKPIXBUF, 1) fi -AC_SUBST(GDKPIXBUF_CFLAGS) -AC_SUBST(GDKPIXBUF_LIBS) +LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $GDKPIXBUF_CFLAGS" +LIBGPOD_LIBS="$LIBGPOD_LIBS $GDKPIXBUF_LIBS" dnl ************************************************** dnl * hal is optional dnl ************************************************** -AC_CHECK_LIB([hal], [libhal_device_get_property_uint64]) +PKG_CHECK_MODULES(HAL, hal >= 0.5.2 hal < 0.6, enable_hal05=yes, enable_hal05=no) +if test x$enable_hal05 != xyes; then + AC_DEFINE_UNQUOTED(HAVE_HAL, 1, [Whether HAL is available or not]) +fi +LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $HAL_CFLAGS" +LIBGPOD_LIBS="$LIBGPOD_LIBS $HAL_LIBS" + dnl ************************************************** dnl * internationalization support @@ -132,6 +136,8 @@ fi AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) +AC_SUBST(LIBGPOD_CFLAGS) +AC_SUBST(LIBGPOD_LIBS) AC_OUTPUT([ Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 4b67317..b61c0d2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,5 +30,5 @@ libgpod_la_LDFLAGS = -version-info $(LIBGPOD_CURRENT):$(LIBGPOD_REVISION):$(LIBG libgpodincludedir = $(includedir)/gpod-1.0/gpod libgpodinclude_HEADERS = $(libgpod_la_headers) -INCLUDES=$(LIBGPOD_CFLAGS) $(GDKPIXBUF_CFLAGS) -LIBS=$(LIBGPOD_LIBS) $(GDKPIXBUF_LIBS) +INCLUDES=$(LIBGPOD_CFLAGS) +LIBS=$(LIBGPOD_LIBS) diff --git a/tests/Makefile.am b/tests/Makefile.am index 0b7bfe6..70fe605 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,10 +14,8 @@ test_itdb_LDADD = if HAVE_GDKPIXBUF test_thumbnails_SOURCES = test-covers.c -test_thumbnails_CFLAGS = $(GDKPIXBUF_CFLAGS) $(AM_CFLAGS) -test_thumbnails_LDADD = $(GDKPIXBUF_LIBS) +test_thumbnails_CFLAGS = $(AM_CFLAGS) test_write_thumbnails_SOURCES = test-write-covers.c -test_write_thumbnails_CFLAGS = $(GDKPIXBUF_CFLAGS) $(AM_CFLAGS) -test_write_thumbnails_LDADD = $(GDKPIXBUF_LIBS) +test_write_thumbnails_CFLAGS = $(AM_CFLAGS) endif |