Skip to content

Commit

Permalink
add DEPRECATED HAL support back
Browse files Browse the repository at this point in the history
Signed-off-by: Philippe De Swert <phdeswer@lumi.maa>
  • Loading branch information
Philippe De Swert committed Mar 31, 2011
1 parent 00019ab commit aba9158
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
8 changes: 8 additions & 0 deletions configure.ac
Expand Up @@ -59,6 +59,14 @@ AC_ARG_ENABLE([app_sync], AS_HELP_STRING([--enable-app-sync], [Enable applicatio
esac],[app_sync=false])
AM_CONDITIONAL([APP_SYNC], [test x$app_sync = xtrue])

AC_ARG_ENABLE([hal], AS_HELP_STRING([--enable-hal], [Enable deprecated hal interface @<:@default=false@:>@]),
[case "${enableval}" in
yes) hal=true ; CFLAGS="-DHAL -I/usr/include/hal -lhal $CFLAGS" ;;
no) hal=false ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-hal]) ;;
esac],[hal=false])
AM_CONDITIONAL([HAL], [test x$hal = xtrue])

PKG_CHECK_MODULES([USB_MODED], [
glib-2.0 >= 2.2.0
dbus-1 >= 1.2.1
Expand Down
9 changes: 8 additions & 1 deletion src/Makefile.am
Expand Up @@ -13,7 +13,6 @@ usb_moded_SOURCES = \
usb_moded.c \
usb_moded.h \
usb_moded-modes.h \
usb_moded-chargerdetection.c \
usb_moded-dbus.c \
usb_moded-dbus.h \
usb_moded-dbus-private.h \
Expand All @@ -29,6 +28,14 @@ usb_moded_SOURCES = \
usb_moded-config.h \
usb_moded-modesetting.c \
usb_moded-modesetting.h
if HAL
usb_moded_SOURCES += \
usb_moded-hal.c
else
usb_moded_SOURCES += \
usb_moded-chargerdetection.c
endif

if NOKIA
usb_moded_SOURCES += \
usb_moded-devicelock.h \
Expand Down

0 comments on commit aba9158

Please sign in to comment.