Update of /cvsroot/wxlua/wxLua/build/autoconf
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19934/wxLua/build/autoconf
Modified Files:
configure.ac wxwin.m4
Log Message:
Fix for $DEBUG="" == $DEBUG="0" in wxwin.m4
Less awkward echo statement in configure.ac
Index: configure.ac
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** configure.ac 14 Jan 2008 18:10:31 -0000 1.58
--- configure.ac 14 Jan 2008 18:56:16 -0000 1.59
***************
*** 551,559 ****
if test ! "$wxstedit_dir" = ""; then
WXSTEDIT=$wxstedit_dir
! echo Path to wxStEdit from --with-wxstedit-dir: \'$WXSTEDIT\'
else
# Try to get the wxStEdit src dir from the shell environment variable
WXSTEDIT=`echo $WXSTEDIT`
! echo Path to wxStEdit from \$WXSTEDIT environment variable: \'$WXSTEDIT\'
fi
--- 551,559 ----
if test ! "$wxstedit_dir" = ""; then
WXSTEDIT=$wxstedit_dir
! echo "Path to wxStEdit from --with-wxstedit-dir: '$WXSTEDIT'"
else
# Try to get the wxStEdit src dir from the shell environment variable
WXSTEDIT=`echo $WXSTEDIT`
! echo "Path to wxStEdit from \$WXSTEDIT environment variable: '$WXSTEDIT'"
fi
***************
*** 564,567 ****
--- 564,570 ----
fi
+ # Temporarily rewrite WX_LIBS to include all the libs that wxStEdit requires.
+ WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs html,adv,core,base`
+
WX_LIKE_LIBNAME([_WX_STEDIT_LIBNAME], [wxcode], [stedit])
AM_WXCODE_CHECKFOR_COMPONENT_VERSION([wxStEdit], [wx/stedit/stedit.h],
***************
*** 578,582 ****
For more information about wxStEdit look at
http://wxcode.sourceforge.net/components/wxstedit
! For more information about why exactly this check is
failed look in config.log.
--- 581,585 ----
For more information about wxStEdit look at
http://wxcode.sourceforge.net/components/wxstedit
! For more information about why exactly this check has
failed look in config.log.
***************
*** 781,785 ****
echo
! echo " - compact list of the wxWidgets library for which"
echo " binding modules will be created: "
echo " $WXLIB_NAMES"
--- 784,788 ----
echo
! echo " - compact list of the wxWidgets libraries for which"
echo " binding modules will be created: "
echo " $WXLIB_NAMES"
Index: wxwin.m4
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/wxwin.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxwin.m4 14 Jan 2008 13:20:55 -0000 1.4
--- wxwin.m4 14 Jan 2008 18:56:16 -0000 1.5
***************
*** 409,413 ****
dnl AC_MSG_ERROR([
dnl The wxrc program was not installed or not found.
! dnl
dnl Please check the wxWidgets installation.
dnl ])
--- 409,413 ----
dnl AC_MSG_ERROR([
dnl The wxrc program was not installed or not found.
! dnl
dnl Please check the wxWidgets installation.
dnl ])
***************
*** 438,448 ****
[
AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler])
!
if test "x$WX_CONFIG_NAME" = x; then
AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.])
else
!
AC_MSG_CHECKING([for wxrc])
!
if test "x$WXRC" = x ; then
dnl wx-config --utility is a new addition to wxWidgets:
--- 438,448 ----
[
AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler])
!
if test "x$WX_CONFIG_NAME" = x; then
AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.])
else
!
AC_MSG_CHECKING([for wxrc])
!
if test "x$WXRC" = x ; then
dnl wx-config --utility is a new addition to wxWidgets:
***************
*** 460,464 ****
ifelse([$1], , :, [$1])
fi
!
AC_SUBST(WXRC)
fi
--- 460,464 ----
ifelse([$1], , :, [$1])
fi
!
AC_SUBST(WXRC)
fi
***************
*** 468,476 ****
dnl WX_LIKE_LIBNAME([output-var] [prefix], [name])
dnl
! dnl Sets the "output-var" variable to the name of a library named with same
dnl wxWidgets rule.
! dnl E.g. for output-var=='lib', name=='test', prefix='mine', sets
dnl the $lib variable to:
! dnl 'mine_gtk2ud_test-2.8'
dnl if WX_PORT=gtk2, WX_UNICODE=1, WX_DEBUG=1 and WX_RELEASE=28
dnl ---------------------------------------------------------------------------
--- 468,476 ----
dnl WX_LIKE_LIBNAME([output-var] [prefix], [name])
dnl
! dnl Sets the "output-var" variable to the name of a library named with same
dnl wxWidgets rule.
! dnl E.g. for output-var=='lib', name=='test', prefix='mine', sets
dnl the $lib variable to:
! dnl 'mine_gtk2ud_test-2.8'
dnl if WX_PORT=gtk2, WX_UNICODE=1, WX_DEBUG=1 and WX_RELEASE=28
dnl ---------------------------------------------------------------------------
***************
*** 750,754 ****
dnl ---------------------------------------------------------------------------
! dnl _WX_SELECTEDCONFIG_CHECKFOR([RESULTVAR], [STRING], [MSG]
dnl [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl
--- 750,754 ----
dnl ---------------------------------------------------------------------------
! dnl _WX_SELECTEDCONFIG_CHECKFOR([RESULTVAR], [STRING], [MSG]
dnl [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl
***************
*** 765,771 ****
AC_MSG_CHECKING([$3])
! dnl set WX_$1 variable to 1 if the $WX_SELECTEDCONFIG contains the $2
dnl string or to 0 otherwise.
! dnl NOTE: 'expr match STRING REGEXP' cannot be used since on Mac it
dnl doesn't work; we use 'expr STRING : REGEXP' instead
WX_$1=$(expr "$WX_SELECTEDCONFIG" : ".*$2.*")
--- 765,771 ----
AC_MSG_CHECKING([$3])
! dnl set WX_$1 variable to 1 if the $WX_SELECTEDCONFIG contains the $2
dnl string or to 0 otherwise.
! dnl NOTE: 'expr match STRING REGEXP' cannot be used since on Mac it
dnl doesn't work; we use 'expr STRING : REGEXP' instead
WX_$1=$(expr "$WX_SELECTEDCONFIG" : ".*$2.*")
***************
*** 952,956 ****
if test "$DEBUG" = "1"; then
BUILD="debug"
! elif test "$DEBUG" = ""; then
BUILD="release"
fi
--- 952,956 ----
if test "$DEBUG" = "1"; then
BUILD="debug"
! elif test "$DEBUG" = "" -o "$DEBUG" = "0"; then
BUILD="release"
fi
***************
*** 1013,1017 ****
dnl WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN, WX_STANDARD_OPTIONS_SUMMARY_MSG_END
dnl
! dnl Like WX_STANDARD_OPTIONS_SUMMARY_MSG macro but these two macros also gives info
dnl about the configuration of the package which used the wxpresets.
dnl
--- 1013,1017 ----
dnl WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN, WX_STANDARD_OPTIONS_SUMMARY_MSG_END
dnl
! dnl Like WX_STANDARD_OPTIONS_SUMMARY_MSG macro but these two macros also gives info
dnl about the configuration of the package which used the wxpresets.
dnl
|
