hal: Branch 'master' - 4 commits
Joe Marcus Clarke
marcus at kemper.freedesktop.org
Wed Dec 26 23:50:59 PST 2007
configure.in | 75 ++++++++++++++++++++++++----------------
hald/freebsd/hal-file-monitor.c | 2 -
tools/Makefile.am | 5 ++
tools/hal-storage-mount.c | 2 +
4 files changed, 52 insertions(+), 32 deletions(-)
New commits:
commit c1f8c8e026f81d1e4fbf816a751659981c010ab5
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date: Thu Dec 27 02:50:55 2007 -0500
remove redundant prototypes
Do not declare initialization functions twice.
diff --git a/hald/freebsd/hal-file-monitor.c b/hald/freebsd/hal-file-monitor.c
index de777b9..3630971 100644
--- a/hald/freebsd/hal-file-monitor.c
+++ b/hald/freebsd/hal-file-monitor.c
@@ -82,8 +82,6 @@ G_DEFINE_TYPE (HalFileMonitor, hal_file_monitor, G_TYPE_OBJECT)
static gpointer monitor_object = NULL;
-static void hal_file_monitor_class_init (HalFileMonitorClass *klass);
-static void hal_file_monitor_init (HalFileMonitor *monitor);
static void hal_file_monitor_finalize (GObject *object);
static GHashTable *get_dir_contents (const char *path);
static GHashTable *diff_dir_contents (FileKqueueData *data, GSList **added, GSList **removed);
commit 0bf82eb3cc0e811303295839d812056976d60b14
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date: Thu Dec 27 01:09:58 2007 -0500
add ext3fs support for FreeBSD
Allow HAL to mount ext3 file systems on FreeBSD.
diff --git a/tools/hal-storage-mount.c b/tools/hal-storage-mount.c
index ae14181..bfe14a9 100644
--- a/tools/hal-storage-mount.c
+++ b/tools/hal-storage-mount.c
@@ -426,6 +426,8 @@ map_fstype (const char *fstype)
return "cd9660";
else if (! strcmp (fstype, "ext2"))
return "ext2fs";
+ else if (! strcmp (fstype, "ext3"))
+ return "ext2fs";
else if (! strcmp (fstype, "vfat"))
return "msdosfs";
#elif sun
commit 3157817f9cf41d6edd553cdb74dddaf5163a7f2b
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date: Thu Dec 27 01:00:53 2007 -0500
conditionalize some dependencies and fix bashisms
Add --disable arguments for libusb and libpci (not needed on FreeBSD), and
change some instances of "==" to "=".
diff --git a/configure.in b/configure.in
index 90f10f3..a5ab375 100644
--- a/configure.in
+++ b/configure.in
@@ -277,7 +277,7 @@ else
USE_PARTED=no
fi
AC_SUBST(USE_PARTED)
-AM_CONDITIONAL(USE_PARTED, [test x$use_parted == xyes])
+AM_CONDITIONAL(USE_PARTED, [test x$use_parted = xyes])
#### gcc linker flags
@@ -383,39 +383,54 @@ AC_CHECK_LIB([expat], [XML_ParserCreate], [EXPAT_LIB="-lexpat"],
AC_SUBST(EXPAT_LIB)
dnl Check libusb
-AC_CHECK_HEADERS([usb.h], [USE_LIBUSB=yes], [USE_LIBUSB=no])
-if test "x$USE_LIBUSB" = "xyes"; then
- AC_CHECK_LIB([usb], [usb_find_devices], [], [USE_LIBUSB=no])
+AC_ARG_ENABLE([usb],
+ AS_HELP_STRING([--disable-usb], [Do not use libusb]),
+ [use_usb=$enableval], [use_usb=yes])
+if test "x$use_usb" = "xyes" ; then
+ AC_CHECK_HEADERS([usb.h], [USE_LIBUSB=yes], [USE_LIBUSB=no])
+ if test "x$USE_LIBUSB" = "xyes"; then
+ AC_CHECK_LIB([usb], [usb_find_devices], [], [USE_LIBUSB=no])
+ fi
+else
+ USE_LIBUSB=no
fi
AM_CONDITIONAL([HAVE_LIBUSB],[test "x$USE_LIBUSB" = "xyes"])
dnl Check for libsmbios
-AC_LANG_PUSH([C++])
-AC_CHECK_LIB([smbios], [SMBIOSFreeMemory], [LIB_SMBIOS=yes], [LIB_SMBIOS=no])
-AC_LANG_POP([C++])
-if test "$LIB_SMBIOS" = "yes" ; then
- AC_MSG_CHECKING([for libsmbios >= 0.13.4])
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <smbios/version.h>
- int main ()
- {
- int major ;
- int minor ;
- int micro ;
-
- if ( sscanf( LIBSMBIOS_RELEASE_VERSION , "%d.%d.%d", &major, &minor, µ ) == 3 ) {
- if ((major == 0 && minor == 13 && micro >= 4) ||
- (major == 0 && minor > 13) ||
- (major >= 0)) {
- return 0;
- }
- }
- return 1;
- }]])], [USE_SMBIOS=yes; AC_MSG_RESULT(yes); AM_CONDITIONAL(HAVE_SMBIOS,true)],
- [USE_SMBIOS=no; AC_MSG_RESULT(failed); AM_CONDITIONAL(HAVE_SMBIOS,false)])
+AC_ARG_ENABLE([smbios],
+ AS_HELP_STRING([--disable-smbios], [Do not use libsmbios]),
+ [use_smbios=$enableval], [use_smbios=yes])
+if test "x$use_smbios" = "xyes" ; then
+ AC_LANG_PUSH([C++])
+ AC_CHECK_LIB([smbios], [SMBIOSFreeMemory], [LIB_SMBIOS=yes], [LIB_SMBIOS=no])
+ AC_LANG_POP([C++])
+ if test "$LIB_SMBIOS" = "yes" ; then
+ AC_MSG_CHECKING([for libsmbios >= 0.13.4])
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <smbios/version.h>
+ int main ()
+ {
+ int major ;
+ int minor ;
+ int micro ;
+
+ if ( sscanf( LIBSMBIOS_RELEASE_VERSION , "%d.%d.%d", &major, &minor, µ ) == 3 ) {
+ if ((major == 0 && minor == 13 && micro >= 4) ||
+ (major == 0 && minor > 13) ||
+ (major >= 0)) {
+ return 0;
+ }
+ }
+ return 1;
+ }]])], [USE_SMBIOS=yes; AC_MSG_RESULT(yes); AM_CONDITIONAL(HAVE_SMBIOS,true)],
+ [USE_SMBIOS=no; AC_MSG_RESULT(failed); AM_CONDITIONAL(HAVE_SMBIOS,false)])
+ else
+ USE_SMBIOS=no
+ AM_CONDITIONAL(HAVE_SMBIOS, [false])
+ fi
else
- USE_SMBIOS=no
- AM_CONDITIONAL(HAVE_SMBIOS, [false])
+ USE_SMBIOS=no
+ AM_CONDITIONAL(HAVE_SMBIOS, [false])
fi
AC_ARG_WITH([libpci],
@@ -850,7 +865,7 @@ AC_ARG_WITH([usb-csr],
AS_HELP_STRING([--with-usb-csr],
[Whether to build addon for wireless USB mice (auto)]))
BUILD_USBCSR=no
-if test "x${USE_LIBUSB}" == "xyes" ; then
+if test "x${USE_LIBUSB}" = "xyes" ; then
if test "x$with_usb_csr" = "xyes" ; then
BUILD_USBCSR=yes
elif test "x$with_usb_csr" = "x" ; then
commit 8ba8b58407003911bbdec6fc906df7e25fb2c932
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date: Thu Dec 27 00:59:58 2007 -0500
fix build on non-Linux platforms
Do not add the keymap source files if we are not building keymaps.
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d153ac3..7119566 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -182,18 +182,23 @@ umount_hal_SOURCES = umount-hal.c
umount_hal_LDADD = @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la $(top_builddir)/libhal-storage/libhal-storage.la
endif
+if BUILD_KEYMAPS
+
if HAVE_GPERF
DISTCLEANFILES += \
hal-setup-keymap-hash-name.h \
hal-setup-keymap-hash-name.gperf \
hal-setup-keymap-keys.txt
+
BUILT_SOURCES += \
hal-setup-keymap-hash-name.h \
hal-setup-keymap-hash-name.gperf \
hal-setup-keymap-keys.txt
endif
+endif
+
check:
for f in $(script_SCRIPTS); do \
echo -n "Validate bash syntax in $$f : "; \
More information about the hal-commit
mailing list