diff options
| author | Todd Zullinger <tmz@pobox.com> | 2009-01-02 01:27:01 -0500 |
|---|---|---|
| committer | Todd Zullinger <tmz@pobox.com> | 2009-01-12 13:19:06 -0500 |
| commit | 02f857a1a7e479f28420315534ff54c856cd5041 (patch) | |
| tree | 0bac15bbaa963fd1c2929828a52c21d8daf3a0a2 | |
| parent | 5016affd8cd364643164b7705c1452e1e0f0452b (diff) | |
| download | libgpod-02f857a1a7e479f28420315534ff54c856cd5041.tar.gz libgpod-02f857a1a7e479f28420315534ff54c856cd5041.tar.xz libgpod-02f857a1a7e479f28420315534ff54c856cd5041.zip | |
Improve the default hal callout and fdi paths
The search path hal uses for its callouts differs on various
platforms. The new path should work on more systems out of the box.
The fdi file now also defaults to a path more likely to work by
default.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | tools/Makefile.am | 4 |
4 files changed, 23 insertions, 5 deletions
@@ -1,3 +1,11 @@ +2009-01-08 Todd Zullinger <tmzullinger at users.sourceforge.net> + + * configure.ac: Improve the default hal callout path. The + search path hal uses for its callouts differs on various + platforms. The new path should work on more systems out of + the box. The fdi file now also defaults to a path more likely + to work by default. + 2009-01-06 Todd Zullinger <tmzullinger at users.sourceforge.net> * po/zh_CN.po: Add simple Chinese translation (Tan Zhixin) diff --git a/Makefile.am b/Makefile.am index 3090f52..50c490d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,9 @@ SUBDIRS=src tools tests po m4 docs bindings # build documentation when doing a distcheck. -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc \ + --with-hal-callouts-dir="`pwd`/hal/scripts" \ + --with-hal-fdi-dir="`pwd`/hal/fdi" ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 576d72b..bac44b2 100644 --- a/configure.ac +++ b/configure.ac @@ -117,12 +117,20 @@ dnl *********************************************************************** AC_ARG_WITH(hal, AC_HELP_STRING([--without-hal], [Disable HAL support])) +hal_callouts_dir="`$PKG_CONFIG --variable libdir hal`/hal/scripts" AC_ARG_WITH(hal_callouts_dir, AC_HELP_STRING([--with-hal-callouts-dir=DIR], - [Directory where HAL expects its callout scripts to be located]), , - with_hal_callouts_dir="${expanded_libdir}/hal") + [Directory where HAL expects its callout scripts to be located]),, + with_hal_callouts_dir="$hal_callouts_dir") HALCALLOUTSDIR="$with_hal_callouts_dir" AC_SUBST(HALCALLOUTSDIR) +hal_fdi_dir="`$PKG_CONFIG --variable prefix hal`/share/hal/fdi" +AC_ARG_WITH(hal_fdi_dir, AC_HELP_STRING([--with-hal-fdi-dir=DIR], + [Directory where HAL expects its fdi files to be located]),, + with_hal_fdi_dir="$hal_fdi_dir") +HALFDIDIR="$with_hal_fdi_dir" +AC_SUBST(HALFDIDIR) + if test "x$with_hal" != "xno"; then PKG_CHECK_MODULES(HAL, hal >= 0.5 hal < 0.6, enable_hal=yes, enable_hal=no) if test "x$enable_hal" != "xyes" -a "x$with_hal" = "xyes"; then diff --git a/tools/Makefile.am b/tools/Makefile.am index 18c24bd..050eded 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -18,10 +18,10 @@ libgpod_callout_SOURCES = \ libgpod_callout_CFLAGS=$(LIBGPOD_CFLAGS) $(SGUTILS_CFLAGS) -I$(top_srcdir)/src libgpod_callout_LDADD=$(LIBGPOD_LIBS) $(SGUTILS_LIBS) $(top_builddir)/src/libgpod.la -fdidir = $(datadir)/hal/fdi/policy/20thirdparty +fdidir = $(HALFDIDIR)/policy/20thirdparty fdi_DATA = 20-libgpod-sysinfo-extended.fdi -EXTRA_DIST = $(fdi_DATA) +EXTRA_DIST = $(fdi_DATA) endif |