Fix warning and add missing checks for LZO library.

diff --git a/m4/lzo.m4 b/m4/lzo.m4
new file mode 100644 (file)
index 0000000..58011f1
--- /dev/null
+++ b/m4/lzo.m4
@@ -0,0 +1,31 @@
+dnl Check to find the lzo headers/libraries
+
+AC_DEFUN(tinc_LZO,
+[
+  tinc_ac_save_CPPFLAGS="$CPPFLAGS"
+
+  AC_ARG_WITH(lzo-include,
+    [  --with-lzo-include=DIR lzo headers directory],
+    [lzo_include="$withval"
+     CFLAGS="$CFLAGS -I$withval"
+     CPPFLAGS="$CPPFLAGS -I$withval"]
+  )
+
+  AC_ARG_WITH(lzo-lib,
+    [  --with-lzo-lib=DIR     lzo library directory],
+    [lzo_lib="$withval"
+     LIBS="$LIBS -L$withval"]
+  )
+
+  AC_CHECK_HEADERS(lzo1x.h,
+    [],
+    [AC_MSG_ERROR("lzo header files not found."); break]
+  )
+
+  CPPFLAGS="$tinc_ac_save_CPPFLAGS"
+
+  AC_CHECK_LIB(lzo, lzo1x_1_compress,
+    [LIBS="$LIBS -llzo"],
+    [AC_MSG_ERROR("lzo libraries not found.")]
+  )
+])

diff --git a/src/Makefile.am b/src/Makefile.am
index f7e9462ad2d0cb38b8ddfd2d64f0b3e4d45df453..bc34d53225c1d97aca371447f978ae1cf91070d1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 ## Produce this file with automake to get Makefile.in
-# $Id: Makefile.am,v 1.4.4.28 2002/09/10 21:46:05 guus Exp $
+# $Id: Makefile.am,v 1.4.4.29 2003/06/07 13:18:31 guus Exp $
 
 sbin_PROGRAMS = tincd
 
@@ -21,7 +21,7 @@ tincd_LDADD = \
 
 localedir = $(datadir)/locale
 
-CFLAGS = @CFLAGS@ -DPKGLIBDIR=$(pkglibdir) -DCONFDIR=\"$(sysconfdir)\" \
+AM_CFLAGS = @CFLAGS@ -DPKGLIBDIR=$(pkglibdir) -DCONFDIR=\"$(sysconfdir)\"      \
        -DLOCALEDIR=\"$(localedir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
 
 dist-hook: