Update of /cvsroot/wxlua/wxLua/build/autoconf
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18209/build/autoconf
Modified Files:
aclocal.m4 configure.ac
Log Message:
multiple fixes to the build system: updated DSP/DSW, renamed some targets, now wxStEdit libname is correctly used, removed unused files from CVS
Index: configure.ac
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** configure.ac 8 Dec 2006 13:19:57 -0000 1.31
--- configure.ac 10 Dec 2006 00:47:22 -0000 1.32
***************
*** 187,190 ****
--- 187,220 ----
])
+
+ dnl ---------------------------------------------------------------------------
+ dnl AM_SET_WXLIKE_LIBNAME([prefix], [name])
+ dnl
+ dnl Sets the WXLIKE_LIBNAME string to the name of a library named with same
+ dnl wxWidgets rules (e.g. for name=='test', prefix="mine", sets WXLIKE_LIBNAME
+ dnl to 'mine_gtk2[u][d]_test-2.8' if WX_PORT=gtk2 and WX_VERSION=28)
+ dnl ---------------------------------------------------------------------------
+ AC_DEFUN([AM_SET_WXLIKE_LIBNAME],
+ [
+ WXLIKE_LIBNAME="$1""_""$WX_PORT"
+
+ if test "$WX_PORT" = "gtk"; then
+ WXLIKE_LIBNAME="$WXLIKE_LIBNAME""$WX_GTKPORT_VERSION"
+ fi
+
+ dnl add the [u][d] string
+ if test "$WX_UNICODE" = "1"; then
+ WXLIKE_LIBNAME="$WXLIKE_LIBNAME""u"
+ fi
+ if test "$WX_DEBUG" = "1"; then
+ WXLIKE_LIBNAME="$WXLIKE_LIBNAME""d"
+ fi
+
+ dnl complete name of the lib
+ WXLIKE_LIBNAME="$WXLIKE_LIBNAME""_""$2""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR"
+ ])
+
+
+
# check for STC wrapper for wxWidgets
if [[ "$USE_WXBINDSTC" = "1" ]]; then
***************
*** 228,234 ****
minversion="1.2.0"
AM_WXCODE_CHECKFOR_COMPONENT_VERSION([wxStEdit], [wx/stedit/stedit.h],
! [stedit], [wxSTEditor dummy;], [$minversion], [STE_], [_VERSION],
! [ac_cv_prog_stedit_set=1], [ac_cv_prog_stedit_set=0])
if test $ac_cv_prog_stedit_set = "1"; then
--- 258,268 ----
minversion="1.2.0"
+ AM_SET_WXLIKE_LIBNAME([wx], [stedit])
+
AM_WXCODE_CHECKFOR_COMPONENT_VERSION([wxStEdit], [wx/stedit/stedit.h],
! [$WXLIKE_LIBNAME], [wxSTEditor dummy;], [$minversion],
! [STE_], [_VERSION],
! [ac_cv_prog_stedit_set=1],
! [ac_cv_prog_stedit_set=0])
if test $ac_cv_prog_stedit_set = "1"; then
***************
*** 300,304 ****
# the wx.so library in ../lib; thus we need to copy the sample(s) to the
# build directory to preserve the relative path correctness
! if [[ ! -z "$srcdir" ]]; then
AC_MSG_NOTICE([configure: copying $srcdir/samples to ./samples])
--- 334,338 ----
# the wx.so library in ../lib; thus we need to copy the sample(s) to the
# build directory to preserve the relative path correctness
! if [[ "$top_srcdir" != "." ]]; then
AC_MSG_NOTICE([configure: copying $srcdir/samples to ./samples])
|
