Skip to content
Snippets Groups Projects
Unverified Commit 30412d91 authored by Christian Heimes's avatar Christian Heimes Committed by GitHub
Browse files

[3.11] gh-94801: Use custom flags to check for headers and libs (GH-94802) (GH-94881) 


Co-authored-by: default avatarChristian Heimes <christian@python.org>
parent e7475623
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Misc/NEWS.d/next/Build/2022-07-13-10-13-10.gh-issue-94801.3xUB24.rst 0 → 100644
+ 2
− 0
View file @ 30412d91
``configure`` now uses custom flags like ``ZLIB_CFLAGS`` and ``ZLIB_LIBS``
when searching for headers and libraries.
configure
+ 235
− 179
View file @ 30412d91
...@@ -3042,6 +3042,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ...@@ -3042,6 +3042,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
   
   
   
if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then
# If we're building out-of-tree, we need to make sure the following # If we're building out-of-tree, we need to make sure the following
# resources get picked up before their $srcdir counterparts. # resources get picked up before their $srcdir counterparts.
...@@ -11164,6 +11170,14 @@ fi ...@@ -11164,6 +11170,14 @@ fi
echo "$LIBUUID_PKG_ERRORS" >&5 echo "$LIBUUID_PKG_ERRORS" >&5
   
   
save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
for ac_header in uuid/uuid.h for ac_header in uuid/uuid.h
do : do :
ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
...@@ -11172,11 +11186,7 @@ if test "x$ac_cv_header_uuid_uuid_h" = xyes; then : ...@@ -11172,11 +11186,7 @@ if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
#define HAVE_UUID_UUID_H 1 #define HAVE_UUID_UUID_H 1
_ACEOF _ACEOF
   
save_CFLAGS=$CFLAGS py_check_lib_save_LIBS=$LIBS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time in -luuid" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time in -luuid" >&5
$as_echo_n "checking for uuid_generate_time in -luuid... " >&6; } $as_echo_n "checking for uuid_generate_time in -luuid... " >&6; }
if ${ac_cv_lib_uuid_uuid_generate_time+:} false; then : if ${ac_cv_lib_uuid_uuid_generate_time+:} false; then :
...@@ -11217,19 +11227,9 @@ if test "x$ac_cv_lib_uuid_uuid_generate_time" = xyes; then : ...@@ -11217,19 +11227,9 @@ if test "x$ac_cv_lib_uuid_uuid_generate_time" = xyes; then :
have_uuid=yes have_uuid=yes
fi fi
   
LIBS=$py_check_lib_save_LIBS
   
CFLAGS=$save_CFLAGS py_check_lib_save_LIBS=$LIBS
CPPFLAGS=$save_CPPFLAGS
LDFLAGS=$save_LDFLAGS
LIBS=$save_LIBS
save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe in -luuid" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe in -luuid" >&5
$as_echo_n "checking for uuid_generate_time_safe in -luuid... " >&6; } $as_echo_n "checking for uuid_generate_time_safe in -luuid... " >&6; }
if ${ac_cv_lib_uuid_uuid_generate_time_safe+:} false; then : if ${ac_cv_lib_uuid_uuid_generate_time_safe+:} false; then :
...@@ -11267,19 +11267,18 @@ fi ...@@ -11267,19 +11267,18 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate_time_safe" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate_time_safe" >&5
$as_echo "$ac_cv_lib_uuid_uuid_generate_time_safe" >&6; } $as_echo "$ac_cv_lib_uuid_uuid_generate_time_safe" >&6; }
if test "x$ac_cv_lib_uuid_uuid_generate_time_safe" = xyes; then : if test "x$ac_cv_lib_uuid_uuid_generate_time_safe" = xyes; then :
have_uuid=yes have_uuid=yes
$as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h $as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h
   
   
fi fi
   
LIBS=$py_check_lib_save_LIBS
   
CFLAGS=$save_CFLAGS
CPPFLAGS=$save_CPPFLAGS
LDFLAGS=$save_LDFLAGS
LIBS=$save_LIBS
   
fi
done
   
if test "x$have_uuid" = xyes; then : if test "x$have_uuid" = xyes; then :
   
...@@ -11288,9 +11287,11 @@ LIBS=$save_LIBS ...@@ -11288,9 +11287,11 @@ LIBS=$save_LIBS
   
fi fi
   
fi CFLAGS=$save_CFLAGS
CPPFLAGS=$save_CPPFLAGS
LDFLAGS=$save_LDFLAGS
LIBS=$save_LIBS
   
done
   
   
   
...@@ -11298,6 +11299,14 @@ elif test $pkg_failed = untried; then ...@@ -11298,6 +11299,14 @@ elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
   
save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
for ac_header in uuid/uuid.h for ac_header in uuid/uuid.h
do : do :
ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
...@@ -11306,11 +11315,7 @@ if test "x$ac_cv_header_uuid_uuid_h" = xyes; then : ...@@ -11306,11 +11315,7 @@ if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
#define HAVE_UUID_UUID_H 1 #define HAVE_UUID_UUID_H 1
_ACEOF _ACEOF
   
save_CFLAGS=$CFLAGS py_check_lib_save_LIBS=$LIBS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time in -luuid" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time in -luuid" >&5
$as_echo_n "checking for uuid_generate_time in -luuid... " >&6; } $as_echo_n "checking for uuid_generate_time in -luuid... " >&6; }
if ${ac_cv_lib_uuid_uuid_generate_time+:} false; then : if ${ac_cv_lib_uuid_uuid_generate_time+:} false; then :
...@@ -11351,19 +11356,9 @@ if test "x$ac_cv_lib_uuid_uuid_generate_time" = xyes; then : ...@@ -11351,19 +11356,9 @@ if test "x$ac_cv_lib_uuid_uuid_generate_time" = xyes; then :
have_uuid=yes have_uuid=yes
fi fi
   
LIBS=$py_check_lib_save_LIBS
   
CFLAGS=$save_CFLAGS py_check_lib_save_LIBS=$LIBS
CPPFLAGS=$save_CPPFLAGS
LDFLAGS=$save_LDFLAGS
LIBS=$save_LIBS
save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe in -luuid" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe in -luuid" >&5
$as_echo_n "checking for uuid_generate_time_safe in -luuid... " >&6; } $as_echo_n "checking for uuid_generate_time_safe in -luuid... " >&6; }
if ${ac_cv_lib_uuid_uuid_generate_time_safe+:} false; then : if ${ac_cv_lib_uuid_uuid_generate_time_safe+:} false; then :
...@@ -11401,19 +11396,18 @@ fi ...@@ -11401,19 +11396,18 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate_time_safe" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate_time_safe" >&5
$as_echo "$ac_cv_lib_uuid_uuid_generate_time_safe" >&6; } $as_echo "$ac_cv_lib_uuid_uuid_generate_time_safe" >&6; }
if test "x$ac_cv_lib_uuid_uuid_generate_time_safe" = xyes; then : if test "x$ac_cv_lib_uuid_uuid_generate_time_safe" = xyes; then :
have_uuid=yes have_uuid=yes
$as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h $as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h
   
   
fi fi
   
LIBS=$py_check_lib_save_LIBS
   
CFLAGS=$save_CFLAGS
CPPFLAGS=$save_CPPFLAGS
LDFLAGS=$save_LDFLAGS
LIBS=$save_LIBS
   
fi
done
   
if test "x$have_uuid" = xyes; then : if test "x$have_uuid" = xyes; then :
   
...@@ -11422,9 +11416,11 @@ LIBS=$save_LIBS ...@@ -11422,9 +11416,11 @@ LIBS=$save_LIBS
   
fi fi
   
fi CFLAGS=$save_CFLAGS
CPPFLAGS=$save_CPPFLAGS
LDFLAGS=$save_LDFLAGS
LIBS=$save_LIBS
   
done
   
   
   
...@@ -12378,6 +12374,19 @@ case $ac_sys_system in #( ...@@ -12378,6 +12374,19 @@ case $ac_sys_system in #(
esac esac
   
   
if test "$ac_sys_system" = "Emscripten" -a -z "$LIBSQLITE3_CFLAGS" -a -z "$LIBSQLITE3_LIBS"; then :
LIBSQLITE3_CFLAGS="-sUSE_SQLITE3"
LIBSQLITE3_LIBS="-sUSE_SQLITE3"
fi
pkg_failed=no pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSQLITE3" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSQLITE3" >&5
$as_echo_n "checking for LIBSQLITE3... " >&6; } $as_echo_n "checking for LIBSQLITE3... " >&6; }
...@@ -15923,6 +15932,19 @@ fi ...@@ -15923,6 +15932,19 @@ fi
   
   
   
if test "$ac_sys_system" = "Emscripten" -a -z "$ZLIB_CFLAGS" -a -z "$ZLIB_LIBS"; then :
ZLIB_CFLAGS="-sUSE_ZLIB"
ZLIB_LIBS="-sUSE_ZLIB"
fi
pkg_failed=no pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZLIB" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZLIB" >&5
$as_echo_n "checking for ZLIB... " >&6; } $as_echo_n "checking for ZLIB... " >&6; }
...@@ -15982,6 +16004,14 @@ fi ...@@ -15982,6 +16004,14 @@ fi
echo "$ZLIB_PKG_ERRORS" >&5 echo "$ZLIB_PKG_ERRORS" >&5
   
   
save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
LDFLAGS="$LDFLAGS $ZLIB_LIBS"
for ac_header in zlib.h for ac_header in zlib.h
do : do :
ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
...@@ -15990,12 +16020,7 @@ if test "x$ac_cv_header_zlib_h" = xyes; then : ...@@ -15990,12 +16020,7 @@ if test "x$ac_cv_header_zlib_h" = xyes; then :
#define HAVE_ZLIB_H 1 #define HAVE_ZLIB_H 1
_ACEOF _ACEOF
   
save_CFLAGS=$CFLAGS py_check_lib_save_LIBS=$LIBS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzread in -lz" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzread in -lz" >&5
$as_echo_n "checking for gzread in -lz... " >&6; } $as_echo_n "checking for gzread in -lz... " >&6; }
if ${ac_cv_lib_z_gzread+:} false; then : if ${ac_cv_lib_z_gzread+:} false; then :
...@@ -16033,10 +16058,25 @@ fi ...@@ -16033,10 +16058,25 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzread" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzread" >&5
$as_echo "$ac_cv_lib_z_gzread" >&6; } $as_echo "$ac_cv_lib_z_gzread" >&6; }
if test "x$ac_cv_lib_z_gzread" = xyes; then : if test "x$ac_cv_lib_z_gzread" = xyes; then :
have_zlib=yes have_zlib=yes
else
have_zlib=no
fi
LIBS=$py_check_lib_save_LIBS
else
have_zlib=no
fi
done
if test "x$have_zlib" = xyes; then :
ZLIB_CFLAGS=${ZLIB_CFLAGS-""} ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
ZLIB_LIBS=${ZLIB_LIBS-"-lz"} ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
py_check_lib_save_LIBS=$LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
$as_echo_n "checking for inflateCopy in -lz... " >&6; } $as_echo_n "checking for inflateCopy in -lz... " >&6; }
if ${ac_cv_lib_z_inflateCopy+:} false; then : if ${ac_cv_lib_z_inflateCopy+:} false; then :
...@@ -16078,14 +16118,11 @@ if test "x$ac_cv_lib_z_inflateCopy" = xyes; then : ...@@ -16078,14 +16118,11 @@ if test "x$ac_cv_lib_z_inflateCopy" = xyes; then :
   
fi fi
   
LIBS=$py_check_lib_save_LIBS
   
else
have_zlib=no
   
fi fi
   
CFLAGS=$save_CFLAGS CFLAGS=$save_CFLAGS
CPPFLAGS=$save_CPPFLAGS CPPFLAGS=$save_CPPFLAGS
LDFLAGS=$save_LDFLAGS LDFLAGS=$save_LDFLAGS
...@@ -16093,17 +16130,18 @@ LIBS=$save_LIBS ...@@ -16093,17 +16130,18 @@ LIBS=$save_LIBS
   
   
   
else
have_zlib=no
fi
done
elif test $pkg_failed = untried; then elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
   
save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
LDFLAGS="$LDFLAGS $ZLIB_LIBS"
for ac_header in zlib.h for ac_header in zlib.h
do : do :
ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
...@@ -16112,12 +16150,7 @@ if test "x$ac_cv_header_zlib_h" = xyes; then : ...@@ -16112,12 +16150,7 @@ if test "x$ac_cv_header_zlib_h" = xyes; then :
#define HAVE_ZLIB_H 1 #define HAVE_ZLIB_H 1
_ACEOF _ACEOF
   
save_CFLAGS=$CFLAGS py_check_lib_save_LIBS=$LIBS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzread in -lz" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzread in -lz" >&5
$as_echo_n "checking for gzread in -lz... " >&6; } $as_echo_n "checking for gzread in -lz... " >&6; }
if ${ac_cv_lib_z_gzread+:} false; then : if ${ac_cv_lib_z_gzread+:} false; then :
...@@ -16155,10 +16188,25 @@ fi ...@@ -16155,10 +16188,25 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzread" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzread" >&5
$as_echo "$ac_cv_lib_z_gzread" >&6; } $as_echo "$ac_cv_lib_z_gzread" >&6; }
if test "x$ac_cv_lib_z_gzread" = xyes; then : if test "x$ac_cv_lib_z_gzread" = xyes; then :
have_zlib=yes have_zlib=yes
else
have_zlib=no
fi
LIBS=$py_check_lib_save_LIBS
else
have_zlib=no
fi
done
if test "x$have_zlib" = xyes; then :
ZLIB_CFLAGS=${ZLIB_CFLAGS-""} ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
ZLIB_LIBS=${ZLIB_LIBS-"-lz"} ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
py_check_lib_save_LIBS=$LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
$as_echo_n "checking for inflateCopy in -lz... " >&6; } $as_echo_n "checking for inflateCopy in -lz... " >&6; }
if ${ac_cv_lib_z_inflateCopy+:} false; then : if ${ac_cv_lib_z_inflateCopy+:} false; then :
...@@ -16200,14 +16248,11 @@ if test "x$ac_cv_lib_z_inflateCopy" = xyes; then : ...@@ -16200,14 +16248,11 @@ if test "x$ac_cv_lib_z_inflateCopy" = xyes; then :
   
fi fi
   
LIBS=$py_check_lib_save_LIBS
   
else
have_zlib=no
   
fi fi
   
CFLAGS=$save_CFLAGS CFLAGS=$save_CFLAGS
CPPFLAGS=$save_CPPFLAGS CPPFLAGS=$save_CPPFLAGS
LDFLAGS=$save_LDFLAGS LDFLAGS=$save_LDFLAGS
...@@ -16215,13 +16260,6 @@ LIBS=$save_LIBS ...@@ -16215,13 +16260,6 @@ LIBS=$save_LIBS
   
   
   
else
have_zlib=no
fi
done
else else
ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
ZLIB_LIBS=$pkg_cv_ZLIB_LIBS ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
...@@ -16234,11 +16272,6 @@ $as_echo "yes" >&6; } ...@@ -16234,11 +16272,6 @@ $as_echo "yes" >&6; }
   
fi fi
   
if test "$have_zlib" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$ZLIB_LIBS" = "-lz"; then
ZLIB_CFLAGS="-sUSE_ZLIB"
ZLIB_LIBS="-sUSE_ZLIB"
fi
if test "x$have_zlib" = xyes; then : if test "x$have_zlib" = xyes; then :
   
BINASCII_CFLAGS="-DUSE_ZLIB_CRC32 $ZLIB_CFLAGS" BINASCII_CFLAGS="-DUSE_ZLIB_CRC32 $ZLIB_CFLAGS"
...@@ -16247,6 +16280,19 @@ if test "x$have_zlib" = xyes; then : ...@@ -16247,6 +16280,19 @@ if test "x$have_zlib" = xyes; then :
fi fi
   
   
if test "$ac_sys_system" = "Emscripten" -a -z "$BZIP2_CFLAGS" -a -z "$BZIP2_LIBS"; then :
BZIP2_CFLAGS="-sUSE_BZIP2"
BZIP2_LIBS="-sUSE_BZIP2"
fi
pkg_failed=no pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZIP2" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZIP2" >&5
$as_echo_n "checking for BZIP2... " >&6; } $as_echo_n "checking for BZIP2... " >&6; }
...@@ -16306,6 +16352,14 @@ fi ...@@ -16306,6 +16352,14 @@ fi
echo "$BZIP2_PKG_ERRORS" >&5 echo "$BZIP2_PKG_ERRORS" >&5
   
   
save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
LDFLAGS="$LDFLAGS $BZIP2_LIBS"
for ac_header in bzlib.h for ac_header in bzlib.h
do : do :
ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default"
...@@ -16314,12 +16368,6 @@ if test "x$ac_cv_header_bzlib_h" = xyes; then : ...@@ -16314,12 +16368,6 @@ if test "x$ac_cv_header_bzlib_h" = xyes; then :
#define HAVE_BZLIB_H 1 #define HAVE_BZLIB_H 1
_ACEOF _ACEOF
   
save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzCompress in -lbz2" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzCompress in -lbz2" >&5
$as_echo_n "checking for BZ2_bzCompress in -lbz2... " >&6; } $as_echo_n "checking for BZ2_bzCompress in -lbz2... " >&6; }
if ${ac_cv_lib_bz2_BZ2_bzCompress+:} false; then : if ${ac_cv_lib_bz2_BZ2_bzCompress+:} false; then :
...@@ -16357,15 +16405,24 @@ fi ...@@ -16357,15 +16405,24 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzCompress" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzCompress" >&5
$as_echo "$ac_cv_lib_bz2_BZ2_bzCompress" >&6; } $as_echo "$ac_cv_lib_bz2_BZ2_bzCompress" >&6; }
if test "x$ac_cv_lib_bz2_BZ2_bzCompress" = xyes; then : if test "x$ac_cv_lib_bz2_BZ2_bzCompress" = xyes; then :
have_bzip2=yes have_bzip2=yes
BZIP2_CFLAGS=${BZIP2_CFLAGS-""} else
BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"} have_bzip2=no
fi
   
else else
have_bzip2=no have_bzip2=no
fi fi
   
done
if test "x$have_bzip2" = xyes; then :
BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
fi
   
CFLAGS=$save_CFLAGS CFLAGS=$save_CFLAGS
CPPFLAGS=$save_CPPFLAGS CPPFLAGS=$save_CPPFLAGS
...@@ -16374,17 +16431,18 @@ LIBS=$save_LIBS ...@@ -16374,17 +16431,18 @@ LIBS=$save_LIBS
   
   
   
else
have_bzip2=no
fi
done
elif test $pkg_failed = untried; then elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
   
save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
LDFLAGS="$LDFLAGS $BZIP2_LIBS"
for ac_header in bzlib.h for ac_header in bzlib.h
do : do :
ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default"
...@@ -16393,12 +16451,6 @@ if test "x$ac_cv_header_bzlib_h" = xyes; then : ...@@ -16393,12 +16451,6 @@ if test "x$ac_cv_header_bzlib_h" = xyes; then :
#define HAVE_BZLIB_H 1 #define HAVE_BZLIB_H 1
_ACEOF _ACEOF
   
save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzCompress in -lbz2" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzCompress in -lbz2" >&5
$as_echo_n "checking for BZ2_bzCompress in -lbz2... " >&6; } $as_echo_n "checking for BZ2_bzCompress in -lbz2... " >&6; }
if ${ac_cv_lib_bz2_BZ2_bzCompress+:} false; then : if ${ac_cv_lib_bz2_BZ2_bzCompress+:} false; then :
...@@ -16436,15 +16488,24 @@ fi ...@@ -16436,15 +16488,24 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzCompress" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzCompress" >&5
$as_echo "$ac_cv_lib_bz2_BZ2_bzCompress" >&6; } $as_echo "$ac_cv_lib_bz2_BZ2_bzCompress" >&6; }
if test "x$ac_cv_lib_bz2_BZ2_bzCompress" = xyes; then : if test "x$ac_cv_lib_bz2_BZ2_bzCompress" = xyes; then :
have_bzip2=yes have_bzip2=yes
BZIP2_CFLAGS=${BZIP2_CFLAGS-""} else
BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"} have_bzip2=no
fi
   
else else
have_bzip2=no have_bzip2=no
fi fi
   
done
if test "x$have_bzip2" = xyes; then :
BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
fi
   
CFLAGS=$save_CFLAGS CFLAGS=$save_CFLAGS
CPPFLAGS=$save_CPPFLAGS CPPFLAGS=$save_CPPFLAGS
...@@ -16453,13 +16514,6 @@ LIBS=$save_LIBS ...@@ -16453,13 +16514,6 @@ LIBS=$save_LIBS
   
   
   
else
have_bzip2=no
fi
done
else else
BZIP2_CFLAGS=$pkg_cv_BZIP2_CFLAGS BZIP2_CFLAGS=$pkg_cv_BZIP2_CFLAGS
BZIP2_LIBS=$pkg_cv_BZIP2_LIBS BZIP2_LIBS=$pkg_cv_BZIP2_LIBS
...@@ -16468,12 +16522,6 @@ $as_echo "yes" >&6; } ...@@ -16468,12 +16522,6 @@ $as_echo "yes" >&6; }
have_bzip2=yes have_bzip2=yes
fi fi
   
if test "$have_bzip2" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$BZIP2_LIBS" = "-lbz2"; then
BZIP2_CFLAGS="-sUSE_BZIP2"
BZIP2_LIBS="-sUSE_BZIP2"
fi
   
pkg_failed=no pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBLZMA" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBLZMA" >&5
...@@ -16534,6 +16582,14 @@ fi ...@@ -16534,6 +16582,14 @@ fi
echo "$LIBLZMA_PKG_ERRORS" >&5 echo "$LIBLZMA_PKG_ERRORS" >&5
   
   
save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
for ac_header in lzma.h for ac_header in lzma.h
do : do :
ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default"
...@@ -16542,12 +16598,6 @@ if test "x$ac_cv_header_lzma_h" = xyes; then : ...@@ -16542,12 +16598,6 @@ if test "x$ac_cv_header_lzma_h" = xyes; then :
#define HAVE_LZMA_H 1 #define HAVE_LZMA_H 1
_ACEOF _ACEOF
   
save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_easy_encoder in -llzma" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_easy_encoder in -llzma" >&5
$as_echo_n "checking for lzma_easy_encoder in -llzma... " >&6; } $as_echo_n "checking for lzma_easy_encoder in -llzma... " >&6; }
if ${ac_cv_lib_lzma_lzma_easy_encoder+:} false; then : if ${ac_cv_lib_lzma_lzma_easy_encoder+:} false; then :
...@@ -16585,15 +16635,24 @@ fi ...@@ -16585,15 +16635,24 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_easy_encoder" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_easy_encoder" >&5
$as_echo "$ac_cv_lib_lzma_lzma_easy_encoder" >&6; } $as_echo "$ac_cv_lib_lzma_lzma_easy_encoder" >&6; }
if test "x$ac_cv_lib_lzma_lzma_easy_encoder" = xyes; then : if test "x$ac_cv_lib_lzma_lzma_easy_encoder" = xyes; then :
have_liblzma=yes have_liblzma=yes
LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""} else
LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"} have_liblzma=no
fi
   
else else
have_liblzma=no have_liblzma=no
fi fi
   
done
if test "x$have_liblzma" = xyes; then :
LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
fi
   
CFLAGS=$save_CFLAGS CFLAGS=$save_CFLAGS
CPPFLAGS=$save_CPPFLAGS CPPFLAGS=$save_CPPFLAGS
...@@ -16602,17 +16661,18 @@ LIBS=$save_LIBS ...@@ -16602,17 +16661,18 @@ LIBS=$save_LIBS
   
   
   
else
have_liblzma=no
fi
done
elif test $pkg_failed = untried; then elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
   
save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
for ac_header in lzma.h for ac_header in lzma.h
do : do :
ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default"
...@@ -16621,12 +16681,6 @@ if test "x$ac_cv_header_lzma_h" = xyes; then : ...@@ -16621,12 +16681,6 @@ if test "x$ac_cv_header_lzma_h" = xyes; then :
#define HAVE_LZMA_H 1 #define HAVE_LZMA_H 1
_ACEOF _ACEOF
   
save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_easy_encoder in -llzma" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_easy_encoder in -llzma" >&5
$as_echo_n "checking for lzma_easy_encoder in -llzma... " >&6; } $as_echo_n "checking for lzma_easy_encoder in -llzma... " >&6; }
if ${ac_cv_lib_lzma_lzma_easy_encoder+:} false; then : if ${ac_cv_lib_lzma_lzma_easy_encoder+:} false; then :
...@@ -16664,15 +16718,24 @@ fi ...@@ -16664,15 +16718,24 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_easy_encoder" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_easy_encoder" >&5
$as_echo "$ac_cv_lib_lzma_lzma_easy_encoder" >&6; } $as_echo "$ac_cv_lib_lzma_lzma_easy_encoder" >&6; }
if test "x$ac_cv_lib_lzma_lzma_easy_encoder" = xyes; then : if test "x$ac_cv_lib_lzma_lzma_easy_encoder" = xyes; then :
have_liblzma=yes have_liblzma=yes
LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""} else
LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"} have_liblzma=no
fi
   
else else
have_liblzma=no have_liblzma=no
fi fi
   
done
if test "x$have_liblzma" = xyes; then :
LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
fi
   
CFLAGS=$save_CFLAGS CFLAGS=$save_CFLAGS
CPPFLAGS=$save_CPPFLAGS CPPFLAGS=$save_CPPFLAGS
...@@ -16681,13 +16744,6 @@ LIBS=$save_LIBS ...@@ -16681,13 +16744,6 @@ LIBS=$save_LIBS
   
   
   
else
have_liblzma=no
fi
done
else else
LIBLZMA_CFLAGS=$pkg_cv_LIBLZMA_CFLAGS LIBLZMA_CFLAGS=$pkg_cv_LIBLZMA_CFLAGS
LIBLZMA_LIBS=$pkg_cv_LIBLZMA_LIBS LIBLZMA_LIBS=$pkg_cv_LIBLZMA_LIBS
......
configure.ac
+ 88
− 44
View file @ 30412d91
...@@ -49,6 +49,48 @@ AC_DEFUN([WITH_SAVE_ENV], ...@@ -49,6 +49,48 @@ AC_DEFUN([WITH_SAVE_ENV],
[RESTORE_ENV] [RESTORE_ENV]
)dnl )dnl
dnl PY_CHECK_FUNC(FUNCTION, [INCLUDES], [AC_DEFINE-VAR])
AC_DEFUN([PY_CHECK_FUNC],
[ AS_VAR_PUSHDEF([py_var], [ac_cv_func_$1])
AS_VAR_PUSHDEF([py_define], m4_ifblank([$3], [[HAVE_]m4_toupper($1)], [$3]))
AC_CACHE_CHECK(
[for $1],
[py_var],
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([$2], [void *x=$1])],
[AS_VAR_SET([py_var], [yes])],
[AS_VAR_SET([py_var], [no])])]
)
AS_VAR_IF(
[py_var],
[yes],
[AC_DEFINE([py_define], [1], [Define if you have the '$1' function.])])
AS_VAR_POPDEF([py_var])
AS_VAR_POPDEF([py_define])
])
dnl PY_CHECK_LIB(LIBRARY, FUNCTION, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [OTHER-LIBRARIES])
dnl Like AC_CHECK_LIB() but does not modify LIBS
AC_DEFUN([PY_CHECK_LIB],
[AS_VAR_COPY([py_check_lib_save_LIBS], [LIBS])]
[AC_CHECK_LIB($1, $2, $3, $4, $5)]
[AS_VAR_COPY([LIBS], [py_check_lib_save_LIBS])]
)
dnl PY_CHECK_EMSCRIPTEN_PORT(PKG_VAR, [EMPORT_ARGS])
dnl Use Emscripten port unless user passes ${PKG_VAR}_CFLAGS
dnl or ${PKG_VAR}_LIBS to configure.
AC_DEFUN([PY_CHECK_EMSCRIPTEN_PORT], [
AS_VAR_PUSHDEF([py_cflags], [$1_CFLAGS])
AS_VAR_PUSHDEF([py_libs], [$1_LIBS])
AS_IF([test "$ac_sys_system" = "Emscripten" -a -z "$py_cflags" -a -z "$py_libs"], [
py_cflags="$2"
py_libs="$2"
])
AS_VAR_POPDEF([py_cflags])
AS_VAR_POPDEF([py_libs])
])
AC_SUBST(BASECPPFLAGS) AC_SUBST(BASECPPFLAGS)
if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then
# If we're building out-of-tree, we need to make sure the following # If we're building out-of-tree, we need to make sure the following
...@@ -3335,12 +3377,12 @@ AS_VAR_IF([have_uuid], [missing], [ ...@@ -3335,12 +3377,12 @@ AS_VAR_IF([have_uuid], [missing], [
AC_DEFINE([HAVE_UUID_H], [1]) AC_DEFINE([HAVE_UUID_H], [1])
AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1]) AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1])
], [ ], [
AC_CHECK_HEADERS([uuid/uuid.h], [
WITH_SAVE_ENV(
[AC_CHECK_LIB([uuid], [uuid_generate_time], [have_uuid=yes])
])
WITH_SAVE_ENV([ WITH_SAVE_ENV([
AC_CHECK_LIB([uuid], [uuid_generate_time_safe], [ CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
AC_CHECK_HEADERS([uuid/uuid.h], [
PY_CHECK_LIB([uuid], [uuid_generate_time], [have_uuid=yes])
PY_CHECK_LIB([uuid], [uuid_generate_time_safe], [
have_uuid=yes have_uuid=yes
AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1]) AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1])
]) ])
...@@ -3694,6 +3736,9 @@ AS_CASE([$ac_sys_system], ...@@ -3694,6 +3736,9 @@ AS_CASE([$ac_sys_system],
[OSSAUDIODEV_LIBS=""] [OSSAUDIODEV_LIBS=""]
) )
dnl detect sqlite3 from Emscripten emport
PY_CHECK_EMSCRIPTEN_PORT([LIBSQLITE3], [-sUSE_SQLITE3])
dnl Check for SQLite library. Use pkg-config if available. dnl Check for SQLite library. Use pkg-config if available.
PKG_CHECK_MODULES( PKG_CHECK_MODULES(
[LIBSQLITE3], [sqlite3 >= 3.7.15], [], [ [LIBSQLITE3], [sqlite3 >= 3.7.15], [], [
...@@ -4675,64 +4720,63 @@ fi ...@@ -4675,64 +4720,63 @@ fi
dnl Check for compression libraries dnl Check for compression libraries
AH_TEMPLATE([HAVE_ZLIB_COPY], [Define if the zlib library has inflateCopy]) AH_TEMPLATE([HAVE_ZLIB_COPY], [Define if the zlib library has inflateCopy])
dnl detect zlib from Emscripten emport
PY_CHECK_EMSCRIPTEN_PORT([ZLIB], [-sUSE_ZLIB])
PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [ PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
have_zlib=yes have_zlib=yes
dnl zlib 1.2.0 (2003) added inflateCopy dnl zlib 1.2.0 (2003) added inflateCopy
AC_DEFINE([HAVE_ZLIB_COPY], [1]) AC_DEFINE([HAVE_ZLIB_COPY], [1])
], [ ], [
AC_CHECK_HEADERS([zlib.h], [
WITH_SAVE_ENV([ WITH_SAVE_ENV([
AC_CHECK_LIB([z], [gzread], [ CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
have_zlib=yes LDFLAGS="$LDFLAGS $ZLIB_LIBS"
AC_CHECK_HEADERS([zlib.h], [
PY_CHECK_LIB([z], [gzread], [have_zlib=yes], [have_zlib=no])
], [have_zlib=no])
AS_VAR_IF([have_zlib], [yes], [
ZLIB_CFLAGS=${ZLIB_CFLAGS-""} ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
ZLIB_LIBS=${ZLIB_LIBS-"-lz"} ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
AC_CHECK_LIB([z], [inflateCopy], [AC_DEFINE([HAVE_ZLIB_COPY], [1])]) PY_CHECK_LIB([z], [inflateCopy], [AC_DEFINE([HAVE_ZLIB_COPY], [1])])
], [
have_zlib=no
]) ])
]) ])
], [have_zlib=no])
]) ])
if test "$have_zlib" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$ZLIB_LIBS" = "-lz"; then
ZLIB_CFLAGS="-sUSE_ZLIB"
ZLIB_LIBS="-sUSE_ZLIB"
fi
dnl binascii can use zlib for optimized crc32. dnl binascii can use zlib for optimized crc32.
AS_VAR_IF([have_zlib], [yes], [ AS_VAR_IF([have_zlib], [yes], [
BINASCII_CFLAGS="-DUSE_ZLIB_CRC32 $ZLIB_CFLAGS" BINASCII_CFLAGS="-DUSE_ZLIB_CRC32 $ZLIB_CFLAGS"
BINASCII_LIBS="$ZLIB_LIBS" BINASCII_LIBS="$ZLIB_LIBS"
]) ])
dnl detect bzip2 from Emscripten emport
PY_CHECK_EMSCRIPTEN_PORT([BZIP2], [-sUSE_BZIP2])
PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [ PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
AC_CHECK_HEADERS([bzlib.h], [
WITH_SAVE_ENV([ WITH_SAVE_ENV([
AC_CHECK_LIB([bz2], [BZ2_bzCompress], [ CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
have_bzip2=yes LDFLAGS="$LDFLAGS $BZIP2_LIBS"
AC_CHECK_HEADERS([bzlib.h], [
AC_CHECK_LIB([bz2], [BZ2_bzCompress], [have_bzip2=yes], [have_bzip2=no])
], [have_bzip2=no])
AS_VAR_IF([have_bzip2], [yes], [
BZIP2_CFLAGS=${BZIP2_CFLAGS-""} BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"} BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
], [have_bzip2=no])
]) ])
], [have_bzip2=no])
]) ])
])
if test "$have_bzip2" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$BZIP2_LIBS" = "-lbz2"; then
BZIP2_CFLAGS="-sUSE_BZIP2"
BZIP2_LIBS="-sUSE_BZIP2"
fi
PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [ PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [
AC_CHECK_HEADERS([lzma.h], [
WITH_SAVE_ENV([ WITH_SAVE_ENV([
AC_CHECK_LIB([lzma], [lzma_easy_encoder], [ CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
have_liblzma=yes LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
AC_CHECK_HEADERS([lzma.h], [
AC_CHECK_LIB([lzma], [lzma_easy_encoder], [have_liblzma=yes], [have_liblzma=no])
], [have_liblzma=no])
AS_VAR_IF([have_liblzma], [yes], [
LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""} LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"} LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
], [have_liblzma=no])
]) ])
], [have_liblzma=no]) ])
]) ])
PY_CHECK_FUNC([hstrerror], [#include <netdb.h>]) PY_CHECK_FUNC([hstrerror], [#include <netdb.h>])
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment