AC_DEFINE([SILC_ALIGNMENT], SILC_SIZEOF_VOID_P, [SILC_ALIGNMENT])
])
-# Stack trace checking
-__SILC_ENABLE_STACKTRACE=""
-AC_MSG_CHECKING(whether to enable stack tracing)
-AC_ARG_ENABLE(stack-trace,
- [ --enable-stack-trace enable memory stack trace],
+# Memory trace checking
+__SILC_ENABLE_MEMTRACE=""
+AC_MSG_CHECKING(whether to enable memory tracing)
+AC_ARG_ENABLE(mem-trace,
+ [ --enable-mem-trace enable memory tracing],
[
case "${enableval}" in
yes)
AC_MSG_RESULT(yes)
- AC_DEFINE([SILC_STACKTRACE], [], [SILC_STACKTRACE])
- __SILC_ENABLE_STACKTRACE="#define __SILC_ENABLE_STACKTRACE 1"
+ AC_DEFINE([SILC_MEMTRACE], [], [SILC_MEMTRACE])
+ __SILC_ENABLE_MEMTRACE="#define __SILC_ENABLE_MEMTRACE 1"
CFLAGS="$CFLAGS -rdynamic"
PC_CFLAGS="$PC_CFLAGS -rdynamic"
;;
SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/contrib"
SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcutil"
+SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silchttp"
# Check for iconv support
fi
+# Check for Expat
+AC_ARG_WITH(expat,
+ [[ --with-expat[=DIR] use Expat XML [search in DIR/include and DIR/lib]]],
+ [
+ case "${withval}" in
+ no)
+ ;;
+ *)
+ if test -d $withval/include; then
+ CPPFLAGS="$CPPFLAGS -I$withval/include"
+ CFLAGS="$CFLAGS -I$withval/include"
+ fi
+ if test -d $withval/lib; then
+ LDFLAGS="$LDFLAGS -L$withval/lib"
+ fi
+ ;;
+ esac
+ ])
+
+AC_CHECK_HEADERS(expat.h,
+ [ LIBS="$LIBS -lexpat" ],
+ [ AC_MSG_ERROR(Expat XML Library is required to compile SRT) ])
+
+
##
## Native WIN32 compilation under cygwin
##
AC_SUBST(SILC_LIB_INCLUDES)
AC_SUBST(PC_CFLAGS)
AC_SUBST(__SILC_ENABLE_DEBUG)
-AC_SUBST(__SILC_ENABLE_STACKTRACE)
+AC_SUBST(__SILC_ENABLE_MEMTRACE)
AC_SUBST(__SILC_HAVE_PTHREAD)
AC_SUBST(__RUNTIME_PACKAGE_VERSION)
lib/silcutil/unix/Makefile
lib/silcutil/win32/Makefile
lib/silcutil/symbian/Makefile
+lib/silchttp/Makefile
+lib/silchttp/tests/Makefile
lib/srt.pc
)