j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Use CPPFLAGS, LDFLAGS and LIBS as appropiate.

Browse source
This commit is contained in:
Guus Sliepen 2003-10-06 16:05:30 +00:00
parent 6350334aa4
commit e898b930dc
3 changed files with 6 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
m4/lzo.m4
View file

@ -2,27 +2,23 @@ dnl Check to find the lzo headers/libraries
AC_DEFUN(tinc_LZO, AC_DEFUN(tinc_LZO,
[ [
tinc_ac_save_CPPFLAGS="$CPPFLAGS"
AC_ARG_WITH(lzo, AC_ARG_WITH(lzo,
AC_HELP_STRING([--with-lzo=DIR], [lzo base directory, or:]), AC_HELP_STRING([--with-lzo=DIR], [lzo base directory, or:]),
[lzo="$withval" [lzo="$withval"
CFLAGS="$CFLAGS -I$withval/include"
CPPFLAGS="$CPPFLAGS -I$withval/include" CPPFLAGS="$CPPFLAGS -I$withval/include"
LIBS="$LIBS -L$withval/lib"] LDFLAGS="$LDFLAGS -L$withval/lib"]
) )
AC_ARG_WITH(lzo-include, AC_ARG_WITH(lzo-include,
AC_HELP_STRING([--with-lzo-include=DIR], [lzo headers directory]), AC_HELP_STRING([--with-lzo-include=DIR], [lzo headers directory]),
[lzo_include="$withval" [lzo_include="$withval"
CFLAGS="$CFLAGS -I$withval"
CPPFLAGS="$CPPFLAGS -I$withval"] CPPFLAGS="$CPPFLAGS -I$withval"]
) )
AC_ARG_WITH(lzo-lib, AC_ARG_WITH(lzo-lib,
AC_HELP_STRING([--with-lzo-lib=DIR], [lzo library directory]), AC_HELP_STRING([--with-lzo-lib=DIR], [lzo library directory]),
[lzo_lib="$withval" [lzo_lib="$withval"
LIBS="$LIBS -L$withval"] LDFLAGS="$LDFLAGS -L$withval"]
) )
AC_CHECK_HEADERS(lzo1x.h, AC_CHECK_HEADERS(lzo1x.h,
@ -30,8 +26,6 @@ AC_DEFUN(tinc_LZO,
[AC_MSG_ERROR("lzo header files not found."); break] [AC_MSG_ERROR("lzo header files not found."); break]
) )
CPPFLAGS="$tinc_ac_save_CPPFLAGS"
AC_CHECK_LIB(lzo, lzo1x_1_compress, AC_CHECK_LIB(lzo, lzo1x_1_compress,
[LIBS="$LIBS -llzo"], [LIBS="$LIBS -llzo"],
[AC_MSG_ERROR("lzo libraries not found.")] [AC_MSG_ERROR("lzo libraries not found.")]

10
m4/openssl.m4
View file

@ -2,27 +2,23 @@ dnl Check to find the OpenSSL headers/libraries
AC_DEFUN(tinc_OPENSSL, AC_DEFUN(tinc_OPENSSL,
[ [
tinc_ac_save_CPPFLAGS="$CPPFLAGS"
AC_ARG_WITH(openssl, AC_ARG_WITH(openssl,
AC_HELP_STRING([--with-openssl=DIR], [OpenSSL base directory, or:]), AC_HELP_STRING([--with-openssl=DIR], [OpenSSL base directory, or:]),
[openssl="$withval" [openssl="$withval"
CFLAGS="$CFLAGS -I$withval/include"
CPPFLAGS="$CPPFLAGS -I$withval/include" CPPFLAGS="$CPPFLAGS -I$withval/include"
LIBS="$LIBS -L$withval/lib"] LDFLAGS="$LDFLAGS -L$withval/lib"]
) )
AC_ARG_WITH(openssl-include, AC_ARG_WITH(openssl-include,
AC_HELP_STRING([--with-openssl-include=DIR], [OpenSSL headers directory (without trailing /openssl)]), AC_HELP_STRING([--with-openssl-include=DIR], [OpenSSL headers directory (without trailing /openssl)]),
[openssl_include="$withval" [openssl_include="$withval"
CFLAGS="$CFLAGS -I$withval"
CPPFLAGS="$CPPFLAGS -I$withval"] CPPFLAGS="$CPPFLAGS -I$withval"]
) )
AC_ARG_WITH(openssl-lib, AC_ARG_WITH(openssl-lib,
AC_HELP_STRING([--with-openssl-lib=DIR], [OpenSSL library directory]), AC_HELP_STRING([--with-openssl-lib=DIR], [OpenSSL library directory]),
[openssl_lib="$withval" [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_CHECK_HEADERS(openssl/evp.h openssl/rsa.h openssl/rand.h openssl/err.h openssl/sha.h openssl/pem.h,
@ -30,8 +26,6 @@ AC_DEFUN(tinc_OPENSSL,
[AC_MSG_ERROR([OpenSSL header files not found.]); break] [AC_MSG_ERROR([OpenSSL header files not found.]); break]
) )
CPPFLAGS="$tinc_ac_save_CPPFLAGS"
case $host_os in case $host_os in
*mingw*) *mingw*)
AC_CHECK_LIB(crypto, SHA1_version, AC_CHECK_LIB(crypto, SHA1_version,

10
m4/zlib.m4
View file

@ -2,27 +2,23 @@ dnl Check to find the zlib headers/libraries
AC_DEFUN(tinc_ZLIB, AC_DEFUN(tinc_ZLIB,
[ [
tinc_ac_save_CPPFLAGS="$CPPFLAGS"
AC_ARG_WITH(zlib, AC_ARG_WITH(zlib,
AC_HELP_STRING([--with-zlib=DIR], [zlib base directory, or:]), AC_HELP_STRING([--with-zlib=DIR], [zlib base directory, or:]),
[zlib="$withval" [zlib="$withval"
CFLAGS="$CFLAGS -I$withval/include"
CPPFLAGS="$CPPFLAGS -I$withval/include" CPPFLAGS="$CPPFLAGS -I$withval/include"
LIBS="$LIBS -L$withval/lib"] LDFLAGS="$LDFLAGS -L$withval/lib"]
) )
AC_ARG_WITH(zlib-include, AC_ARG_WITH(zlib-include,
AC_HELP_STRING([--with-zlib-include=DIR], [zlib headers directory]), AC_HELP_STRING([--with-zlib-include=DIR], [zlib headers directory]),
[zlib_include="$withval" [zlib_include="$withval"
CFLAGS="$CFLAGS -I$withval"
CPPFLAGS="$CPPFLAGS -I$withval"] CPPFLAGS="$CPPFLAGS -I$withval"]
) )
AC_ARG_WITH(zlib-lib, AC_ARG_WITH(zlib-lib,
AC_HELP_STRING([--with-zlib-lib=DIR], [zlib library directory]), AC_HELP_STRING([--with-zlib-lib=DIR], [zlib library directory]),
[zlib_lib="$withval" [zlib_lib="$withval"
LIBS="$LIBS -L$withval"] LDFLAGS="$LDFLAGS -L$withval"]
) )
AC_CHECK_HEADERS(zlib.h, AC_CHECK_HEADERS(zlib.h,
@ -30,8 +26,6 @@ AC_DEFUN(tinc_ZLIB,
[AC_MSG_ERROR("zlib header files not found."); break] [AC_MSG_ERROR("zlib header files not found."); break]
) )
CPPFLAGS="$tinc_ac_save_CPPFLAGS"
AC_CHECK_LIB(z, compress2, AC_CHECK_LIB(z, compress2,
[LIBS="$LIBS -lz"], [LIBS="$LIBS -lz"],
[AC_MSG_ERROR("zlib libraries not found.")] [AC_MSG_ERROR("zlib libraries not found.")]