Revision: 2251
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2251&view=rev
Author: tmzullinger
Date: 2009-01-31 22:34:08 +0000 (Sat, 31 Jan 2009)
Log Message:
-----------
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.
Modified Paths:
--------------
libgpod/trunk/ChangeLog
libgpod/trunk/Makefile.am
libgpod/trunk/TROUBLESHOOTING
libgpod/trunk/configure.ac
libgpod/trunk/tools/Makefile.am
Modified: libgpod/trunk/ChangeLog
===================================================================
--- libgpod/trunk/ChangeLog 2009-01-31 22:33:55 UTC (rev 2250)
+++ libgpod/trunk/ChangeLog 2009-01-31 22:34:08 UTC (rev 2251)
@@ -1,5 +1,13 @@
2009-01-31 Todd Zullinger <tmzullinger at users.sourceforge.net>
+ * Makefile.am, configure.ac, tools/Makefile.am, TROUBLESHOOTING:
+ 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-31 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
* bindings/python/Makefile.am, configure.ac:
Only use PYGOBJECT_{CFLAGS,LIBS} in bindings/python. Thanks
to Frank Lichtenheld (fixes Debian bug #452829).
Modified: libgpod/trunk/Makefile.am
===================================================================
--- libgpod/trunk/Makefile.am 2009-01-31 22:33:55 UTC (rev 2250)
+++ libgpod/trunk/Makefile.am 2009-01-31 22:34:08 UTC (rev 2251)
@@ -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
Modified: libgpod/trunk/TROUBLESHOOTING
===================================================================
--- libgpod/trunk/TROUBLESHOOTING 2009-01-31 22:33:55 UTC (rev 2250)
+++ libgpod/trunk/TROUBLESHOOTING 2009-01-31 22:34:08 UTC (rev 2251)
@@ -102,14 +102,8 @@
when it is plugged in and save the SysInfoExtended file in the proper place.
This should be completely automatic. However, for this to work, the callout
must
be installed in hal's callout path. $libdir/hal/scripts is the most portable
-location (hal's $libdir can be found using pkg-config). If you are building
-libgpod from source with the default $prefix (/usr/local), you need to take
care
-to install the callout and .fdi file in the proper locations. The easiest way
to
-do this at the moment is by passing the locations to the make command. For
-example:
+location (hal's $libdir can be found using pkg-config). If the default paths
for
+the callout or fdi file are not detected properly, you can specify the proper
+locations manually, via configure:
- $ ./configure && make
- ...
- $ make haldir="$(pkg-config --variable libdir hal)/hal/scripts" \
- fdidir="$(pkg-config --variable prefix hal)/share/hal/fdi" \
- install
+ $ ./configure --with-hal-callouts-dir=DIR --with-hal-fdi-dir=DIR
Modified: libgpod/trunk/configure.ac
===================================================================
--- libgpod/trunk/configure.ac 2009-01-31 22:33:55 UTC (rev 2250)
+++ libgpod/trunk/configure.ac 2009-01-31 22:34:08 UTC (rev 2251)
@@ -117,12 +117,20 @@
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
Modified: libgpod/trunk/tools/Makefile.am
===================================================================
--- libgpod/trunk/tools/Makefile.am 2009-01-31 22:33:55 UTC (rev 2250)
+++ libgpod/trunk/tools/Makefile.am 2009-01-31 22:34:08 UTC (rev 2251)
@@ -18,10 +18,10 @@
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
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
