wxlua-commit

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/build/autoconf
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27705/wxLua/build/autoconf

Modified Files:
	configure.ac 
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.ac
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** configure.ac	10 Jan 2008 23:06:24 -0000	1.48
--- configure.ac	11 Jan 2008 17:22:37 -0000	1.49
***************
*** 173,177 ****
  
  
! WXLIB_NAMES="net,xml,core,base"
  WXLUA_LIBS="-llua5.1"
  
--- 173,177 ----
  
  
! WXLIB_NAMES="core,base"
  WXLUA_LIBS="-llua5.1"
  
***************
*** 284,292 ****
              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
--- 284,309 ----
              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 Adv
!             #WX_LIKE_LIBNAME([_WX_ADV_LIBNAME], [wx], [adv])
!             #LIBS="$LIBS -l$_WX_ADV_LIBNAME $WX_LIBS"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs adv`
  
              dnl check for this component presence
***************
*** 312,315 ****
--- 329,337 ----
  WX_CHECK_FOR_ADV
  if [[[ "$USE_WXBINDADV" = "1" && "$WXADV_PRESENCE" = "1" ]]]; then
+ 
+     dnl # add to the library to link to the wxSTC lib *** Doesn't work for static builds
+     dnl WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [stc])
+     dnl WX_LIBS="-l$_WX_STC_LIBNAME $WX_LIBS"
+ 
      # add adv to the list of wx-config --libs
      WXLIB_NAMES="adv,$WXLIB_NAMES"
***************
*** 332,338 ****
              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
--- 354,358 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs aui`
  
              dnl check for this component presence
***************
*** 378,384 ****
              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
--- 398,402 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs gl`
  
              dnl check for this component presence
***************
*** 424,430 ****
              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
--- 442,446 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs html`
  
              dnl check for this component presence
***************
*** 470,476 ****
              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
--- 486,490 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs media`
  
              dnl check for this component presence
***************
*** 516,522 ****
              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
--- 530,534 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs net`
  
              dnl check for this component presence
***************
*** 540,555 ****
          ])
  
! 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     CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXNET=0"
! dnl fi
  
  
--- 552,563 ----
          ])
  
! WX_CHECK_FOR_NET
! 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
  
  
***************
*** 566,572 ****
              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
--- 574,578 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs richtext`
  
              dnl check for this component presence
***************
*** 612,618 ****
              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
--- 618,622 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs xml`
  
              dnl check for this component presence
***************
*** 636,651 ****
          ])
  
! 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    CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXXML=0"
! dnl fi
  
  
--- 640,651 ----
          ])
  
! WX_CHECK_FOR_XML
! 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
  
  
***************
*** 662,668 ****
              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
--- 662,666 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs xrc`
  
              dnl check for this component presence
***************
*** 706,729 ****
              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 STC
!             WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [stc])
!             LIBS="$LIBS -l$_WX_STC_LIBNAME $WX_LIBS"
  
              dnl check for this component presence
--- 704,710 ----
              UTILS_SAVE_COREVAR()
  
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs stc`
  
              dnl check for this component presence
***************
*** 754,760 ****
  
      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"
--- 735,738 ----
***************
*** 841,845 ****
  dnl ---------------------------------------------------------------------------
  
! # recreate the wx-config --libs after determining what libs we've found
  
  WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $WXLIB_NAMES`
--- 819,824 ----
  dnl ---------------------------------------------------------------------------
  
! # 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`