Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1311551

Browse files
committed
use CPPFLAGS, add PY_CHECK_EMSCRIPTEN_PORT macro
1 parent7bb04f3 commit1311551

File tree

2 files changed

+73
-42
lines changed

2 files changed

+73
-42
lines changed

‎configure‎

Lines changed: 49 additions & 23 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎configure.ac‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,20 @@ AC_DEFUN([PY_CHECK_LIB],
7777
[AS_VAR_COPY([LIBS],[py_check_lib_save_LIBS])]
7878
)
7979

80+
dnl PY_CHECK_EMSCRIPTEN_PORT(PKG_VAR, [EMPORT_ARGS])
81+
dnl Use Emscripten port unless user passes ${PKG_VAR}_CFLAGS
82+
dnl or ${PKG_VAR}_LIBS to configure.
83+
AC_DEFUN([PY_CHECK_EMSCRIPTEN_PORT],[
84+
AS_VAR_PUSHDEF([py_cflags],[$1_CFLAGS])
85+
AS_VAR_PUSHDEF([py_libs],[$1_LIBS])
86+
AS_IF([test "$ac_sys_system" = "Emscripten" -a -z "$py_cflags" -a -z "$py_libs"],[
87+
py_cflags="$2"
88+
py_libs="$2"
89+
])
90+
AS_VAR_POPDEF([py_cflags])
91+
AS_VAR_POPDEF([py_libs])
92+
])
93+
8094
AC_SUBST(BASECPPFLAGS)
8195
if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then
8296
# If we're building out-of-tree, we need to make sure the following
@@ -3380,7 +3394,7 @@ AS_VAR_IF([have_uuid], [missing], [
33803394
AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE],[1])
33813395
],[
33823396
WITH_SAVE_ENV([
3383-
CFLAGS="$CFLAGS $LIBUUID_CFLAGS"
3397+
CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
33843398
LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
33853399
AC_CHECK_HEADERS([uuid/uuid.h],[
33863400
PY_CHECK_LIB([uuid],[uuid_generate_time],[have_uuid=yes])
@@ -3611,7 +3625,7 @@ have_libffi=missing
36113625
AS_VAR_IF([with_system_ffi],[yes],[
36123626
PKG_CHECK_MODULES([LIBFFI],[libffi],[have_libffi=yes],[
36133627
WITH_SAVE_ENV([
3614-
CFLAGS="$CFLAGS $LIBFFI_CFLAGS"
3628+
CPPFLAGS="$CFLAGS $LIBFFI_CFLAGS"
36153629
LDFLAGS="$LDFLAGS $LIBFFI_LIBS"
36163630
AC_CHECK_HEADER([ffi.h],[
36173631
AC_CHECK_LIB([ffi],[ffi_call],[
@@ -3791,10 +3805,7 @@ AS_CASE([$ac_sys_system],
37913805
)
37923806

37933807
dnl detect sqlite3 from Emscripten emport
3794-
if test "$ac_sys_system" = "Emscripten" -a -z "$LIBSQLITE3_CFLAGS" -a -z "$LIBSQLITE3_LIBS"; then
3795-
LIBSQLITE3_CFLAGS="-sUSE_SQLITE3"
3796-
LIBSQLITE3_LIBS="-sUSE_SQLITE3"
3797-
fi
3808+
PY_CHECK_EMSCRIPTEN_PORT([LIBSQLITE3],[-sUSE_SQLITE3])
37983809

37993810
dnl Check for SQLite library. Use pkg-config if available.
38003811
PKG_CHECK_MODULES(
@@ -4806,18 +4817,15 @@ dnl Check for compression libraries
48064817
AH_TEMPLATE([HAVE_ZLIB_COPY],[Define if the zlib library has inflateCopy])
48074818

48084819
dnl detect zlib from Emscripten emport
4809-
if test "$ac_sys_system" = "Emscripten" -a -z "$ZLIB_CFLAGS" -a -z "$ZLIB_LIBS"; then
4810-
ZLIB_CFLAGS="-sUSE_ZLIB"
4811-
ZLIB_LIBS="-sUSE_ZLIB"
4812-
fi
4820+
PY_CHECK_EMSCRIPTEN_PORT([ZLIB],[-sUSE_ZLIB])
48134821

48144822
PKG_CHECK_MODULES([ZLIB],[zlib >= 1.2.0],[
48154823
have_zlib=yes
48164824
dnl zlib 1.2.0 (2003) added inflateCopy
48174825
AC_DEFINE([HAVE_ZLIB_COPY],[1])
48184826
],[
48194827
WITH_SAVE_ENV([
4820-
CFLAGS="$CFLAGS $ZLIB_CFLAGS"
4828+
CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
48214829
LDFLAGS="$LDFLAGS $ZLIB_LIBS"
48224830
AC_CHECK_HEADERS([zlib.h],[
48234831
PY_CHECK_LIB([z],[gzread],[have_zlib=yes],[have_zlib=no])
@@ -4837,14 +4845,11 @@ AS_VAR_IF([have_zlib], [yes], [
48374845
])
48384846

48394847
dnl detect bzip2 from Emscripten emport
4840-
if test "$ac_sys_system" = "Emscripten" -a -z "$BZIP2_CFLAGS" -a -z "$BZIP2_LIBS"; then
4841-
BZIP2_CFLAGS="-sUSE_BZIP2"
4842-
BZIP2_LIBS="-sUSE_BZIP2"
4843-
fi
4848+
PY_CHECK_EMSCRIPTEN_PORT([BZIP2],[-sUSE_BZIP2])
48444849

48454850
PKG_CHECK_MODULES([BZIP2],[bzip2],[have_bzip2=yes],[
48464851
WITH_SAVE_ENV([
4847-
CFLAGS="$CFLAGS $BZIP2_CFLAGS"
4852+
CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
48484853
LDFLAGS="$LDFLAGS $BZIP2_LIBS"
48494854
AC_CHECK_HEADERS([bzlib.h],[
48504855
AC_CHECK_LIB([bz2],[BZ2_bzCompress],[have_bzip2=yes],[have_bzip2=no])
@@ -4858,7 +4863,7 @@ PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
48584863

48594864
PKG_CHECK_MODULES([LIBLZMA],[liblzma],[have_liblzma=yes],[
48604865
WITH_SAVE_ENV([
4861-
CFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
4866+
CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
48624867
LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
48634868
AC_CHECK_HEADERS([lzma.h],[
48644869
AC_CHECK_LIB([lzma],[lzma_easy_encoder],[have_liblzma=yes],[have_liblzma=no])
@@ -5835,7 +5840,7 @@ AS_VAR_IF([with_readline], [readline], [
58355840
READLINE_LIBS=$LIBREADLINE_LIBS
58365841
],[
58375842
WITH_SAVE_ENV([
5838-
CFLAGS="$CFLAGS $LIBREADLINE_CFLAGS"
5843+
CPPFLAGS="$CFLAGS $LIBREADLINE_CFLAGS"
58395844
LDFLAGS="$LDFLAGS $LIBREADLINE_LIBS"
58405845
AC_CHECK_HEADERS([readline/readline.h],[
58415846
AC_CHECK_LIB([readline],[readline],[
@@ -5856,7 +5861,7 @@ AS_VAR_IF([with_readline], [edit], [
58565861
READLINE_LIBS=$LIBEDIT_LIBS
58575862
],[
58585863
WITH_SAVE_ENV([
5859-
CFLAGS="$CFLAGS $LIBEDIT_CFLAGS"
5864+
CPPFLAGS="$CFLAGS $LIBEDIT_CFLAGS"
58605865
LDFLAGS="$LDFLAGS $LIBEDIT_LIBS"
58615866
AC_CHECK_HEADERS([editline/readline.h],[
58625867
AC_CHECK_LIB([edit],[readline],[

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp