diff --git a/Makefile.am b/Makefile.am index 2c15d00..5906b10 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +ACLOCAL_AMFLAGS = -I /tmp/aclocal + if BUILD_EXAMPLES EXAMPLES = examples else diff --git a/configure.ac b/configure.ac index f03444b..183f7b4 100644 --- a/configure.ac +++ b/configure.ac @@ -2,9 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(libsntl, 0.2.1) -#LDFLAGS="$LDFLAGS -L/mingw/lib -L/local/lib" - -AC_CONFIG_MACRO_DIR(['aclocal']) +AC_CONFIG_MACRO_DIR(['/tmp/aclocal']) AC_CONFIG_HEADERS([config.h]) @@ -12,6 +10,8 @@ AM_INIT_AUTOMAKE([1.11]) AM_SILENT_RULES([yes]) +CC=${CC-/opt/windows_64/bin/x86_64-w64-mingw32-g++.exe} + AC_PROG_CC LT_INIT @@ -29,22 +29,12 @@ AS_IF([test "x$enable_build_examples" = "xyes"], [ AM_CONDITIONAL(BUILD_EXAMPLES, test "x$enable_build_examples" = "xyes") -dnl ************win32********* +AC_DEFINE([BUILD_WIN32], 1, [build for win32]) -AC_ARG_ENABLE([win32], - AS_HELP_STRING([--enable-win32-build], [Enable win32 build mode])) -AS_IF([test "x$enable_win32_build" = "xyes"], [ - AC_DEFINE([BUILD_WIN32], 1, [build for win32]), - LDFLAGS="$LDFLAGS -L/mingw/lib -L/local/lib" -], - [ - PKG_CHECK_MODULES(LIBUUID, [uuid]) - ] -) +dnl PKG_CHECK_MODULES(LIBUUID, [uuid]) PKG_CHECK_MODULES(OPENSSL, [openssl]) -dnl PKG_CHECK_MODULES(LIBUUID, [uuid]) PKG_CHECK_MODULES(LIBTDATA, [libtdata >= 0.2.2]) PKG_CHECK_MODULES(LIBSEXPR, [libsexpr >= 1.3.1]) diff --git a/debian/compat b/debian/compat index 45a4fb7..68311b4 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +¸ diff --git a/lib/Makefile.am b/lib/Makefile.am index eaa6fbb..0005599 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -4,7 +4,9 @@ AM_CPPFLAGS = \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \ - $(LIBSNTL_CFLAGS) -I../include + $(LIBSNTL_CFLAGS) -I../include \ + -I/include -I../../libtdata/include/ \ + -I../../libsexpr/include/ AM_CFLAGS =\ -Wall\ @@ -16,7 +18,9 @@ lib_LTLIBRARIES = libsntl.la libsntl_la_SOURCES = \ support.c queue.c rpclist.c message.c channel.c connection.c -libsntl_la_LDFLAGS = -Wl,--export-dynamic +libsntl_la_LDFLAGS = + + libsntl_la_LIBADD = -lpthread -lcrypto $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS)