Menu
▾
▴
wxlua-commit
|
From: John L. <jr...@us...> - 2008-01-10 17:04:32
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15167/wxLua/build/autoconf Modified Files: configure.ac Log Message: Updated bakefiles and autoconf to find the wxWidgets libs that exist on the system and link to those Also create only the wxLua bind libs for the existing wxWidgets libs Done by using $(WXLUA_LIBS) for autoconf like $(WX_LIBS) for the wxlua-lib tag and adding wxluamodule-lib to allow explicitly specifying the wxLua libs to link to for the modules. Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** configure.ac 1 Aug 2007 10:08:22 -0000 1.46 --- configure.ac 10 Jan 2008 17:04:25 -0000 1.47 *************** *** 24,30 **** - - - ## CONFIGURE OPTIONS ##################################################################### --- 24,27 ---- *************** *** 60,64 **** AC_ARG_ENABLE([$1], [AC_HELP_STRING([--enable-wxbind$1], [Compiles the wxLua bindings for $2 lib (default is yes)])], ! [], [enable_wxbind$1=yes; wxbind_list="$wxbind_list,$1"]) ]) --- 57,61 ---- AC_ARG_ENABLE([$1], [AC_HELP_STRING([--enable-wxbind$1], [Compiles the wxLua bindings for $2 lib (default is yes)])], ! [], [enable_wxbind$1=yes; wxbind_list_enabled="$wxbind_list_enabled,$1"]) ]) *************** *** 77,81 **** # remove initial comma: ! wxbind_list=${wxbind_list:1} AC_ARG_ENABLE([wxluadebug], --- 74,78 ---- # remove initial comma: ! wxbind_list_enabled=${wxbind_list_enabled:1} AC_ARG_ENABLE([wxluadebug], *************** *** 145,148 **** --- 142,159 ---- + AC_DEFUN([AC_WXLUABINDLIB_ENABLE], + [ + AC_ARG_ENABLE([$1], + [AC_HELP_STRING([--enable-wxbind$1], [Compiles the wxLua bindings for $2 lib (default is yes)])], + [], [enable_wxbind$1=yes; wxbind_list_enabled="$wxbind_list_enabled,$1"]) + ]) + + + ## Init libs, we will add to these as we check for their existance + ##################################################################### + + + WXLIB_NAMES="net,xml,core,base" + WXLUA_LIBS="-llua5.1" *************** *** 159,163 **** AC_PROG_CXX ! WXLIBS_REQUIRED="aui,xrc,html,adv,net,xml,core,base" AC_SUBST(WXLIBS_REQUIRED) --- 170,175 ---- AC_PROG_CXX ! #WXLIBS_REQUIRED="aui,xrc,html,adv,net,xml,core,base" FIXME should also check for net and xml ! WXLIBS_REQUIRED="net,xml,core,base" AC_SUBST(WXLIBS_REQUIRED) *************** *** 243,246 **** --- 255,670 ---- + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_ADV( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_ADV], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_ADV_LIBNAME], [wx], [adv]) + LIBS="$LIBS -l$_WX_ADV_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets Adv bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/grid.h>], + [wxGrid dummy(NULL, -1, wxDefaultPosition);]) + ], + [WXADV_PRESENCE=1], [WXADV_PRESENCE=0]) + + if test "$WXADV_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + WX_CHECK_FOR_ADV + if [[[ "$USE_WXBINDADV" = "1" && "$WXADV_PRESENCE" = "1" ]]]; then + # add adv to the list of wx-config --libs + WXLIB_NAMES="adv,$WXLIB_NAMES" + else + USE_WXBINDADV=0 + fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_AUI( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_AUI], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_AUI_LIBNAME], [wx], [aui]) + LIBS="$LIBS -l$_WX_AUI_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets AUI bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/aui/aui.h>], + [wxAuiPaneInfo dummy();]) + ], + [WXAUI_PRESENCE=1], [WXAUI_PRESENCE=0]) + + if test "$WXAUI_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + WX_CHECK_FOR_AUI + if test "$WXAUI_PRESENCE" = "1"; then + # add aui to the list of wx-config --libs + WXLIB_NAMES="aui,$WXLIB_NAMES" + else + USE_WXBINDAUI=0 + fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_GL( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_GL], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_GL_LIBNAME], [wx], [gl]) + LIBS="$LIBS -l$_WX_GL_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets OpenGL bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/glcanvas.h>], + [wxGLCanvas dummy(NULL, -1, wxDefaultPosition);]) + ], + [WXGL_PRESENCE=1], [WXGL_PRESENCE=0]) + + if test "$WXGL_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + WX_CHECK_FOR_GL + if test "$WXGL_PRESENCE" = "1"; then + # add gl to the list of wx-config --libs + WXLIB_NAMES="gl,$WXLIB_NAMES" + else + USE_WXBINDGL=0 + fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_HTML( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_HTML], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_HTML_LIBNAME], [wx], [html]) + LIBS="$LIBS -l$_WX_HTML_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets HTML bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/html/htmlcell.h>], + [wxHtmlSelection dummy;]) + ], + [WXHTML_PRESENCE=1], [WXHTML_PRESENCE=0]) + + if test "$WXHTML_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + WX_CHECK_FOR_HTML + if test "$WXHTML_PRESENCE" = "1"; then + # add html to the list of wx-config --libs + WXLIB_NAMES="html,$WXLIB_NAMES" + else + USE_WXBINDHTML=0 + fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_MEDIA( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_MEDIA], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_MEDIA_LIBNAME], [wx], [media]) + LIBS="$LIBS -l$_WX_MEDIA_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets Media bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/mediactrl.h>], + [wxMediaCtrl dummy();]) + ], + [WXMEDIA_PRESENCE=1], [WXMEDIA_PRESENCE=0]) + + if test "$WXMEDIA_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + WX_CHECK_FOR_MEDIA + if test "$WXMEDIA_PRESENCE" = "1"; then + # add media to the list of wx-config --libs + WXLIB_NAMES="media,$WXLIB_NAMES" + else + USE_WXBINDMEDIA=0 + fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_NET( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_NET], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_NET_LIBNAME], [wx], [net]) + LIBS="$LIBS -l$_WX_NET_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets Net bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/socket.h>], + [wxSocketClient dummy;]) + ], + [WXNET_PRESENCE=1], [WXNET_PRESENCE=0]) + + if test "$WXNET_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + dnl FIXME - no check for net since we can't use WX_LIKE_LIBNAME because it's libwx_baseud_net-2.8.so + dnl WX_CHECK_FOR_NET + dnl if test "$WXNET_PRESENCE" = "1"; then + dnl # let's add Net binding library to the libraries to link + dnl # so that if the user wants to use wxLua bindings to wxNet he + dnl # won't have linking errors + dnl WX_LIKE_LIBNAME([_WX_NET_LIBNAME], [wx], [net]) + dnl WX_LIBS="-l$_WX_NET_LIBNAME $WX_LIBS" + dnl else + dnl USE_WXBINDNET=0 + dnl fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_RICHTEXT( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_RICHTEXT], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_RICHTEXT_LIBNAME], [wx], [richtext]) + LIBS="$LIBS -l$_WX_RICHTEXT_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets Richtext bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/richtext/richtextctrl.h>], + [wxRichTextCtrl dummy;]) + ], + [WXRICHTEXT_PRESENCE=1], [WXRICHTEXT_PRESENCE=0]) + + if test "$WXRICHTEXT_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + WX_CHECK_FOR_RICHTEXT + if test "$WXRICHTEXT_PRESENCE" = "1"; then + # add richtext to the list of wx-config --libs + WXLIB_NAMES="richtext,$WXLIB_NAMES" + else + USE_WXBINDRICHTEXT=0 + fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_XML( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_XML], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_XML_LIBNAME], [wx], [xml]) + LIBS="$LIBS -l$_WX_XML_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets XML bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/xml/xml.h>], + [wxXmlProperty dummy;]) + ], + [WXXML_PRESENCE=1], [WXXML_PRESENCE=0]) + + if test "$WXXML_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + dnl FIXME - no check for XML since we can't use WX_LIKE_LIBNAME because it's libwx_baseud_xml-2.8.so + dnl WX_CHECK_FOR_XML + dnl if test "$WXXML_PRESENCE" = "1"; then + dnl # let's add XML binding library to the libraries to link + dnl # so that if the user wants to use wxLua bindings to XML he + dnl # won't have linking errors + dnl WX_LIKE_LIBNAME([_WX_XML_LIBNAME], [wx], [xml]) + dnl WX_LIBS="-l$_WX_XML_LIBNAME $WX_LIBS" + dnl else + dnl USE_WXBINDXML=0 + dnl fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_XRC( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_XRC], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_XRC_LIBNAME], [wx], [xrc]) + LIBS="$LIBS -l$_WX_XRC_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets XRC bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/xrc/xh_all.h>], + [wxSizerXmlHandler dummy;]) + ], + [WXXRC_PRESENCE=1], [WXXRC_PRESENCE=0]) + + if test "$WXXRC_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + WX_CHECK_FOR_XRC + if test "$WXXRC_PRESENCE" = "1"; then + # add xrc to the list of wx-config --libs + WXLIB_NAMES="xrc,$WXLIB_NAMES" + else + USE_WXBINDXRC=0 + fi + dnl --------------------------------------------------------------------------- *************** *** 276,280 **** dnl check for this component presence ! AC_MSG_CHECKING([if wxSTC contrib is available]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([#include <wx/stc/stc.h>], --- 700,704 ---- dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets STC contrib is available]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([#include <wx/stc/stc.h>], *************** *** 302,308 **** if test $ac_cv_prog_stc_set = "1"; then ! # add to the library to link to the wxSTC lib ! WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [stc]) ! WX_LIBS="-l$_WX_STC_LIBNAME $WX_LIBS" else WXBUILD_STR="$($WX_CONFIG_WITH_ARGS --selected_config)" --- 726,734 ---- if test $ac_cv_prog_stc_set = "1"; then ! dnl # add to the library to link to the wxSTC lib ! dnl WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [stc]) ! dnl WX_LIBS="-l$_WX_STC_LIBNAME $WX_LIBS" ! # add stc to the list of wx-config --libs ! WXLIB_NAMES="stc,$WXLIB_NAMES" else WXBUILD_STR="$($WX_CONFIG_WITH_ARGS --selected_config)" *************** *** 333,336 **** --- 759,766 ---- fi + + dnl --------------------------------------------------------------------------- + dnl -------------------------------------------------------------------------- + # check for the wxStEdit component... # NOTE: autopackage HACK: do an "export NO_WXLUAEDIT_CHECK=1" symbol *************** *** 363,428 **** fi - dnl --------------------------------------------------------------------------- - dnl WX_CHECK_FOR_GL( - dnl [action if found], - dnl [action if not found]) - dnl --------------------------------------------------------------------------- - AC_DEFUN([WX_CHECK_FOR_GL], - [ - dnl save original flags into support variables - UTILS_SAVE_COREVAR() ! dnl add to the compilation & link flags the wxWidgets flags ! dnl ! dnl NOTE: this is very important since the test program ! dnl we will compile needs to be linked against wx ! dnl and the configure script will use these *FLAGS ! dnl variables and it cannot be told to use other flags. ! dnl ! dnl NOTE2: we don't want to put into *FLAGS variables the ! dnl WX_* variable values since the Makefile.in for ! dnl a wxpresets-based application already merges ! dnl the *FLAGS contents with WX_* vars ! dnl ! dnl NOTE3: the CXXFLAGS are merged with CPPFLAGS and ! dnl thus we don't need to add the WX_CPPFLAGS to both ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! dnl before WX_LIBS we want the lib of GL ! WX_LIKE_LIBNAME([_WX_GL_LIBNAME], [wx], [gl]) ! LIBS="$LIBS -l$_WX_GL_LIBNAME $WX_LIBS" ! dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets OpenGL bindings are available]) ! AC_LINK_IFELSE([ ! AC_LANG_PROGRAM([#include <wx/glcanvas.h>], ! [wxGLCanvas dummy(NULL);]) ! ], ! [WXGL_PRESENCE=1], [WXGL_PRESENCE=0]) ! if test "$WXGL_PRESENCE" = "1"; then ! AC_MSG_RESULT([yes]) ! $1 ! else ! AC_MSG_RESULT([no]) ! $2 ! fi - dnl restore the original flags - UTILS_RESTORE_COREVAR() - ]) ! WX_CHECK_FOR_GL ! if test "$WXGL_PRESENCE" = "1"; then ! # let's add OpenGL binding library to the libraries to link ! # so that if the user wants to use wxLua bindings to wxOpenGL he ! # won't have linking errors ! WX_LIKE_LIBNAME([_WX_GL_LIBNAME], [wx], [gl]) ! WX_LIBS="-l$_WX_GL_LIBNAME $WX_LIBS" ! fi # Produce some useful info for pkg-config: --- 793,839 ---- fi dnl --------------------------------------------------------------------------- ! # recreate the wx-config --libs after determining what libs we've found ! WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $WXLIB_NAMES` ! WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs $WXLIB_NAMES 2>/dev/null` ! AC_DEFUN([AC_ADD_WXLUA_LIBS], ! [ ! if test $3 == "1"; then ! TMP="" ! WX_LIKE_LIBNAME([TMP], [wxlua], [$4]) ! $1="-l$TMP $2" ! #$1="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_$4-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $2" ! fi ! ]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], ["1"], [wxlua]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXLUADEBUG], [wxluadebug]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXLUASOCKET], [wxluasocket]) ! ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDBASE], [wxbindbase]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDCORE], [wxbindcore]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDNET], [wxbindnet]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDXML], [wxbindxml]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDADV], [wxbindadv]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDAUI], [wxbindaui]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDGL], [wxbindgl]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDHTML], [wxbindhtml]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDMEDIA], [wxbindmedia]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDRICHTEXT], [wxbindrichtext]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDSTC], [wxbindstc]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDXRC], [wxbindxrc]) ! ! echo $WXLUA_LIBS ! ! AC_SUBST([WXLUA_LIBS]) + dnl -------------------------------------------------------------------------- + dnl -------------------------------------------------------------------------- # Produce some useful info for pkg-config: *************** *** 512,516 **** # declared as: # <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'"> ! # and thus the AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG], ...) # macro must be used ! --- 923,927 ---- # declared as: # <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'"> ! # and thus the AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG], ...) # macro must be used ! *************** *** 541,570 **** fi ! ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], ! [" - wxBindSTC module: yes"], ! [" - wxBindSTC module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], ! [" - wxBindSTC module: yes"], ! [" - wxBindSTC module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], ! [" - wxBindSTC module: yes"], ! [" - wxBindSTC module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], ! [" - wxBindSTC module: yes"], ! [" - wxBindSTC module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], ! [" - wxBindSTC module: yes"], ! [" - wxBindSTC module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXLUADEBUG], ! [" - wxLuaDebug module: yes"], ! [" - wxLuaDebug module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXLUASOCKET], ! [" - wxLuaSocket module: yes"], ! [" - wxLuaSocket module: no"]) UTILS_BOOLOPT_SUMMARY([USE_LUAMODULE], ! [" - Lua module: yes"], ! [" - Lua module: no"]) # miscellaneous --- 952,1001 ---- fi ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDADV], ! [" - enable_wxbindadv module: yes"], ! [" - enable_wxbindadv module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDAUI], ! [" - enable_wxbindaui module: yes"], ! [" - enable_wxbindaui module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDBASE], ! [" - enable_wxbindbase module: yes"], ! [" - enable_wxbindbase module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDCORE], ! [" - enable_wxbindcore module: yes"], ! [" - enable_wxbindcore module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDGL], ! [" - enable_wxbindgl module: yes"], ! [" - enable_wxbindgl module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDHTML], ! [" - enable_wxbindhtml module: yes"], ! [" - enable_wxbindhtml module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDMEDIA], ! [" - enable_wxbindmedia module: yes"], ! [" - enable_wxbindmedia module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDNET], ! [" - enable_wxbindnet module: yes"], ! [" - enable_wxbindnet module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDRICHTEXT], ! [" - enable_wxbindrichtext module: yes"], ! [" - enable_wxbindrichtext module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], ! [" - enable_wxbindstc module: yes"], ! [" - enable_wxbindstc module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDXML], ! [" - enable_wxbindxml module: yes"], ! [" - enable_wxbindxml module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDXRC], ! [" - enable_wxbindxrc module: yes"], ! [" - enable_wxbindxrc module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXLUADEBUG], ! [" - enable_wxluadebug module: yes"], ! [" - enable_wxluadebug module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXLUASOCKET], ! [" - enable_wxluasocket module: yes"], ! [" - enable_wxluasocket module: no"]) UTILS_BOOLOPT_SUMMARY([USE_LUAMODULE], ! [" - enable_luamodule module: yes"], ! [" - enable_luamodule module: no"]) # miscellaneous *************** *** 574,579 **** [" - install custom wxBind stuff: no"]) ! echo " - wxBind modules activated: " ! echo " $wxbind_list" WX_STANDARD_OPTIONS_SUMMARY_MSG_END --- 1005,1013 ---- [" - install custom wxBind stuff: no"]) ! echo " - wxBind modules enabled: " ! echo " $wxbind_list_enabled" ! ! echo " - wxBind modules that will be created: " ! echo " $WXLIB_NAMES" WX_STANDARD_OPTIONS_SUMMARY_MSG_END |
×
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