--- mqtt/configure.in 2013/01/18 09:43:27 1.3 +++ mqtt/configure.in 2022/09/16 14:27:41 1.4.2.2 @@ -1,11 +1,14 @@ # # $Author: misho $ -# $Id: configure.in,v 1.3 2013/01/18 09:43:27 misho Exp $ +# $Id: configure.in,v 1.4.2.2 2022/09/16 14:27:41 misho Exp $ # -AC_INIT(mqtt, 1.3, misho@elwix.org) +AC_INIT(mqtt, 2.1, misho@elwix.org) AC_CONFIG_HEADERS(inc/config.h) AC_CONFIG_SRCDIR(src/mqttd.c) +ac_cv_func_malloc_0_nonnull="yes" +ac_cv_func_realloc_0_nonnull="yes" + # Checks for programs. AC_PROG_CC AC_PROG_RANLIB @@ -14,7 +17,7 @@ AC_PROG_INSTALL AC_CANONICAL_HOST AC_CANONICAL_TARGET -AC_CHECK_TOOL(MKDEP, mkdep, no) +AC_CHECK_TOOL(MKDEP, mkdep, ../mkdep) AC_SUBST(MKDEP) CFLAGS="-Wall -O2 -fPIC ${CFLAGS}" @@ -26,8 +29,7 @@ AC_CHECK_LIB([util], openpty) AC_CHECK_LIB([crypto], BF_set_key) AC_CHECK_LIB([pthread], pthread_create) AC_CHECK_LIB([sqlite3], sqlite3_reset) -AC_CHECK_LIB([aitcrc], crcFletcher16) -AC_CHECK_LIB([aitio], io_allocVar) +AC_CHECK_LIB([elwix], ait_allocVar) AC_CHECK_LIB([aitcfg], cfgLoadConfig) AC_CHECK_LIB([aitmqtt], mqtt_msgAlloc) AC_CHECK_LIB([aitsched], schedRun) @@ -68,6 +70,21 @@ AC_ARG_WITH(sqlite3dir, [ SQLITE3DIR="$withval" ], ) AC_MSG_RESULT($SQLITE3DIR) AC_SUBST(SQLITE3DIR) + +SQLITE3INC="" +AC_MSG_CHECKING(SQLite3 include directory) +AC_ARG_WITH(sqlite3inc, + [ --with-sqlite3inc= Custom SQLite3 include directory ], + [ SQLITE3INC="$withval" ], ) +AC_MSG_RESULT($SQLITE3INC) +AC_SUBST(SQLITE3INC) +SQLITE3LIB="" +AC_MSG_CHECKING(SQLite3 library directory) +AC_ARG_WITH(sqlite3lib, + [ --with-sqlite3lib= Custom SQLite3 library directory ], + [ SQLITE3LIB="$withval" ], ) +AC_MSG_RESULT($SQLITE3LIB) +AC_SUBST(SQLITE3LIB) AC_CONFIG_FILES([Makefile bin/Makefile