Menu
▾
▴
wxlua-commit
|
From: John L. <jr...@us...> - 2008-01-10 23:06:57
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua Modified Files: configure Log Message: Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml since these files contain more than just printing or the htmlwin. Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix to make it easier to specify where wxStEdit is. Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** configure 10 Jan 2008 17:04:23 -0000 1.59 --- configure 10 Jan 2008 23:06:23 -0000 1.60 *************** *** 1470,1473 **** --- 1470,1474 ---- (default is auto) --with-lua-prefix Prefix where Lua is installed (optional) + --with-wxstedit-prefix Prefix where wxStEdit is installed (optional) Some influential environment variables: *************** *** 2452,2455 **** --- 2453,2465 ---- + # Check whether --with-wxstedit-prefix was given. + if test "${with_wxstedit_prefix+set}" = set; then + withval=$with_wxstedit_prefix; wxstedit_dir="$withval" + else + wxstedit_dir="" + fi + + + { echo "$as_me:$LINENO: checking for the --enable-wxlua-app option" >&5 echo $ECHO_N "checking for the --enable-wxlua-app option... $ECHO_C" >&6; } *************** *** 2737,2740 **** --- 2747,2771 ---- echo "${ECHO_T}$lua_dir" >&6; } + { echo "$as_me:$LINENO: checking for the --with-wxstedit-prefix option" >&5 + echo $ECHO_N "checking for the --with-wxstedit-prefix option... $ECHO_C" >&6; } + if test ! $wxstedit_dir = ""; then + + # user explicitely provided a path to its own wxStEdit, check that it's an absolute path + # (or it won't work for out-of-tree builds) + case $wxstedit_dir in + /*) continue;; + *) + { { echo "$as_me:$LINENO: error: + You must provide an absolute path for the --with-wxstedit-prefix option. + " >&5 + echo "$as_me: error: + You must provide an absolute path for the --with-wxstedit-prefix option. + " >&2;} + { (exit 1); exit 1; }; } + esac + fi + { echo "$as_me:$LINENO: result: $wxstedit_dir" >&5 + echo "${ECHO_T}$wxstedit_dir" >&6; } + # Global wxLua options: *************** *** 6159,6162 **** --- 6190,6194 ---- else USE_WXBINDADV=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXADV=0" fi *************** *** 6261,6264 **** --- 6293,6297 ---- else USE_WXBINDAUI=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXAUI=0" fi *************** *** 6363,6366 **** --- 6396,6400 ---- else USE_WXBINDGL=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXGL=0" fi *************** *** 6465,6468 **** --- 6499,6503 ---- else USE_WXBINDHTML=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXHTML=0" fi *************** *** 6567,6570 **** --- 6602,6606 ---- else USE_WXBINDMEDIA=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXMEDIA=0" fi *************** *** 6673,6676 **** --- 6709,6713 ---- else USE_WXBINDRICHTEXT=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXRICHTEXT=0" fi *************** *** 6779,6782 **** --- 6816,6820 ---- else USE_WXBINDXRC=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXXRC=0" fi *************** *** 6923,6926 **** --- 6961,6965 ---- USE_WXLUAAPP=0 USE_WXLUAEDITAPP=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXSTC=0" fi else *************** *** 6929,6932 **** --- 6968,6972 ---- USE_WXLUAAPP=0 USE_WXLUAEDITAPP=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXSTC=0" fi *************** *** 6940,6943 **** --- 6980,6998 ---- minversion="1.2.4" + if test ! "$wxstedit_dir" = ""; then + WXSTEDIT=$wxstedit_dir + echo Path to wxStEdit from --with-wxstedit-dir: \'$WXSTEDIT\' + else + # Try to get the wxStEdit src dir from the shell environment variable + WXSTEDIT=`echo $WXSTEDIT` + echo Path to wxStEdit from \$WXSTEDIT environment variable: \'$WXSTEDIT\' + fi + + # if it's not empty then add the search paths for the includes and lib + if test ! "$WXSTEDIT" = ""; then + CPPFLAGS="$CPPFLAGS -I$WXSTEDIT/include" + LDFLAGS="$LDFLAGS -L$WXSTEDIT/lib" + fi + wx_temp="wxcode""_""$WX_PORT" *************** *** 7099,7103 **** if test "1" == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7154,7157 ---- *************** *** 7112,7119 **** wx_temp="$wx_temp""_""wxlua""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxlua-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7166,7173 ---- wx_temp="$wx_temp""_""wxlua""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #"1"="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxlua-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7121,7125 **** if test $USE_WXLUADEBUG == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7175,7178 ---- *************** *** 7134,7141 **** wx_temp="$wx_temp""_""wxluadebug""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxluadebug-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7187,7194 ---- wx_temp="$wx_temp""_""wxluadebug""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXLUADEBUG="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxluadebug-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7143,7147 **** if test $USE_WXLUASOCKET == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7196,7199 ---- *************** *** 7156,7163 **** wx_temp="$wx_temp""_""wxluasocket""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxluasocket-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7208,7215 ---- wx_temp="$wx_temp""_""wxluasocket""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXLUASOCKET="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxluasocket-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7166,7170 **** if test $USE_WXBINDBASE == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7218,7221 ---- *************** *** 7179,7186 **** wx_temp="$wx_temp""_""wxbindbase""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindbase-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7230,7237 ---- wx_temp="$wx_temp""_""wxbindbase""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDBASE="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindbase-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7188,7192 **** if test $USE_WXBINDCORE == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7239,7242 ---- *************** *** 7201,7208 **** wx_temp="$wx_temp""_""wxbindcore""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindcore-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7251,7258 ---- wx_temp="$wx_temp""_""wxbindcore""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDCORE="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindcore-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7210,7214 **** if test $USE_WXBINDNET == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7260,7263 ---- *************** *** 7223,7230 **** wx_temp="$wx_temp""_""wxbindnet""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindnet-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7272,7279 ---- wx_temp="$wx_temp""_""wxbindnet""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDNET="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindnet-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7232,7236 **** if test $USE_WXBINDXML == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7281,7284 ---- *************** *** 7245,7252 **** wx_temp="$wx_temp""_""wxbindxml""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindxml-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7293,7300 ---- wx_temp="$wx_temp""_""wxbindxml""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDXML="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindxml-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7254,7258 **** if test $USE_WXBINDADV == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7302,7305 ---- *************** *** 7267,7274 **** wx_temp="$wx_temp""_""wxbindadv""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindadv-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7314,7321 ---- wx_temp="$wx_temp""_""wxbindadv""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDADV="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindadv-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7276,7280 **** if test $USE_WXBINDAUI == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7323,7326 ---- *************** *** 7289,7296 **** wx_temp="$wx_temp""_""wxbindaui""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindaui-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7335,7342 ---- wx_temp="$wx_temp""_""wxbindaui""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDAUI="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindaui-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7298,7302 **** if test $USE_WXBINDGL == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7344,7347 ---- *************** *** 7311,7318 **** wx_temp="$wx_temp""_""wxbindgl""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindgl-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7356,7363 ---- wx_temp="$wx_temp""_""wxbindgl""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDGL="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindgl-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7320,7324 **** if test $USE_WXBINDHTML == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7365,7368 ---- *************** *** 7333,7340 **** wx_temp="$wx_temp""_""wxbindhtml""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindhtml-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7377,7384 ---- wx_temp="$wx_temp""_""wxbindhtml""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDHTML="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindhtml-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7342,7346 **** if test $USE_WXBINDMEDIA == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7386,7389 ---- *************** *** 7355,7362 **** wx_temp="$wx_temp""_""wxbindmedia""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindmedia-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7398,7405 ---- wx_temp="$wx_temp""_""wxbindmedia""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDMEDIA="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindmedia-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7364,7368 **** if test $USE_WXBINDRICHTEXT == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7407,7410 ---- *************** *** 7377,7384 **** wx_temp="$wx_temp""_""wxbindrichtext""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindrichtext-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7419,7426 ---- wx_temp="$wx_temp""_""wxbindrichtext""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDRICHTEXT="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindrichtext-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7386,7390 **** if test $USE_WXBINDSTC == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7428,7431 ---- *************** *** 7399,7406 **** wx_temp="$wx_temp""_""wxbindstc""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindstc-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7440,7447 ---- wx_temp="$wx_temp""_""wxbindstc""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDSTC="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindstc-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7408,7412 **** if test $USE_WXBINDXRC == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7449,7452 ---- *************** *** 7421,7433 **** wx_temp="$wx_temp""_""wxbindxrc""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindxrc-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi ! echo $WXLUA_LIBS --- 7461,7497 ---- wx_temp="$wx_temp""_""wxbindxrc""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDXRC="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindxrc-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi ! # It is sometimes hard to dig out from the Makefiles these values ! { echo "$as_me:$LINENO: ! Complier and linker directives summary. ! ! CFLAGS : '$CFLAGS' ! CXXFLAGS : '$CXXFLAGS' ! CPPFLAGS : '$CPPFLAGS' ! WX_CXXFLAGS : '$WX_CXXFLAGS' ! LDFLAGS : '$LDFLAGS' ! WX_LIBS : '$WX_LIBS' ! WXLUA_LIBS : '$WXLUA_LIBS' ! ! " >&5 ! echo "$as_me: ! Complier and linker directives summary. ! ! CFLAGS : '$CFLAGS' ! CXXFLAGS : '$CXXFLAGS' ! CPPFLAGS : '$CPPFLAGS' ! WX_CXXFLAGS : '$WX_CXXFLAGS' ! LDFLAGS : '$LDFLAGS' ! WX_LIBS : '$WX_LIBS' ! WXLUA_LIBS : '$WXLUA_LIBS' ! ! " >&6;} |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X