Menu
▾
▴
[Wxlua-commit] wxLua/build/autoconf aclocal.m4, 1.30, 1.31 acregen.sh, 1.2, 1.3 autoconf_inc.m4, 1.18, 1.19 configure.ac, 1.30, 1.31
|
From: Francesco M. <fr...@us...> - 2006-12-08 13:20:33
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11454/build/autoconf Modified Files: aclocal.m4 acregen.sh autoconf_inc.m4 configure.ac Log Message: Switched to latest patched bakefile (which only differs for option renaming feature). Removed customized build of LUA interpreter: we now use vanilla lua. Now BUILDDIR is set differently for shared and static builds to avoid clashes. Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** autoconf_inc.m4 20 May 2006 13:12:34 -0000 1.18 --- autoconf_inc.m4 8 Dec 2006 13:19:57 -0000 1.19 *************** *** 7,11 **** BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2" ! dnl ### begin block 20_COND_BUILD_DEBUG[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG="#" if test "x$BUILD" = "xdebug" ; then --- 7,11 ---- BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2" ! dnl ### begin block 20_COND_BUILD_DEBUG[../../util/build/bakefiles/util.bkl] ### COND_BUILD_DEBUG="#" if test "x$BUILD" = "xdebug" ; then *************** *** 13,17 **** fi AC_SUBST(COND_BUILD_DEBUG) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG_UNICODE_0="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then --- 13,17 ---- fi AC_SUBST(COND_BUILD_DEBUG) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_0[../../util/build/bakefiles/util.bkl] ### COND_BUILD_DEBUG_UNICODE_0="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then *************** *** 19,23 **** fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_0) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG_UNICODE_1="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then --- 19,23 ---- fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_0) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_1[../../util/build/bakefiles/util.bkl] ### COND_BUILD_DEBUG_UNICODE_1="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then *************** *** 25,29 **** fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_1) ! dnl ### begin block 20_COND_BUILD_RELEASE[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_RELEASE="#" if test "x$BUILD" = "xrelease" ; then --- 25,29 ---- fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_1) ! dnl ### begin block 20_COND_BUILD_RELEASE[../../util/build/bakefiles/util.bkl] ### COND_BUILD_RELEASE="#" if test "x$BUILD" = "xrelease" ; then *************** *** 31,35 **** fi AC_SUBST(COND_BUILD_RELEASE) ! dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_RELEASE_UNICODE_1="#" if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then --- 31,35 ---- fi AC_SUBST(COND_BUILD_RELEASE) ! dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_1[../../util/build/bakefiles/util.bkl] ### COND_BUILD_RELEASE_UNICODE_1="#" if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then *************** *** 97,101 **** fi AC_SUBST(COND_PLATFORM_WIN32_1) ! dnl ### begin block 20_COND_SHARED_0[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_0="#" if test "x$SHARED" = "x0" ; then --- 97,101 ---- fi AC_SUBST(COND_PLATFORM_WIN32_1) ! dnl ### begin block 20_COND_SHARED_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_SHARED_0="#" if test "x$SHARED" = "x0" ; then *************** *** 121,125 **** fi AC_SUBST(COND_SHARED_0_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_SHARED_1[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_1="#" if test "x$SHARED" = "x1" ; then --- 121,125 ---- fi AC_SUBST(COND_SHARED_0_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_SHARED_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_SHARED_1="#" if test "x$SHARED" = "x1" ; then *************** *** 151,155 **** fi AC_SUBST(COND_SHARED_1_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_UNICODE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_UNICODE_0="#" if test "x$UNICODE" = "x0" ; then --- 151,155 ---- fi AC_SUBST(COND_SHARED_1_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_UNICODE_0[../../util/build/bakefiles/util.bkl] ### COND_UNICODE_0="#" if test "x$UNICODE" = "x0" ; then *************** *** 157,161 **** fi AC_SUBST(COND_UNICODE_0) ! dnl ### begin block 20_COND_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_UNICODE_1="#" if test "x$UNICODE" = "x1" ; then --- 157,161 ---- fi AC_SUBST(COND_UNICODE_0) ! dnl ### begin block 20_COND_UNICODE_1[../../util/build/bakefiles/util.bkl] ### COND_UNICODE_1="#" if test "x$UNICODE" = "x1" ; then *************** *** 235,238 **** --- 235,262 ---- fi AC_SUBST(COND_WINDOWS_IMPLIB_1) + dnl ### begin block 20_COND_WX_DEBUG_0_WX_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_WX_DEBUG_0_WX_UNICODE_1="#" + if test "x$WX_DEBUG" = "x0" -a "x$WX_UNICODE" = "x1" ; then + COND_WX_DEBUG_0_WX_UNICODE_1="" + fi + AC_SUBST(COND_WX_DEBUG_0_WX_UNICODE_1) + dnl ### begin block 20_COND_WX_DEBUG_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_WX_DEBUG_1="#" + if test "x$WX_DEBUG" = "x1" ; then + COND_WX_DEBUG_1="" + fi + AC_SUBST(COND_WX_DEBUG_1) + dnl ### begin block 20_COND_WX_DEBUG_1_WX_UNICODE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_WX_DEBUG_1_WX_UNICODE_0="#" + if test "x$WX_DEBUG" = "x1" -a "x$WX_UNICODE" = "x0" ; then + COND_WX_DEBUG_1_WX_UNICODE_0="" + fi + AC_SUBST(COND_WX_DEBUG_1_WX_UNICODE_0) + dnl ### begin block 20_COND_WX_DEBUG_1_WX_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_WX_DEBUG_1_WX_UNICODE_1="#" + if test "x$WX_DEBUG" = "x1" -a "x$WX_UNICODE" = "x1" ; then + COND_WX_DEBUG_1_WX_UNICODE_1="" + fi + AC_SUBST(COND_WX_DEBUG_1_WX_UNICODE_1) dnl ### begin block 20_COND_WX_PORT_GTK[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_WX_PORT_GTK="#" Index: acregen.sh =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/acregen.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** acregen.sh 26 Nov 2005 14:06:05 -0000 1.2 --- acregen.sh 8 Dec 2006 13:19:57 -0000 1.3 *************** *** 1,3 **** ! #!/bin/sh # # Author: Francesco Montorsi --- 1,3 ---- ! #!/bin/bash # # Author: Francesco Montorsi *************** *** 21,24 **** --- 21,33 ---- } + # called when an old version of autoconf is found + function autoconfold() + { + echo "Your autoconf version is $aclocal_maj.$aclocal_min.$aclocal_rel" + echo "Your automake installation is too old; please install automake >= $aclocal_minimal_maj.$aclocal_minimal_min.$aclocal_minimal_rel" + echo "You can download automake from ftp://sources.redhat.com/pub/automake/" + exit 1 + } + # first check if we have an ACLOCAL version recent enough aclocal_verfull=$(aclocal --version) *************** *** 39,42 **** --- 48,70 ---- if [[ "$majok" = "1" && "$minok" = "1" && "$relok" = 0 ]]; then aclocalold; fi + + + + # check if we have an AUTOCONF version recent enough + autoconf_verfull=$(autoconf --version) + autoconf_maj=`echo $autoconf_verfull | sed 's/autoconf (GNU Autoconf) \([0-9]*\).\([0-9]*\).*/\1/'` + autoconf_min=`echo $autoconf_verfull | sed 's/autoconf (GNU Autoconf) \([0-9]*\).\([0-9]*\).*/\2/'` + + autoconf_minimal_maj=2 + autoconf_minimal_min=60 + + majok=$(expr $autoconf_maj \>= $autoconf_minimal_maj) + minok=$(expr $autoconf_min \>= $autoconf_minimal_min) + + if [[ "$majok" = "0" ]]; then autoconfold; fi + if [[ "$majok" = "1" && "$minok" = "0" ]]; then autoconfold; fi + + + # we can safely proceed me=$(basename $0) Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** configure.ac 9 Aug 2006 03:34:48 -0000 1.30 --- configure.ac 8 Dec 2006 13:19:57 -0000 1.31 *************** *** 275,279 **** AC_ADDMODULE([wxbind]) AC_ADDMODULE([wxbindstc]) ! AC_ADDMODULE([lua]) AC_SUBST([WXLUA_MODNAMES]) AC_SUBST([WXLUA_LIBNAMES]) --- 275,282 ---- AC_ADDMODULE([wxbind]) AC_ADDMODULE([wxbindstc]) ! ! WXLUA_LIBNAMES="$WXLUA_LIBNAMES lua5.1" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -llua5.1" ! AC_SUBST([WXLUA_MODNAMES]) AC_SUBST([WXLUA_LIBNAMES]) *************** *** 307,310 **** --- 310,319 ---- fi + # Create the output folders in the current build directory + # (this handles cases like: + # mkdir mybuild && cd mybuild && ../configure && make ) + AS_MKDIR_P(lib) + AS_MKDIR_P(bin) + AC_OUTPUT Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** aclocal.m4 21 May 2006 19:16:59 -0000 1.30 --- aclocal.m4 8 Dec 2006 13:19:57 -0000 1.31 *************** *** 301,305 **** [ #ifndef __INTEL_COMPILER ! #error Not ICC #endif ], --- 301,305 ---- [ #ifndef __INTEL_COMPILER ! This is not ICC #endif ], *************** *** 343,347 **** #if (__GNUC__ < 3) || \ ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1)) ! #error old gcc #endif ], --- 343,347 ---- #if (__GNUC__ < 3) || \ ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1)) ! This is old gcc #endif ], *************** *** 435,438 **** --- 435,439 ---- powerpc-apple-macos* | \ *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \ + *-*-mirbsd* | \ *-*-sunos4* | \ *-*-osf* | \ *************** *** 528,578 **** AC_DEFUN([AC_BAKEFILE_DEPS], [ AC_MSG_CHECKING([for dependency tracking method]) - DEPS_TRACKING=1 ! if test "x$GCC" = "xyes"; then ! DEPSMODE=gcc ! case "${BAKEFILE_HOST}" in ! *-*-darwin* ) ! dnl -cpp-precomp (the default) conflicts with -MMD option ! dnl used by bk-deps (see also http://developer.apple.com/documentation/Darwin/Conceptual/PortingUnix/compiling/chapter_4_section_3.html) ! DEPSFLAG="-no-cpp-precomp -MMD" ! ;; ! * ) ! DEPSFLAG="-MMD" ! ;; ! esac ! AC_MSG_RESULT([gcc]) ! elif test "x$MWCC" = "xyes"; then ! DEPSMODE=mwcc ! DEPSFLAG="-MM" ! AC_MSG_RESULT([mwcc]) ! elif test "x$SUNCC" = "xyes"; then ! DEPSMODE=unixcc ! DEPSFLAG="-xM1" ! AC_MSG_RESULT([Sun cc]) ! elif test "x$SGICC" = "xyes"; then ! DEPSMODE=unixcc ! DEPSFLAG="-M" ! AC_MSG_RESULT([SGI cc]) ! elif test "x$HPCC" = "xyes"; then ! DEPSMODE=unixcc ! DEPSFLAG="+make" ! AC_MSG_RESULT([HP cc]) ! elif test "x$COMPAQCC" = "xyes"; then ! DEPSMODE=gcc ! DEPSFLAG="-MD" ! AC_MSG_RESULT([Compaq cc]) ! else DEPS_TRACKING=0 ! AC_MSG_RESULT([none]) ! fi ! if test $DEPS_TRACKING = 1 ; then ! AC_BAKEFILE_CREATE_FILE_BK_DEPS ! chmod +x bk-deps fi AC_SUBST(DEPS_TRACKING) ]) --- 529,595 ---- AC_DEFUN([AC_BAKEFILE_DEPS], [ + AC_ARG_ENABLE([dependency-tracking], + AS_HELP_STRING([--disable-dependency-tracking], + [don't use dependency tracking even if the compiler can]), + [bk_use_trackdeps="$enableval"]) + AC_MSG_CHECKING([for dependency tracking method]) ! BK_DEPS="" ! if test "x$bk_use_trackdeps" = "xno" ; then DEPS_TRACKING=0 ! AC_MSG_RESULT([disabled]) ! else ! DEPS_TRACKING=1 ! if test "x$GCC" = "xyes"; then ! DEPSMODE=gcc ! case "${BAKEFILE_HOST}" in ! *-*-darwin* ) ! dnl -cpp-precomp (the default) conflicts with -MMD option ! dnl used by bk-deps (see also http://developer.apple.com/documentation/Darwin/Conceptual/PortingUnix/compiling/chapter_4_section_3.html) ! DEPSFLAG="-no-cpp-precomp -MMD" ! ;; ! * ) ! DEPSFLAG="-MMD" ! ;; ! esac ! AC_MSG_RESULT([gcc]) ! elif test "x$MWCC" = "xyes"; then ! DEPSMODE=mwcc ! DEPSFLAG="-MM" ! AC_MSG_RESULT([mwcc]) ! elif test "x$SUNCC" = "xyes"; then ! DEPSMODE=unixcc ! DEPSFLAG="-xM1" ! AC_MSG_RESULT([Sun cc]) ! elif test "x$SGICC" = "xyes"; then ! DEPSMODE=unixcc ! DEPSFLAG="-M" ! AC_MSG_RESULT([SGI cc]) ! elif test "x$HPCC" = "xyes"; then ! DEPSMODE=unixcc ! DEPSFLAG="+make" ! AC_MSG_RESULT([HP cc]) ! elif test "x$COMPAQCC" = "xyes"; then ! DEPSMODE=gcc ! DEPSFLAG="-MD" ! AC_MSG_RESULT([Compaq cc]) ! else ! DEPS_TRACKING=0 ! AC_MSG_RESULT([none]) ! fi ! ! if test $DEPS_TRACKING = 1 ; then ! AC_BAKEFILE_CREATE_FILE_BK_DEPS ! chmod +x bk-deps ! dnl FIXME: make this $(top_builddir)/bk-deps once autoconf-2.60 ! dnl is required (and so top_builddir is never empty): ! BK_DEPS="`pwd`/bk-deps" ! fi fi AC_SUBST(DEPS_TRACKING) + AC_SUBST(BK_DEPS) ]) *************** *** 593,597 **** AC_SUBST(MAKE_SET) ! AC_CHECK_TOOL(AR, ar, ar) AC_CHECK_TOOL(STRIP, strip, :) AC_CHECK_TOOL(NM, nm, :) --- 610,626 ---- AC_SUBST(MAKE_SET) ! if test "x$SUNCXX" = "xyes"; then ! dnl Sun C++ compiler requires special way of creating static libs; ! dnl see here for more details: ! dnl https://sourceforge.net/tracker/?func=detail&atid=109863&aid=1229751&group_id=9863 ! AR=$CXX ! AC_SUBST(AR) ! AROPTIONS="-xar -o" ! else ! AC_CHECK_TOOL(AR, ar, ar) ! AROPTIONS=rcu ! fi ! AC_SUBST(AROPTIONS) ! AC_CHECK_TOOL(STRIP, strip, :) AC_CHECK_TOOL(NM, nm, :) *************** *** 603,607 **** INSTALL_DIR="mkdir -p" ;; ! *) INSTALL_DIR="$INSTALL -d" ;; esac --- 632,639 ---- INSTALL_DIR="mkdir -p" ;; ! * ) ! dnl we must refer to makefile's $(INSTALL) variable and not ! dnl current value of shell variable, hence the single quoting: ! INSTALL_DIR='$(INSTALL) -d' ;; esac *************** *** 659,662 **** --- 691,695 ---- ICC_PCH=0 USE_PCH=0 + BK_MAKE_PCH="" case ${BAKEFILE_HOST} in *************** *** 676,683 **** [ #if !defined(__GNUC__) || !defined(__GNUC_MINOR__) ! #error "no pch support" #endif #if (__GNUC__ < 3) ! #error "no pch support" #endif #if (__GNUC__ == 3) && \ --- 709,716 ---- [ #if !defined(__GNUC__) || !defined(__GNUC_MINOR__) ! There is no PCH support #endif #if (__GNUC__ < 3) ! There is no PCH support #endif #if (__GNUC__ == 3) && \ *************** *** 685,689 **** ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3))) || \ ( defined(__INTEL_COMPILER) ) ! #error "no pch support" #endif ], --- 718,722 ---- ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3))) || \ ( defined(__INTEL_COMPILER) ) ! There is no PCH support #endif ], *************** *** 696,701 **** [ #if !defined(__INTEL_COMPILER) || \ ! (__INTEL_COMPILER < 900) ! #error "no pch support" #endif ], --- 729,734 ---- [ #if !defined(__INTEL_COMPILER) || \ ! (__INTEL_COMPILER < 800) ! There is no PCH support #endif ], *************** *** 712,715 **** --- 745,752 ---- AC_BAKEFILE_CREATE_FILE_BK_MAKE_PCH chmod +x bk-make-pch + dnl FIXME: make this $(top_builddir)/bk-make-pch once + dnl autoconf-2.60 is required (and so top_builddir is + dnl never empty): + BK_MAKE_PCH="`pwd`/bk-make-pch" fi fi *************** *** 718,721 **** --- 755,759 ---- AC_SUBST(GCC_PCH) AC_SUBST(ICC_PCH) + AC_SUBST(BK_MAKE_PCH) ]) *************** *** 745,749 **** AC_DEFUN([AC_BAKEFILE], [ ! AC_PREREQ(2.58) if test "x$BAKEFILE_HOST" = "x"; then --- 783,787 ---- AC_DEFUN([AC_BAKEFILE], [ ! AC_PREREQ([2.58]) if test "x$BAKEFILE_HOST" = "x"; then *************** *** 1512,1516 **** fi ;; ! -use-pch ) shift add_to_cmdline=0 --- 1550,1554 ---- fi ;; ! -use-pch|-use_pch ) shift add_to_cmdline=0 *************** *** 1544,1548 **** EOT # using -MF icc complains about differing command lines in creation/use ! ${D}compiler -c -create-pch ${D}outfile -MMD ${D}file && \\ sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\ rm -f ${D}file ${D}dfile ${D}{filename}.o --- 1582,1586 ---- EOT # using -MF icc complains about differing command lines in creation/use ! ${D}compiler -c -create_pch ${D}outfile -MMD ${D}file && \\ sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\ rm -f ${D}file ${D}dfile ${D}{filename}.o |
