Menu
▾
▴
[Wxlua-commit] wxLua configure,1.60,1.61
|
From: John L. <jr...@us...> - 2008-01-11 17:22:43
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27705/wxLua Modified Files: configure Log Message: Use wx-config for the LIBS in the configure checks for adv,aui, etc so that we work with shared and static libraries. Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** configure 10 Jan 2008 23:06:23 -0000 1.60 --- configure 11 Jan 2008 17:22:37 -0000 1.61 *************** *** 2784,2788 **** ! WXLIB_NAMES="net,xml,core,base" WXLUA_LIBS="-llua5.1" --- 2784,2788 ---- ! WXLIB_NAMES="core,base" WXLUA_LIBS="-llua5.1" *************** *** 6101,6122 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! wx_temp="wx""_""$WX_PORT" ! ! if test "$WX_UNICODE" = "1"; then ! wx_temp="$wx_temp""u" ! fi ! if test "$WX_DEBUG" = "1"; then ! wx_temp="$wx_temp""d" ! fi ! ! wx_temp="$wx_temp""_""adv""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! ! _WX_ADV_LIBNAME=$wx_temp ! ! LIBS="$LIBS -l$_WX_ADV_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets Adv bindings are available" >&5 --- 6101,6111 ---- + 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" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs adv` { echo "$as_me:$LINENO: checking if wxWidgets Adv bindings are available" >&5 *************** *** 6186,6189 **** --- 6175,6180 ---- if [[ "$USE_WXBINDADV" = "1" && "$WXADV_PRESENCE" = "1" ]]; then + + # add adv to the list of wx-config --libs WXLIB_NAMES="adv,$WXLIB_NAMES" *************** *** 6206,6225 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! ! wx_temp="wx""_""$WX_PORT" ! ! if test "$WX_UNICODE" = "1"; then ! wx_temp="$wx_temp""u" ! fi ! if test "$WX_DEBUG" = "1"; then ! wx_temp="$wx_temp""d" ! fi ! ! wx_temp="$wx_temp""_""aui""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! ! _WX_AUI_LIBNAME=$wx_temp ! ! LIBS="$LIBS -l$_WX_AUI_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets AUI bindings are available" >&5 --- 6197,6201 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs aui` { echo "$as_me:$LINENO: checking if wxWidgets AUI bindings are available" >&5 *************** *** 6309,6328 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! ! wx_temp="wx""_""$WX_PORT" ! ! if test "$WX_UNICODE" = "1"; then ! wx_temp="$wx_temp""u" ! fi ! if test "$WX_DEBUG" = "1"; then ! wx_temp="$wx_temp""d" ! fi ! ! wx_temp="$wx_temp""_""gl""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! ! _WX_GL_LIBNAME=$wx_temp ! ! LIBS="$LIBS -l$_WX_GL_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets OpenGL bindings are available" >&5 --- 6285,6289 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs gl` { echo "$as_me:$LINENO: checking if wxWidgets OpenGL bindings are available" >&5 *************** *** 6412,6431 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! ! wx_temp="wx""_""$WX_PORT" ! ! if test "$WX_UNICODE" = "1"; then ! wx_temp="$wx_temp""u" ! fi ! if test "$WX_DEBUG" = "1"; then ! wx_temp="$wx_temp""d" ! fi ! ! wx_temp="$wx_temp""_""html""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! ! _WX_HTML_LIBNAME=$wx_temp ! ! LIBS="$LIBS -l$_WX_HTML_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets HTML bindings are available" >&5 --- 6373,6377 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs html` { echo "$as_me:$LINENO: checking if wxWidgets HTML bindings are available" >&5 *************** *** 6515,6534 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! ! wx_temp="wx""_""$WX_PORT" ! ! if test "$WX_UNICODE" = "1"; then ! wx_temp="$wx_temp""u" ! fi ! if test "$WX_DEBUG" = "1"; then ! wx_temp="$wx_temp""d" ! fi ! ! wx_temp="$wx_temp""_""media""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! ! _WX_MEDIA_LIBNAME=$wx_temp ! ! LIBS="$LIBS -l$_WX_MEDIA_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets Media bindings are available" >&5 --- 6461,6465 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs media` { echo "$as_me:$LINENO: checking if wxWidgets Media bindings are available" >&5 *************** *** 6610,6617 **** - - - - SAVED_CPPFLAGS="$CPPFLAGS" SAVED_CXXFLAGS="$CXXFLAGS" --- 6541,6544 ---- *************** *** 6622,6641 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! wx_temp="wx""_""$WX_PORT" ! if test "$WX_UNICODE" = "1"; then ! wx_temp="$wx_temp""u" ! fi ! if test "$WX_DEBUG" = "1"; then ! wx_temp="$wx_temp""d" ! fi ! wx_temp="$wx_temp""_""richtext""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _WX_RICHTEXT_LIBNAME=$wx_temp ! LIBS="$LIBS -l$_WX_RICHTEXT_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets Richtext bindings are available" >&5 --- 6549,6641 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs net` + { echo "$as_me:$LINENO: checking if wxWidgets Net bindings are available" >&5 + echo $ECHO_N "checking if wxWidgets Net bindings are available... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! #include <wx/socket.h> ! int ! main () ! { ! wxSocketClient dummy; ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (ac_try="$ac_link" ! case "(($ac_try" in ! *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ! *) ac_try_echo=$ac_try;; ! esac ! eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ! (eval "$ac_link") 2>conftest.er1 ! ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && { ! test -z "$ac_cxx_werror_flag" || ! test ! -s conftest.err ! } && test -s conftest$ac_exeext && ! $as_test_x conftest$ac_exeext; then ! WXNET_PRESENCE=1 ! else ! echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! WXNET_PRESENCE=0 ! fi ! rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ! conftest$ac_exeext conftest.$ac_ext ! if test "$WXNET_PRESENCE" = "1"; then ! { echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6; } ! ! else ! { echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6; } ! ! fi ! ! ! CPPFLAGS="$SAVED_CPPFLAGS" ! CXXFLAGS="$SAVED_CXXFLAGS" ! CFLAGS="$SAVED_CFLAGS" ! LIBS="$SAVED_LIBS" ! ! ! if test "$WXNET_PRESENCE" = "1"; then ! # add net to the list of wx-config --libs ! WXLIB_NAMES="net,$WXLIB_NAMES" ! else ! USE_WXBINDNET=0 ! CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXNET=0" ! fi ! ! ! ! ! ! ! SAVED_CPPFLAGS="$CPPFLAGS" ! SAVED_CXXFLAGS="$CXXFLAGS" ! SAVED_CFLAGS="$CFLAGS" ! SAVED_LIBS="$LIBS" ! ! ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs richtext` { echo "$as_me:$LINENO: checking if wxWidgets Richtext bindings are available" >&5 *************** *** 6717,6724 **** - - - - SAVED_CPPFLAGS="$CPPFLAGS" SAVED_CXXFLAGS="$CXXFLAGS" --- 6717,6720 ---- *************** *** 6729,6748 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! wx_temp="wx""_""$WX_PORT" - if test "$WX_UNICODE" = "1"; then - wx_temp="$wx_temp""u" - fi - if test "$WX_DEBUG" = "1"; then - wx_temp="$wx_temp""d" - fi - wx_temp="$wx_temp""_""xrc""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" - _WX_XRC_LIBNAME=$wx_temp ! LIBS="$LIBS -l$_WX_XRC_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets XRC bindings are available" >&5 --- 6725,6817 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs xml` + { echo "$as_me:$LINENO: checking if wxWidgets XML bindings are available" >&5 + echo $ECHO_N "checking if wxWidgets XML bindings are available... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! #include <wx/xml/xml.h> ! int ! main () ! { ! wxXmlProperty dummy; ! ; ! return 0; ! } ! ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (ac_try="$ac_link" ! case "(($ac_try" in ! *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ! *) ac_try_echo=$ac_try;; ! esac ! eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ! (eval "$ac_link") 2>conftest.er1 ! ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && { ! test -z "$ac_cxx_werror_flag" || ! test ! -s conftest.err ! } && test -s conftest$ac_exeext && ! $as_test_x conftest$ac_exeext; then ! WXXML_PRESENCE=1 ! else ! echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! WXXML_PRESENCE=0 ! fi ! ! rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ! conftest$ac_exeext conftest.$ac_ext ! ! if test "$WXXML_PRESENCE" = "1"; then ! { echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6; } ! ! else ! { echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6; } ! ! fi ! ! ! CPPFLAGS="$SAVED_CPPFLAGS" ! CXXFLAGS="$SAVED_CXXFLAGS" ! CFLAGS="$SAVED_CFLAGS" ! LIBS="$SAVED_LIBS" ! ! ! if test "$WXXML_PRESENCE" = "1"; then ! # add xrc to the list of wx-config --libs ! WXLIB_NAMES="xml,$WXLIB_NAMES" ! else ! USE_WXBINDXML=0 ! CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXXML=0" ! fi ! ! ! SAVED_CPPFLAGS="$CPPFLAGS" ! SAVED_CXXFLAGS="$CXXFLAGS" ! SAVED_CFLAGS="$CFLAGS" ! SAVED_LIBS="$LIBS" ! ! ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs xrc` { echo "$as_me:$LINENO: checking if wxWidgets XRC bindings are available" >&5 *************** *** 6836,6857 **** ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! ! wx_temp="wx""_""$WX_PORT" ! ! if test "$WX_UNICODE" = "1"; then ! wx_temp="$wx_temp""u" ! fi ! if test "$WX_DEBUG" = "1"; then ! wx_temp="$wx_temp""d" ! fi ! ! wx_temp="$wx_temp""_""stc""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! ! _WX_STC_LIBNAME=$wx_temp ! ! LIBS="$LIBS -l$_WX_STC_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets STC contrib is available" >&5 --- 6905,6911 ---- ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs stc` { echo "$as_me:$LINENO: checking if wxWidgets STC contrib is available" >&5 *************** *** 7144,7148 **** ! # recreate the wx-config --libs after determining what libs we've found WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $WXLIB_NAMES` --- 7198,7203 ---- ! # recreate the wx-config --libs after determining whacvs -z3 -d:ext:jr...@wx...:/cvsroot/wxlua diff wxLua ! t libs we've found WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $WXLIB_NAMES` |
