Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for auto mode of Ja Rule #803

Closed
wants to merge 4 commits into from
Closed

Add support for auto mode of Ja Rule #803

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e52df29
Add support for auto mode of Ja Rule
peternewman Jun 29, 2015
47d1e20
Fix the build
peternewman Jun 29, 2015
a09a7a4
Revert "Fix the build"
peternewman Jun 29, 2015
3fdbc6f
Revert "Add support for auto mode of Ja Rule"
peternewman Jun 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 27 additions & 14 deletions configure.ac
View file
Open in desktop
Expand Up @@ -124,9 +124,9 @@ AC_FUNC_STAT
AC_FUNC_CLOSEDIR_VOID
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([bzero gettimeofday memmove memset mkdir strdup strrchr \
if_nametoindex inet_ntoa inet_aton select socket strerror \
getifaddrs getloadavg getpwnam_r getpwuid_r getgrnam_r \
getgrgid_r secure_getenv])
if_nametoindex inet_ntoa inet_ntop inet_aton inet_pton select \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are ready for #788 .

socket strerror getifaddrs getloadavg getpwnam_r getpwuid_r \
getgrnam_r getgrgid_r secure_getenv])

LT_INIT
AC_PROG_LIBTOOL
Expand Down Expand Up @@ -667,10 +667,14 @@ AC_ARG_ENABLE(
# knows what to link against.
PLUGINS=""

# Force enable_usbdmx to yes when Ja Rule is explicitly requested.
# Force enable_usbdmx to yes when Ja Rule is explicitly requested,
# set to auto if Ja Rule is auto and usbdmx isn't yes
AS_IF([test "x$enable_ja_rule" = xyes],
[AS_ECHO(["Ja Rule is enabled, enabling the usbdmx plugin."])]
[enable_usbdmx="yes"])
[enable_usbdmx="yes"],
[test "x$enable_ja_rule" = xauto && test "x$enable_usbdmx" != xyes],
[AS_ECHO(["Ja Rule is set to auto, setting the usbdmx plugin to auto."])]
[enable_usbdmx="auto"])

PLUGIN_SUPPORT(artnet, USE_ARTNET)
PLUGIN_SUPPORT(dmx4linux, USE_DMX4LINUX, [$have_dmx4linux])
Expand Down Expand Up @@ -726,15 +730,24 @@ AC_SUBST(OLA_CLIENT_LIBS)

# Extra tools
#####################################################
AS_IF([test "x$enable_ja_rule" = xyes && test "x$enable_usbdmx" = xno],
[AC_MSG_ERROR([Ja Rule requires the usbdmx plugin, but it could not be enabled.])])
AS_IF([test "x$enable_ja_rule" = xyes && test "x$have_libusb" = xno],
[AC_MSG_ERROR([Ja Rule requires libusb, but it was not found on your system.])])
AS_IF([test "x$enable_ja_rule" = xyes && test "x$have_libusb_hotplug_api" = xno],
[AC_MSG_ERROR([Ja Rule requires libusb to have the hotplug capability (versions 1.0.16 \
and above), but the version found on your system doesn't appear to have it.])])

AM_CONDITIONAL([BUILD_JA_RULE], [test "x$enable_ja_rule" = xyes])
if [ "x$enable_ja_rule" = "xyes" ] || [ "x$enable_ja_rule" = "xauto" ] ; then
AS_IF([test "x$enable_ja_rule" = xyes && test "x$enable_usbdmx" = xno],
[AC_MSG_ERROR([Ja Rule requires the usbdmx plugin, but it could not be enabled.])],
[test "x$enable_usbdmx" = "xno"],
[enable_ja_rule="no"][AS_ECHO([Ja Rule requires the usbdmx plugin, but it could not be enabled.])])
AS_IF([test "x$enable_ja_rule" = xyes && test "x$have_libusb" = xno],
[AC_MSG_ERROR([Ja Rule requires libusb, but it was not found on your system.])],
[test "x$have_libusb" = "xno"],
[enable_ja_rule="no"][AS_ECHO([Ja Rule requires libusb, but it was not found on your system.])])
AS_IF([test "x$enable_ja_rule" = xyes && test "x$have_libusb_hotplug_api" = xno],
[AC_MSG_ERROR([Ja Rule requires libusb to have the hotplug capability (versions 1.0.16 \
and above), but the version found on your system doesn't appear to have it.])],
[test "x$have_libusb_hotplug_api" = "xno"],
[enable_ja_rule="no"][AS_ECHO([Ja Rule requires libusb to have the hotplug capability (versions 1.0.16 \
and above), but the version found on your system doesn't appear to have it.])])
fi

AM_CONDITIONAL([BUILD_JA_RULE], [test "x$enable_ja_rule" != xno])

# Status just for configure
BUILDING_JA_RULE='no'
Expand Down