clean up conditionals a little, add defines for hal/udisks mount

SVN revision: 55832
This commit is contained in:
Mike Blumenkrantz 2011-01-04 01:18:13 +00:00
parent ca92c02956
commit f31e5c0a7f
1 changed files with 6 additions and 4 deletions

View File

@ -301,6 +301,7 @@ else
device_backend=ehal
fi
AC_MSG_RESULT($device_backend)
AM_CONDITIONAL([HAVE_EEZE], [test "x${device_backend}" = "xeeze"])
DBUS_MOUNT_CONFIG=1
dbus_mount="dbus-1"
@ -346,12 +347,13 @@ fi
AC_SUBST([EEZE_MOUNT_CONFIG])
AC_SUBST([DBUS_MOUNT_CONFIG])
AM_CONDITIONAL([HAVE_EEZE], [test "x${device_backend}" = "xeeze"])
AM_CONDITIONAL([HAVE_HAL_MOUNT], [test -n "$hal_mount"])
AM_CONDITIONAL([HAVE_UDISKS_MOUNT], [test -n "$udisks_mount"])
##AM_CONDITIONAL([HAVE_UDISKS_MOUNT], [false])
##AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test -n "$eeze_mount"])
AM_CONDITIONAL([HAVE_UDISKS_MOUNT], [false])
AM_CONDITIONAL([HAVE_EEZE_MOUNT], [false])
test -n "$hal_mount" && AC_DEFINE_UNQUOTED([HAVE_HAL_MOUNT], [1], [enable HAL mounting])
test -n "$udisks_mount" && AC_DEFINE_UNQUOTED([HAVE_UDISKS_MOUNT], [1], [enable Udisks mounting])
##AM_CONDITIONAL([HAVE_UDISKS_MOUNT], [test -n "$udisks_mount"])
##AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test -n "$eeze_mount"])
# doxygen program for documentation building