Update of /cvsroot/wxlua/wxLua/build/autoconf
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua/build/autoconf
Modified Files:
configure.ac
Log Message:
Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml
since these files contain more than just printing or the htmlwin.
Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix
to make it easier to specify where wxStEdit is.
Index: configure.ac
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** configure.ac 10 Jan 2008 17:04:25 -0000 1.47
--- configure.ac 10 Jan 2008 23:06:24 -0000 1.48
***************
*** 93,96 ****
--- 93,100 ----
[lua_dir="$withval"], [lua_dir=""])
+ AC_ARG_WITH([wxstedit-prefix],
+ [AC_HELP_STRING([--with-wxstedit-prefix], [Prefix where wxStEdit is installed (optional)])],
+ [wxstedit_dir="$withval"], [wxstedit_dir=""])
+
UTILS_YESNO_OPTCHECK([USE_WXLUAAPP], [enable_wxlua_app], [--enable-wxlua-app])
UTILS_YESNO_OPTCHECK([USE_WXLUACANAPP], [enable_wxluacan_app], [--enable-wxluacan-app])
***************
*** 133,136 ****
--- 137,155 ----
AC_MSG_RESULT([$lua_dir])
+ AC_MSG_CHECKING([for the --with-wxstedit-prefix option])
+ if test ! $wxstedit_dir = ""; then
+
+ # user explicitely provided a path to its own wxStEdit, check that it's an absolute path
+ # (or it won't work for out-of-tree builds)
+ case $wxstedit_dir in
+ /*) continue;;
+ *)
+ AC_MSG_ERROR([
+ You must provide an absolute path for the --with-wxstedit-prefix option.
+ ])
+ esac
+ fi
+ AC_MSG_RESULT([$wxstedit_dir])
+
# Global wxLua options:
***************
*** 297,300 ****
--- 316,320 ----
else
USE_WXBINDADV=0
+ CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXADV=0"
fi
***************
*** 342,345 ****
--- 362,366 ----
else
USE_WXBINDAUI=0
+ CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXAUI=0"
fi
***************
*** 387,390 ****
--- 408,412 ----
else
USE_WXBINDGL=0
+ CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXGL=0"
fi
***************
*** 432,435 ****
--- 454,458 ----
else
USE_WXBINDHTML=0
+ CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXHTML=0"
fi
***************
*** 477,480 ****
--- 500,504 ----
else
USE_WXBINDMEDIA=0
+ CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXMEDIA=0"
fi
***************
*** 526,529 ****
--- 550,554 ----
dnl else
dnl USE_WXBINDNET=0
+ dnl CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXNET=0"
dnl fi
***************
*** 571,574 ****
--- 596,600 ----
else
USE_WXBINDRICHTEXT=0
+ CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXRICHTEXT=0"
fi
***************
*** 620,623 ****
--- 646,650 ----
dnl else
dnl USE_WXBINDXML=0
+ dnl CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXXML=0"
dnl fi
***************
*** 665,668 ****
--- 692,696 ----
else
USE_WXBINDXRC=0
+ CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXXRC=0"
fi
***************
*** 751,754 ****
--- 779,783 ----
USE_WXLUAAPP=0
USE_WXLUAEDITAPP=0
+ CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXSTC=0"
fi
else
***************
*** 757,764 ****
--- 786,795 ----
USE_WXLUAAPP=0
USE_WXLUAEDITAPP=0
+ CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXSTC=0"
fi
dnl ---------------------------------------------------------------------------
+ dnl wxStEdit check
dnl --------------------------------------------------------------------------
***************
*** 770,773 ****
--- 801,819 ----
minversion="1.2.4"
+ 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
+
+ # if it's not empty then add the search paths for the includes and lib
+ if test ! "$WXSTEDIT" = ""; then
+ CPPFLAGS="$CPPFLAGS -I$WXSTEDIT/include"
+ LDFLAGS="$LDFLAGS -L$WXSTEDIT/lib"
+ fi
+
WX_LIKE_LIBNAME([_WX_STEDIT_LIBNAME], [wxcode], [stedit])
AM_WXCODE_CHECKFOR_COMPONENT_VERSION([wxStEdit], [wx/stedit/stedit.h],
***************
*** 802,810 ****
AC_DEFUN([AC_ADD_WXLUA_LIBS],
[
! if test $3 == "1"; then
! TMP=""
! WX_LIKE_LIBNAME([TMP], [wxlua], [$4])
! $1="-l$TMP $2"
! #$1="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_$4-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $2"
fi
--- 848,855 ----
AC_DEFUN([AC_ADD_WXLUA_LIBS],
[
! 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
***************
*** 812,833 ****
! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], ["1"], [wxlua])
! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXLUADEBUG], [wxluadebug])
! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXLUASOCKET], [wxluasocket])
! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDBASE], [wxbindbase])
! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDCORE], [wxbindcore])
! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDNET], [wxbindnet])
! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDXML], [wxbindxml])
! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDADV], [wxbindadv])
! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDAUI], [wxbindaui])
! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDGL], [wxbindgl])
! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDHTML], [wxbindhtml])
! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDMEDIA], [wxbindmedia])
! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDRICHTEXT], [wxbindrichtext])
! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDSTC], [wxbindstc])
! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDXRC], [wxbindxrc])
! echo $WXLUA_LIBS
AC_SUBST([WXLUA_LIBS])
--- 857,890 ----
! AC_ADD_WXLUA_LIBS(["1"], [wxlua])
! AC_ADD_WXLUA_LIBS([$USE_WXLUADEBUG], [wxluadebug])
! AC_ADD_WXLUA_LIBS([$USE_WXLUASOCKET], [wxluasocket])
! AC_ADD_WXLUA_LIBS([$USE_WXBINDBASE], [wxbindbase])
! AC_ADD_WXLUA_LIBS([$USE_WXBINDCORE], [wxbindcore])
! AC_ADD_WXLUA_LIBS([$USE_WXBINDNET], [wxbindnet])
! AC_ADD_WXLUA_LIBS([$USE_WXBINDXML], [wxbindxml])
! AC_ADD_WXLUA_LIBS([$USE_WXBINDADV], [wxbindadv])
! AC_ADD_WXLUA_LIBS([$USE_WXBINDAUI], [wxbindaui])
! AC_ADD_WXLUA_LIBS([$USE_WXBINDGL], [wxbindgl])
! AC_ADD_WXLUA_LIBS([$USE_WXBINDHTML], [wxbindhtml])
! AC_ADD_WXLUA_LIBS([$USE_WXBINDMEDIA], [wxbindmedia])
! AC_ADD_WXLUA_LIBS([$USE_WXBINDRICHTEXT], [wxbindrichtext])
! AC_ADD_WXLUA_LIBS([$USE_WXBINDSTC], [wxbindstc])
! AC_ADD_WXLUA_LIBS([$USE_WXBINDXRC], [wxbindxrc])
! # It is sometimes hard to dig out from the Makefiles these values
! AC_MSG_NOTICE([
! Complier and linker directives summary.
!
! CFLAGS : '$CFLAGS'
! CXXFLAGS : '$CXXFLAGS'
! CPPFLAGS : '$CPPFLAGS'
! WX_CXXFLAGS : '$WX_CXXFLAGS'
! LDFLAGS : '$LDFLAGS'
! WX_LIBS : '$WX_LIBS'
! WXLUA_LIBS : '$WXLUA_LIBS'
!
! ])
AC_SUBST([WXLUA_LIBS])
|
