hal: Branch 'master'

[David Zeuthen]

 partutil/Makefile.am |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

New commits:
diff-tree 9dc01220f522f2a84120e9f2c4916a46d8d547ec (from f2b9797c440aeafafffb056a3872ecf3ba014a15)
Author: Doug Goldstein <cardoe at gentoo.org>
Date:   Mon Apr 16 15:40:05 2007 -0400

    fix how we build partutil
    
    05_freebsd_partutil_make_fix.patch corrects the syntax in the
    Makefile.am (don't forget to autoreconf) and I just inverted the logic
    in it since we only want that code to compile on Linux so it'll fix it
    for Solaris as well.

diff --git a/partutil/Makefile.am b/partutil/Makefile.am
index bf48de6..5c7b8f3 100644
--- a/partutil/Makefile.am
+++ b/partutil/Makefile.am
@@ -1,17 +1,12 @@
-if HALD_COMPILE_SOLARIS 
-# do nothing
-else if HALD_COMPILE_FREEBSD
-# do nothing
-else 
+if HALD_COMPILE_LINUX
+noinst_LTLIBRARIES = libpartutil.la
+endif
 
 INCLUDES = @GLIB_CFLAGS@
 
-noinst_LTLIBRARIES = libpartutil.la
-
 libpartutil_la_SOURCES = partutil.h partutil.c ../hald/logger.c
 
 libpartutil_la_LIBADD = @GLIB_LIBS@ @PARTED_LIBS@
 
 clean-local :
 	rm -f *~
-endif