diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-02-22 12:09:38 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-02-22 12:09:38 +0000 |
commit | b287d7f6a13823ea17e0bd415981d3a5953ca703 (patch) | |
tree | a420b28a35f7761f064d50bb610dbb2b46c71486 /Build/source/libs/zziplib | |
parent | 5fd6fd3479fcbbda52ebca7b5e80a5aaa1add69f (diff) |
build system: various small fixes for mingw32 cross compilation
still incomplete
git-svn-id: svn://tug.org/texlive/trunk@17141 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/zziplib')
-rw-r--r-- | Build/source/libs/zziplib/ChangeLog | 9 | ||||
-rw-r--r-- | Build/source/libs/zziplib/Makefile.in | 2 | ||||
-rwxr-xr-x | Build/source/libs/zziplib/configure | 35 | ||||
-rw-r--r-- | Build/source/libs/zziplib/configure.ac | 10 |
4 files changed, 47 insertions, 9 deletions
diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog new file mode 100644 index 00000000000..42a931e4484 --- /dev/null +++ b/Build/source/libs/zziplib/ChangeLog @@ -0,0 +1,9 @@ +2010-02-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Test for <zlib.h> requires to set ZLIB flags. + Test for <winnt.h> and <winbase.h> needs #include <windows.h>. + +2010-01-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in index dd81e032ee4..f2b199a1a0c 100644 --- a/Build/source/libs/zziplib/Makefile.in +++ b/Build/source/libs/zziplib/Makefile.in @@ -48,7 +48,7 @@ DIST_COMMON = README $(am__configure_deps) \ ../../build-aux/config.sub ../../build-aux/depcomp \ ../../build-aux/install-sh ../../build-aux/ltmain.sh \ ../../build-aux/missing ../../build-aux/texinfo.tex \ - ../../build-aux/ylwrap + ../../build-aux/ylwrap ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prefix_config_h.m4 \ $(top_srcdir)/m4/zziplib-aligned-access.m4 \ diff --git a/Build/source/libs/zziplib/configure b/Build/source/libs/zziplib/configure index 1a7acd1e708..248ef7d7278 100755 --- a/Build/source/libs/zziplib/configure +++ b/Build/source/libs/zziplib/configure @@ -4693,7 +4693,7 @@ fi done -for ac_header in stdint.h unistd.h windows.h winnt.h winbase.h sys/int_types.h +for ac_header in stdint.h unistd.h windows.h sys/int_types.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -4707,6 +4707,21 @@ fi done +for ac_header in winnt.h winbase.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <windows.h> +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + for ac_header in sys/types.h sys/mman.h sys/stat.h sys/param.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -4720,7 +4735,7 @@ _ACEOF fi done - for ac_header in io.h direct.h zlib.h byteswap.h + for ac_header in io.h direct.h byteswap.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -4751,8 +4766,8 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether can use mmap for file scanning" >&5 $as_echo_n "checking whether can use mmap for file scanning... " >&6; } enable_mmap='no (just a bit slower)' -test "$ac_cv_header_winbase_h" && enable_mmap="yes, winbase.h" -test "$ac_cv_header_sys_mman_h" && enable_mmap="yes, sys/mman.h" +test "x$ac_cv_header_winbase_h" = xyes && enable_mmap="yes, winbase.h" +test "x$ac_cv_header_sys_mman_h" = xyes && enable_mmap="yes, sys/mman.h" case "$enable_mmap" in yes*) ZZIPLIB_DEFINES='-D_USE_MMAP';; esac @@ -5431,6 +5446,18 @@ kpse_save_LIBS=$LIBS eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" eval LIBS=\"$ZLIB_LIBS \$LIBS\" +for ac_header in zlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" +if test "x$ac_cv_header_zlib_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ZLIB_H 1 +_ACEOF + +fi + +done + ac_fn_c_check_func "$LINENO" "zlibVersion" "ac_cv_func_zlibVersion" if test "x$ac_cv_func_zlibVersion" = x""yes; then : diff --git a/Build/source/libs/zziplib/configure.ac b/Build/source/libs/zziplib/configure.ac index 06f730dd67d..ac940feb1c2 100644 --- a/Build/source/libs/zziplib/configure.ac +++ b/Build/source/libs/zziplib/configure.ac @@ -31,16 +31,17 @@ KPSE_COMPILER_WARNINGS # Checks for header files. AC_HEADER_STDC AC_HEADER_DIRENT -AC_CHECK_HEADERS([stdint.h unistd.h windows.h winnt.h winbase.h sys/int_types.h]) +AC_CHECK_HEADERS([stdint.h unistd.h windows.h sys/int_types.h]) +AC_CHECK_HEADERS([winnt.h winbase.h], , , [#include <windows.h>]) AC_CHECK_HEADERS([sys/types.h sys/mman.h sys/stat.h sys/param.h]) dnl posix'ish -AC_CHECK_HEADERS([io.h direct.h zlib.h byteswap.h]) +AC_CHECK_HEADERS([io.h direct.h byteswap.h]) AC_CHECK_HEADERS([fnmatch.h]) # --------------------------------------------------------------- AC_MSG_CHECKING([whether can use mmap for file scanning]) enable_mmap='no (just a bit slower)' -test "$ac_cv_header_winbase_h" && enable_mmap="yes, winbase.h" -test "$ac_cv_header_sys_mman_h" && enable_mmap="yes, sys/mman.h" +test "x$ac_cv_header_winbase_h" = xyes && enable_mmap="yes, winbase.h" +test "x$ac_cv_header_sys_mman_h" = xyes && enable_mmap="yes, sys/mman.h" case "$enable_mmap" in yes*) ZZIPLIB_DEFINES='-D_USE_MMAP';; esac @@ -71,6 +72,7 @@ AM_CONDITIONAL([build], [test "x$enable_build" != xno]) if test "x$enable_build" != xno || test -f config.force; then KPSE_ADD_FLAGS([zlib]) +AC_CHECK_HEADERS([zlib.h]) AC_CHECK_FUNC([zlibVersion], , [AC_ERROR([zlib not found])]) KPSE_RESTORE_FLAGS |