[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
tinc/m4 lzo.m4,1.1.2.2,1.1.2.3 openssl.m4,1.1.2.16,1.1.2.17 zlib.m4,1.1.2.3,1.1.2.4
Update of /home/CVS/tinc/m4
In directory humbolt:/tmp/cvs-serv10497
Modified Files:
Tag: CABAL
lzo.m4 openssl.m4 zlib.m4
Log Message:
Use CPPFLAGS, LDFLAGS and LIBS as appropiate.
Index: lzo.m4
===================================================================
RCS file: /home/CVS/tinc/m4/lzo.m4,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- lzo.m4 2003/07/29 11:50:39 1.1.2.2
+++ lzo.m4 2003/10/06 16:05:30 1.1.2.3
@@ -2,35 +2,29 @@
AC_DEFUN(tinc_LZO,
[
- tinc_ac_save_CPPFLAGS="$CPPFLAGS"
-
AC_ARG_WITH(lzo,
AC_HELP_STRING([--with-lzo=DIR], [lzo base directory, or:]),
[lzo="$withval"
- CFLAGS="$CFLAGS -I$withval/include"
CPPFLAGS="$CPPFLAGS -I$withval/include"
- LIBS="$LIBS -L$withval/lib"]
+ LDFLAGS="$LDFLAGS -L$withval/lib"]
)
AC_ARG_WITH(lzo-include,
AC_HELP_STRING([--with-lzo-include=DIR], [lzo headers directory]),
[lzo_include="$withval"
- CFLAGS="$CFLAGS -I$withval"
CPPFLAGS="$CPPFLAGS -I$withval"]
)
AC_ARG_WITH(lzo-lib,
AC_HELP_STRING([--with-lzo-lib=DIR], [lzo library directory]),
[lzo_lib="$withval"
- LIBS="$LIBS -L$withval"]
+ LDFLAGS="$LDFLAGS -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"],
Index: openssl.m4
===================================================================
RCS file: /home/CVS/tinc/m4/openssl.m4,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- openssl.m4 2003/07/29 11:50:39 1.1.2.16
+++ openssl.m4 2003/10/06 16:05:30 1.1.2.17
@@ -2,35 +2,29 @@
AC_DEFUN(tinc_OPENSSL,
[
- tinc_ac_save_CPPFLAGS="$CPPFLAGS"
-
AC_ARG_WITH(openssl,
AC_HELP_STRING([--with-openssl=DIR], [OpenSSL base directory, or:]),
[openssl="$withval"
- CFLAGS="$CFLAGS -I$withval/include"
CPPFLAGS="$CPPFLAGS -I$withval/include"
- LIBS="$LIBS -L$withval/lib"]
+ LDFLAGS="$LDFLAGS -L$withval/lib"]
)
AC_ARG_WITH(openssl-include,
AC_HELP_STRING([--with-openssl-include=DIR], [OpenSSL headers directory (without trailing /openssl)]),
[openssl_include="$withval"
- CFLAGS="$CFLAGS -I$withval"
CPPFLAGS="$CPPFLAGS -I$withval"]
)
AC_ARG_WITH(openssl-lib,
AC_HELP_STRING([--with-openssl-lib=DIR], [OpenSSL library directory]),
[openssl_lib="$withval"
- LIBS="$LIBS -L$withval"]
+ LDFLAGS="$LDFLAGS -L$withval"]
)
AC_CHECK_HEADERS(openssl/evp.h openssl/rsa.h openssl/rand.h openssl/err.h openssl/sha.h openssl/pem.h,
[],
[AC_MSG_ERROR([OpenSSL header files not found.]); break]
)
-
- CPPFLAGS="$tinc_ac_save_CPPFLAGS"
case $host_os in
*mingw*)
Index: zlib.m4
===================================================================
RCS file: /home/CVS/tinc/m4/zlib.m4,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- zlib.m4 2003/07/29 11:50:39 1.1.2.3
+++ zlib.m4 2003/10/06 16:05:30 1.1.2.4
@@ -2,35 +2,29 @@
AC_DEFUN(tinc_ZLIB,
[
- tinc_ac_save_CPPFLAGS="$CPPFLAGS"
-
AC_ARG_WITH(zlib,
AC_HELP_STRING([--with-zlib=DIR], [zlib base directory, or:]),
[zlib="$withval"
- CFLAGS="$CFLAGS -I$withval/include"
CPPFLAGS="$CPPFLAGS -I$withval/include"
- LIBS="$LIBS -L$withval/lib"]
+ LDFLAGS="$LDFLAGS -L$withval/lib"]
)
AC_ARG_WITH(zlib-include,
AC_HELP_STRING([--with-zlib-include=DIR], [zlib headers directory]),
[zlib_include="$withval"
- CFLAGS="$CFLAGS -I$withval"
CPPFLAGS="$CPPFLAGS -I$withval"]
)
AC_ARG_WITH(zlib-lib,
AC_HELP_STRING([--with-zlib-lib=DIR], [zlib library directory]),
[zlib_lib="$withval"
- LIBS="$LIBS -L$withval"]
+ LDFLAGS="$LDFLAGS -L$withval"]
)
AC_CHECK_HEADERS(zlib.h,
[],
[AC_MSG_ERROR("zlib header files not found."); break]
)
-
- CPPFLAGS="$tinc_ac_save_CPPFLAGS"
AC_CHECK_LIB(z, compress2,
[LIBS="$LIBS -lz"],
--
Tinc-cvs: CVS changelog list for the tinc VPN daemon
Archive: http://mail.nl.linux.org/tinc-cvs/
Tinc site: http://tinc.nl.linux.org/