Fix warning and add missing checks for LZO library.
This commit is contained in:
parent
f238c209f4
commit
4b0e5a03fe
2 changed files with 33 additions and 2 deletions
31
m4/lzo.m4
Normal file
31
m4/lzo.m4
Normal file
|
@ -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.")]
|
||||||
|
)
|
||||||
|
])
|
|
@ -1,5 +1,5 @@
|
||||||
## Produce this file with automake to get Makefile.in
|
## 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
|
sbin_PROGRAMS = tincd
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ tincd_LDADD = \
|
||||||
|
|
||||||
localedir = $(datadir)/locale
|
localedir = $(datadir)/locale
|
||||||
|
|
||||||
CFLAGS = @CFLAGS@ -DPKGLIBDIR=$(pkglibdir) -DCONFDIR=\"$(sysconfdir)\" \
|
AM_CFLAGS = @CFLAGS@ -DPKGLIBDIR=$(pkglibdir) -DCONFDIR=\"$(sysconfdir)\" \
|
||||||
-DLOCALEDIR=\"$(localedir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
|
-DLOCALEDIR=\"$(localedir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
|
||||||
|
|
||||||
dist-hook:
|
dist-hook:
|
||||||
|
|
Loading…
Add table
Reference in a new issue