owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP. Remote compilation option

Browse Source
This commit is contained in:
emeric
2015-07-28 18:04:21 +02:00
committed by emeric
parent b56a170567
commit e3b36bcd8b
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+18 -11
View File
@@ -8,22 +8,34 @@ AC_LANG_CPLUSPLUS
# Checks for programs # Checks for programs
AC_PROG_CXX AC_PROG_CXX
AC_ARG_ENABLE(remote, AS_HELP_STRING([--enable-remote],
[Build with the remote protocol support. Defaults to yes.])],
[enable_remote="$enableval"],
[enable_remote="yes"])
# ProtoBuf compiler. # ProtoBuf compiler.
# First, specify with --with-protoc=/path/of/protoc. # First, specify with --with-protoc=/path/of/protoc.
# Or, specify with env variable PROTOC. # Or, specify with env variable PROTOC.
# If neither of the above, find it in the path. # If neither of the above, find it in the path.
#AC_MSG_CHECKING([for ProtoBuf compiler protoc]) AS_IF([test "$enable_remote" = "yes"],
AC_ARG_WITH([protoc], [AC_ARG_WITH([protoc],
[AS_HELP_STRING([--with-protoc=/path/of/protoc], [AS_HELP_STRING([--with-protoc=/path/of/protoc],
[Location of the protocol buffers compiler protoc. Defaults to looking on path.])], [Location of the protocol buffers compiler protoc. Defaults to looking on path.])],
[PROTOC="$withval"], [PROTOC="$withval"],
[ AS_IF([test "x${PROTOC}" == "x"], [ AS_IF([test "x${PROTOC}" == "x"],
[AC_PATH_PROG([PROTOC], [protoc], [no])])] [AC_PATH_PROG([PROTOC], [protoc], [no])])]
) )
]
#AC_MSG_RESULT([${PROTOC}]) [ AS_IF([test "${PROTOC}" == "no"], [AC_MSG_ERROR([ProtoBuf compiler "protoc" not found.])]) ]
AS_IF([test "${PROTOC}" == "no"], [AC_MSG_ERROR([ProtoBuf compiler "protoc" not found.])]) [AC_CHECK_LIB( [protobuf],
[main],
,
[AC_MSG_ERROR([libprotobuf not found!])])]
[AC_DEFINE(REMOTE_ENABLE, 1, [Remote support disabled])]
,
[AC_DEFINE(REMOTE_ENABLE, 0, [Remote support enabled])]
)
AC_CHECK_HEADERS([Wt/WApplication jpeglib.h], AC_CHECK_HEADERS([Wt/WApplication jpeglib.h],
[], [],
@@ -114,11 +126,6 @@ AC_CHECK_LIB( [boost_log_setup],
, ,
[AC_MSG_ERROR([libboost_log_setup not found!])]) [AC_MSG_ERROR([libboost_log_setup not found!])])
AC_CHECK_LIB( [protobuf],
[main],
,
[AC_MSG_ERROR([libprotobuf not found!])])
# TODO -> PARAMETRIZE THIS # TODO -> PARAMETRIZE THIS
AC_CHECK_LIB([wthttp], AC_CHECK_LIB([wthttp],
[main], [main],