Update of /cvsroot/wxlua/wxLua/build/autoconf
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18731/build/autoconf
Modified Files:
configure.ac
Log Message:
fix WXLUA_LIBS creation and add better comments
Index: configure.ac
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** configure.ac 14 Jan 2008 12:13:33 -0000 1.55
--- configure.ac 14 Jan 2008 13:21:55 -0000 1.56
***************
*** 173,176 ****
--- 173,177 ----
WXLIB_NAMES="core,base"
+ # Initial list of wxLua libraries
WXLUA_LIBS="-llua5.1"
***************
*** 184,194 ****
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)
-
# standard wxWidgets checks:
WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
! WX_CONFIG_CHECK([2.8.0], [wxWin=1], , [$WXLIBS_REQUIRED], [$WXCONFIG_FLAGS])
WX_DETECT_STANDARD_OPTION_VALUES
--- 185,195 ----
AC_PROG_CXX
# standard wxWidgets checks:
+ # NOTE: the 'core,base' string passed to WX_CONFIG_CHECK macro here
+ # is just a fake list of the required wxWidgets libraries.
+ # Later we'll check for the existence of each wxWidgets library
+ # and then we'll rebuild the WX_LIBS string
WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
! WX_CONFIG_CHECK([2.8.0], [wxWin=1], [], [core,base], [$WXCONFIG_FLAGS])
WX_DETECT_STANDARD_OPTION_VALUES
***************
*** 305,309 ****
dnl check for this component presence
! AC_MSG_CHECKING([if wxWidgets $1 bindings are available])
AC_LINK_IFELSE([
AC_LANG_PROGRAM([#include <$3>],
--- 306,310 ----
dnl check for this component presence
! AC_MSG_CHECKING([if wxWidgets $1 library is available])
AC_LINK_IFELSE([
AC_LANG_PROGRAM([#include <$3>],
***************
*** 580,588 ****
if test $1 == "1"; then
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
])
--- 581,585 ----
if test $1 == "1"; then
WX_LIKE_LIBNAME([_TMP], [wxlua], [$2])
! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS"
fi
])
***************
*** 619,623 ****
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"
--- 616,619 ----
|
