diff --git a/configure.ac b/configure.ac
index ba749ab8946f64acc1f93eb4907d65be3e3aa435..9521aaf131b10b922f7f5af8bfd08e773d684982 100644 (file)
--- a/configure.ac
+++ b/configure.ac
#
-# Copyright (c) 2013, Texas Instruments Incorporated
+# Copyright (c) 2013-2015 Texas Instruments Incorporated - http://www.ti.com
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
AC_CONFIG_AUX_DIR([linux/build-aux])
# Initilize automake
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
# Disabling maintainer mode to prevent rebuild of configure script
AM_MAINTAINER_MODE([disable])
# Initalize libtool but disable fortran check
+LT_INIT
define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
AC_PROG_LIBTOOL(gcc)
# Add config variables/options and check them
# Note that 6614 isn't documented and, though it may work, is planned for removal
-AC_ARG_VAR(PLATFORM, Platform to build. Options are: 'OMAPL138' 'OMAP54XX' 'TCI6636' 'TCI6638' and 'DRA7XX'. If not defined all platforms will be built.)
+AC_ARG_VAR(PLATFORM, Platform to build. Options are: 'OMAPL138' 'OMAP54XX' '66AK2E' 'TCI6630' 'TCI6636' 'TCI6638' '66AK2G' and 'DRA7XX'. If not defined all platforms will be built.)
AC_ARG_VAR(CMEM_INSTALL_DIR, Installation path directory to the CMEM libraries)
AC_ARG_VAR(KERNEL_INSTALL_DIR, Installation path to the Linux kernel.)
+AC_ARG_VAR(AF_RPMSG, Address Family used by the RPMSG driver)
AC_ARG_VAR(DRM_PREFIX, Installation location to the DRM library.)
# Test platform variable for setting
AS_IF([test "x$PLATFORM" = "xOMAPL138"],
+ [AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
+ [AS_IF([test "x$PLATFORM" = "x66AK2E"],
[AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
[AS_IF([test "x$PLATFORM" = "xTCI6614"],
[AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
+ [AS_IF([test "x$PLATFORM" = "xTCI6630"],
+ [AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
[AS_IF([test "x$PLATFORM" = "xTCI6636"],
[AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
[AS_IF([test "x$PLATFORM" = "xTCI6638"],
[AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
+ [AS_IF([test "x$PLATFORM" = "x66AK2G"],
+ [AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
[AS_IF([test "x$PLATFORM" = "xOMAP54XX"],
[AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
[AS_IF([test "x$PLATFORM" = "xDRA7XX"],
[AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
[AS_IF([test "x$PLATFORM" = "x"],
[AC_MSG_NOTICE([PLATFORM is not set. All supported platforms will be built ....])],
- [AC_MSG_ERROR([PLATFORM is set to "${PLATFORM}": run ./configure --help for available PLATFORM options])])])])])])])])
+ [AC_MSG_ERROR([PLATFORM is set to "${PLATFORM}": run ./configure --help for available PLATFORM options])])])])])])])])])])])
-# Test for required KERNEL path
-AS_IF([test "x$KERNEL_INSTALL_DIR" = "x"],
- [AC_MSG_ERROR([Kernel path for ${PLATFORM} is not set])])
+# If platform is specified, make sure at least one of
+# KERNEL_INSTALL_DIR or AF_MSG are set.
+AS_IF([test -n "$PLATFORM" -a -z "$KERNEL_INSTALL_DIR" -a -z "$AF_RPMSG"],
+ [AC_MSG_ERROR([Must set at least one of KERNEL_INSTALL_DIR or AF_RPMSG])])
# Ignore KERNEL path when no platform is set
AS_IF([test "x$PLATFORM" = "x"], [KERNEL_INSTALL_DIR=])
AC_SUBST([PLATFORM])
AC_SUBST([CMEM_INSTALL_DIR])
AC_SUBST([KERNEL_INSTALL_DIR])
+AC_SUBST([AF_RPMSG])
AC_SUBST([DRM_PREFIX])
# Define specific variables to be used in Makefile.am
AM_CONDITIONAL([OMAPL138], [test "x$PLATFORM" = "xOMAPL138"])
+AM_CONDITIONAL([C66AK2E], [test "x$PLATFORM" = "x66AK2E"])
AM_CONDITIONAL([TCI6614], [test "x$PLATFORM" = "xTCI6614"])
+AM_CONDITIONAL([TCI6630], [test "x$PLATFORM" = "xTCI6630"])
AM_CONDITIONAL([TCI6636], [test "x$PLATFORM" = "xTCI6636"])
AM_CONDITIONAL([TCI6638], [test "x$PLATFORM" = "xTCI6638"])
+AM_CONDITIONAL([C66AK2G], [test "x$PLATFORM" = "x66AK2G"])
AM_CONDITIONAL([OMAP54XX_SMP], [test "x$PLATFORM" = "xOMAP54XX"])
AM_CONDITIONAL([DRA7XX], [test "x$PLATFORM" = "xDRA7XX"])
AM_CONDITIONAL([CMEM], [test "x$CMEM_INSTALL_DIR" != "x"])
AM_CONDITIONAL([KDIR], [test "x$KERNEL_INSTALL_DIR" != "x"])
+AM_CONDITIONAL([KERNEL_INSTALL_DIR], [test -n "$KERNEL_INSTALL_DIR"])
AM_CONDITIONAL([DRM], [test "x$DRM_PREFIX" != "x"])
+AM_CONDITIONAL([AF_RPMSG], [test -n "$AF_RPMSG"])
# Generate Makefile(s)
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([linux/etc/Makefile])
AC_CONFIG_FILES([linux/src/utils/Makefile])
+AC_CONFIG_FILES([linux/src/utils/libtiipcutils.pc])
AC_CONFIG_FILES([linux/src/api/Makefile])
+AC_CONFIG_FILES([linux/src/api/libtiipc.pc])
AC_CONFIG_FILES([linux/src/mm/Makefile])
+AC_CONFIG_FILES([linux/src/mm/libmmrpc.pc])
AC_CONFIG_FILES([linux/src/daemon/Makefile])
AC_CONFIG_FILES([linux/src/tests/Makefile])
+AC_CONFIG_FILES([linux/src/transport/Makefile])
AC_OUTPUT
echo \