[Wxlua-commit] wxLua/build/autoconf configure.ac,1.53,1.54

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	configure.ac 
Log Message:
Use wx-config --libs base,core,adv, i.e. add base,core since they may not
  be added for old wx-config versions. Note: 2.9 should do this for us.
Honor --enable-shared=no for wxLua to generate static libs and properly link to
  them using -l../lib/wxlua_xxx.a and not just -lwxlua_xxx

Index: configure.ac
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** configure.ac	13 Jan 2008 19:51:04 -0000	1.53
--- configure.ac	14 Jan 2008 05:09:45 -0000	1.54
***************
*** 303,309 ****

              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
--- 303,310 ----

              dnl before WX_LIBS we want the lib of Adv
+             # Note: The dependencies were found in wxGTK using ldd
              #WX_LIKE_LIBNAME([_WX_ADV_LIBNAME], [wx], [adv])
              #LIBS="$LIBS -l$_WX_ADV_LIBNAME $WX_LIBS"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,adv`

              dnl check for this component presence
***************
*** 330,338 ****
  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"
  else
--- 331,339 ----
  if [[[ "$USE_WXBINDADV" = "1" && "$WXADV_PRESENCE" = "1" ]]]; then

!     dnl # add to the library to link to the wxADV lib
!     dnl WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [adv]) *** Doesn't work for static builds
!     dnl WX_LIBS="-l$_WX_ADV_LIBNAME $WX_LIBS" *** nor this

!     # add adv to the list of wx-config --libs xxx
      WXLIB_NAMES="adv,$WXLIB_NAMES"
  else
***************
*** 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
--- 355,359 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,adv,aui`

              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
--- 399,403 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,gl`

              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
--- 443,447 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,html`

              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
--- 487,491 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,media`

              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
--- 531,535 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,net`

              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
--- 575,579 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,xml,html,adv,richtext`

              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
--- 619,623 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,xml`

              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
--- 663,667 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,xml,core,adv,html,xrc`

              dnl check for this component presence
***************
*** 706,710 ****
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs stc`

              dnl check for this component presence
--- 707,711 ----
              CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
              CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
!             LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,stc`

              dnl check for this component presence
***************
*** 827,834 ****
      [
          if test $1 == "1"; then
              WX_LIKE_LIBNAME([_TMP], [wxlua], [$2])
!             WXLUA_LIBS="-l$_TMP $WXLUA_LIBS"
!             #$1="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_$2-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS"
! 
          fi
      ])
--- 828,838 ----
      [
          if test $1 == "1"; then
+             #"-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_$2-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS"
              WX_LIKE_LIBNAME([_TMP], [wxlua], [$2])
!             if test "$SHARED" = "1" ; then
!                 WXLUA_LIBS="-l$_TMP $WXLUA_LIBS"
!             else
!                 WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS"
!             fi
          fi
      ])
***************
*** 863,870 ****
          dnl the set of the module names, comma separed
          WXLUA_MODNAMES="$WXLUA_MODNAMES $1"
-         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_$1""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"

          dnl the set of the wxLua library names
!         WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"

          dnl the set of the wxLua library names prefixed with -l
--- 867,875 ----
          dnl the set of the module names, comma separed
          WXLUA_MODNAMES="$WXLUA_MODNAMES $1"

          dnl the set of the wxLua library names
!         #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_$1""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
!         WX_LIKE_LIBNAME([_TMP], [wxlua], [$1])
!         WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP"

          dnl the set of the wxLua library names prefixed with -l