AC_PREREQ(2.59)
-AC_INIT([libcec], [2:0:0], [http://libcec.pulse-eight.com/])
+AC_INIT([libcec], [2:1:0], [http://libcec.pulse-eight.com/])
AC_CONFIG_HEADERS([config.h])
AH_TOP([#pragma once])
msg_dl_missing="required library 'dl' is missing"
msg_udev_missing="library 'udev' is missing - adapter detection will not be available"
msg_dirent_missing="dirent.h header is missing - adapter detection will not be available"
-msg_lockdev_missing="required library 'liblockdev' is missing"
+msg_lockdev_missing="library 'liblockdev' is missing"
msg_rpi_api_missing="Raspberry Pi API not found or incompatible with libCEC"
msg_rpi_will_check="will check for RPi support"
msg_rpi_unsupported_target="will not check for RPi support (unsupported cpu: ${host_cpu})"
[use_optimisation=$enableval],
[use_optimisation=yes])
-## CuBox support
+## TDA995x support
AC_ARG_ENABLE([cubox],
- [AS_HELP_STRING([--enable-cubox],
- [enable support for the CuBox (default is no)])],
+ [AS_HELP_STRING([--enable-tda995x],
+ [enable support for the TDA995x (default is no)])],
[use_tda995x=$enableval],
[use_tda995x=no])
AC_ARG_WITH([rpi-include-path],
[AS_HELP_STRING([--with-rpi-include-path],
[location of the Raspberry Pi headers (location of /opt/vc/include, default is auto)])],
- [RPI_CFLAGS="-I$withval -I$withval/interface/vcos/pthreads"])
+ [RPI_CFLAGS="-I$withval -I$withval/interface/vcos/pthreads -I$withval/interface/vmcs_host/linux"])
## Optional path to libbcm_host.so
AC_ARG_WITH([rpi-lib-path],
case "${host}" in
*-*-linux*)
# for timeutils
- LIBS="$LIBS -lrt"
+ AC_SEARCH_LIBS([clock_gettime], [rt])
;;
*-apple-darwin*)
LIBS="$LIBS -framework CoreVideo -framework IOKit"
## search for udev, lockdev and the RPi API, only required by libCEC
use_udev="no"
use_adapter_detection="yes"
+use_lockdev="no"
case "${host}" in
*-*-linux*)
## search for udev if pkg-config was found
fi
## search for lockdev
- AC_CHECK_HEADER(lockdev.h,,AC_MSG_ERROR($msg_lockdev_missing))
- AC_CHECK_LIB(lockdev,dev_unlock,,AC_MSG_ERROR($msg_lockdev_missing))
+ use_lockdev="yes"
+ AC_CHECK_HEADER(lockdev.h,,[use_lockdev="no";AC_MSG_WARN($msg_lockdev_missing)])
+ AC_CHECK_LIB(lockdev,dev_unlock,,[use_lockdev="no";AC_MSG_WARN($msg_lockdev_missing)])
AC_CHECK_HEADER(time.h,,AC_MSG_ERROR($msg_required_header_missing))
AC_CHECK_HEADER(sys/prctl.h,,AC_MSG_ERROR($msg_required_header_missing))
AC_DEFINE([HAVE_P8_USB],[1],[Define to 1 to include support for the Pulse-Eight USB-CEC Adapter])
AM_CONDITIONAL(USE_P8_USB, true)
+if test "x$use_lockdev" = "xyes"; then
+ AC_DEFINE([HAVE_LOCKDEV],[1],[Define to 1 if liblockdev is installed])
+fi
+
## mark adapter detection as available if the required deps were found
if test "x$use_adapter_detection" = "xyes"; then
## mark udev as available if it was found
features="$features\n Raspberry Pi support :\t\tno"
fi
-## mark CuBox support as available
+## mark TDA995x support as available
if test "x$use_tda995x" != "xno"; then
AC_DEFINE([HAVE_TDA995X_API],[1],[Define to 1 to include CuBox support])
AM_CONDITIONAL(USE_TDA995X_API, true)
- features="$features\n CuBox support :\t\t\tyes"
- LIB_INFO="$LIB_INFO 'CuBox'"
+ features="$features\n TDA995x support :\t\t\tyes"
+ LIB_INFO="$LIB_INFO 'TDA995x'"
CPPFLAGS="$CPPFLAGS $TDA995X_CFLAGS"
else
AM_CONDITIONAL(USE_TDA995X_API, false)
- features="$features\n CuBox support :\t\t\tno"
+ features="$features\n TDA995x support :\t\t\tno"
fi
## check if our build system is complete
LIB_INFO="$LIB_INFO on `uname -s` `uname -r` (`uname -m`)"
fi
-## redefine the LIBS, so cec-client and cec-config aren't linked against things they don't need
+## redefine the LIBS, so cec-client isn't linked against things they don't need
LIBS_LIBCEC="$LIBS"
LIBS="$libs_client"
-CXXFLAGS="$CXXFLAGS -fPIC -Wall -Wextra -Werror -Wno-missing-field-initializers"
+CXXFLAGS="$CXXFLAGS -fPIC -Wall -Wextra -Wno-missing-field-initializers -Wno-psabi"
if test "x$use_debug" = "xyes"; then
CXXFLAGS="$CXXFLAGS -g"
AC_SUBST([USE_P8_USB_DETECT])
AC_SUBST([USE_RPI_API])
AC_CONFIG_FILES([src/lib/libcec.pc])
-AC_OUTPUT([Makefile src/lib/Makefile src/testclient/Makefile src/cec-config/Makefile])
+AC_OUTPUT([Makefile src/lib/Makefile src/testclient/Makefile])
cat <<EOB