check for Python and disable automatic STC files updating which requires it if it's not available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_9_0_BRANCH@60555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
16
Makefile.in
16
Makefile.in
@@ -33001,14 +33001,14 @@ sound_sdl_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp
|
||||
$(CXXC) -c -o $@ $(SOUND_SDL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
|
||||
|
||||
|
||||
@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
|
||||
@COND_USE_STC_1@ cd $(srcdir)/src/stc && ./gen_iface.py
|
||||
@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
|
||||
@COND_USE_STC_1@ $(srcdir)/include/wx/stc/stc.h
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
|
||||
@COND_PYTHON@@COND_USE_STC_1@ cd $(srcdir)/src/stc && ./gen_iface.py
|
||||
@COND_PYTHON@@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
|
||||
@COND_PYTHON@@COND_USE_STC_1@ $(srcdir)/include/wx/stc/stc.h
|
||||
|
||||
#
|
||||
# "make dist" target implementation:
|
||||
|
@@ -17,14 +17,14 @@
|
||||
|
||||
<!-- automatically update generated files -->
|
||||
<fragment format='autoconf'>
|
||||
@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
|
||||
@COND_USE_STC_1@ cd $(srcdir)/src/stc && ./gen_iface.py
|
||||
@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
|
||||
@COND_USE_STC_1@ $(srcdir)/include/wx/stc/stc.h
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
|
||||
@COND_PYTHON@@COND_USE_STC_1@ cd $(srcdir)/src/stc && ./gen_iface.py
|
||||
@COND_PYTHON@@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
|
||||
@COND_PYTHON@@COND_USE_STC_1@ $(srcdir)/include/wx/stc/stc.h
|
||||
</fragment>
|
||||
|
||||
<lib id="wxscintilla" template="3rdparty_lib"
|
||||
|
79
configure
vendored
79
configure
vendored
@@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 59905 2009-03-28 19:10:05Z VZ .
|
||||
# From configure.in Id: configure.in 59914 2009-03-29 17:15:43Z VZ .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@@ -709,6 +709,8 @@ GNOMEVFS_CFLAGS
|
||||
GNOMEVFS_LIBS
|
||||
HILDON_CFLAGS
|
||||
HILDON_LIBS
|
||||
PYTHON
|
||||
COND_PYTHON
|
||||
CAIRO_CFLAGS
|
||||
CAIRO_LIBS
|
||||
GST_CFLAGS
|
||||
@@ -937,10 +939,8 @@ COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0
|
||||
COND_TOOLKIT_MSW_WXUNIV_0
|
||||
COND_TOOLKIT_OSX_CARBON
|
||||
COND_TOOLKIT_OSX_CARBON_USE_GUI_1
|
||||
COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0
|
||||
COND_TOOLKIT_OSX_COCOA
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
|
||||
COND_TOOLKIT_OSX_IPHONE
|
||||
COND_TOOLKIT_PM
|
||||
COND_TOOLKIT_PM_USE_GUI_1
|
||||
@@ -46200,6 +46200,51 @@ _ACEOF
|
||||
|
||||
USE_STC=1
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc"
|
||||
|
||||
# Extract the first word of "python", so it can be a program name with args.
|
||||
set dummy python; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_path_PYTHON+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $PYTHON in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
PYTHON=$ac_cv_path_PYTHON
|
||||
if test -n "$PYTHON"; then
|
||||
{ echo "$as_me:$LINENO: result: $PYTHON" >&5
|
||||
echo "${ECHO_T}$PYTHON" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
if test "x$PYTHON" = "x"; then
|
||||
COND_PYTHON="#"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MENUS" = "yes"; then
|
||||
@@ -49339,7 +49384,7 @@ fi
|
||||
BAKEFILE_BAKEFILE_M4_VERSION="0.2.5"
|
||||
|
||||
|
||||
BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.5"
|
||||
BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.6"
|
||||
|
||||
|
||||
|
||||
@@ -50151,11 +50196,6 @@ EOF
|
||||
COND_TOOLKIT_OSX_CARBON_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_OSX_COCOA="#"
|
||||
if test "x$TOOLKIT" = "xOSX_COCOA" ; then
|
||||
COND_TOOLKIT_OSX_COCOA=""
|
||||
@@ -50166,11 +50206,6 @@ EOF
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_OSX_IPHONE="#"
|
||||
if test "x$TOOLKIT" = "xOSX_IPHONE" ; then
|
||||
COND_TOOLKIT_OSX_IPHONE=""
|
||||
@@ -51664,10 +51699,10 @@ GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim
|
||||
GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
|
||||
HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
|
||||
HILDON_LIBS!$HILDON_LIBS$ac_delim
|
||||
PYTHON!$PYTHON$ac_delim
|
||||
COND_PYTHON!$COND_PYTHON$ac_delim
|
||||
CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
|
||||
CAIRO_LIBS!$CAIRO_LIBS$ac_delim
|
||||
GST_CFLAGS!$GST_CFLAGS$ac_delim
|
||||
GST_LIBS!$GST_LIBS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@@ -51709,6 +51744,8 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
GST_CFLAGS!$GST_CFLAGS$ac_delim
|
||||
GST_LIBS!$GST_LIBS$ac_delim
|
||||
ALL_WX_LIBS!$ALL_WX_LIBS$ac_delim
|
||||
BUILT_WX_LIBS!$BUILT_WX_LIBS$ac_delim
|
||||
STD_BASE_LIBS!$STD_BASE_LIBS$ac_delim
|
||||
@@ -51804,8 +51841,6 @@ SETFILE!$SETFILE$ac_delim
|
||||
OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim
|
||||
GCC_PCH!$GCC_PCH$ac_delim
|
||||
ICC_PCH!$ICC_PCH$ac_delim
|
||||
ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim
|
||||
ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@@ -51847,6 +51882,8 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim
|
||||
ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$ac_delim
|
||||
BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
|
||||
COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
|
||||
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
|
||||
@@ -51942,8 +51979,6 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_de
|
||||
COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim
|
||||
COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim
|
||||
COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
|
||||
COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
|
||||
COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@@ -51985,6 +52020,8 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
|
||||
COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim
|
||||
COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim
|
||||
COND_SHARED_0_wxUSE_ZLIB_builtin!$COND_SHARED_0_wxUSE_ZLIB_builtin$ac_delim
|
||||
COND_SHARED_1!$COND_SHARED_1$ac_delim
|
||||
@@ -52015,10 +52052,8 @@ COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0$ac_deli
|
||||
COND_TOOLKIT_MSW_WXUNIV_0!$COND_TOOLKIT_MSW_WXUNIV_0$ac_delim
|
||||
COND_TOOLKIT_OSX_CARBON!$COND_TOOLKIT_OSX_CARBON$ac_delim
|
||||
COND_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
COND_TOOLKIT_OSX_COCOA!$COND_TOOLKIT_OSX_COCOA$ac_delim
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
COND_TOOLKIT_OSX_IPHONE!$COND_TOOLKIT_OSX_IPHONE$ac_delim
|
||||
COND_TOOLKIT_PM!$COND_TOOLKIT_PM$ac_delim
|
||||
COND_TOOLKIT_PM_USE_GUI_1!$COND_TOOLKIT_PM_USE_GUI_1$ac_delim
|
||||
|
@@ -6922,6 +6922,13 @@ if test "$wxUSE_STC" = "yes"; then
|
||||
AC_DEFINE(wxUSE_STC)
|
||||
USE_STC=1
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc"
|
||||
|
||||
dnl python is used to update src/stc.h (see build/bakefiles/scintilla.bkl)
|
||||
AC_PATH_PROG(PYTHON, python)
|
||||
if test "x$PYTHON" = "x"; then
|
||||
COND_PYTHON="#"
|
||||
fi
|
||||
AC_SUBST(COND_PYTHON)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MENUS" = "yes"; then
|
||||
|
Reference in New Issue
Block a user