Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade m4 files to bakefile 0.2.3

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-02-04 13:21:23 +00:00
parent 54797e6de3
commit 5b8deabaf4
2 changed files with 102 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
build/aclocal/bakefile.m4
View File

@@ -1,5 +1,5 @@
dnl dnl
dnl This file is part of Bakefile (http://bakefile.sourceforge.net) dnl This file is part of Bakefile (http://www.bakefile.org)
dnl dnl
dnl Copyright (C) 2003-2007 Vaclav Slavik and others dnl Copyright (C) 2003-2007 Vaclav Slavik and others
dnl dnl
@@ -126,7 +126,7 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
PLATFORM_BEOS=1 PLATFORM_BEOS=1
;; ;;
* ) * )
dnl wxWidgets-specific: allow unknown Unix systems dnl wxWidgets-specific: allow unknown Unix systems
dnl AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM]) dnl AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
;; ;;
esac esac
@@ -331,7 +331,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
chmod +x shared-ld-sh chmod +x shared-ld-sh
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o" SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC" SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC"
dnl Most apps benefit from being fully binded (its faster and static dnl Most apps benefit from being fully binded (its faster and static
dnl variables initialized at startup work). dnl variables initialized at startup work).
@@ -489,7 +489,8 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
SONAME_FLAG= SONAME_FLAG=
case "${BAKEFILE_HOST}" in case "${BAKEFILE_HOST}" in
*-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu ) *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
*-*-k*bsd*-gnu | *-*-mirbsd* )
if test "x$SUNCXX" = "xyes"; then if test "x$SUNCXX" = "xyes"; then
SONAME_FLAG="-h " SONAME_FLAG="-h "
else else
@@ -639,18 +640,21 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
AC_CHECK_TOOL(STRIP, strip, :) AC_CHECK_TOOL(STRIP, strip, :)
AC_CHECK_TOOL(NM, nm, :) AC_CHECK_TOOL(NM, nm, :)
case ${BAKEFILE_HOST} in dnl This check is necessary because "install -d" doesn't exist on
*-hp-hpux* ) dnl all platforms (e.g. HP/UX), see http://www.bakefile.org/ticket/80
dnl HP-UX install doesn't handle the "-d" switch so don't AC_MSG_CHECKING([for command to install directories])
dnl use it there INSTALL_TEST_DIR=acbftest$$
INSTALL_DIR="mkdir -p" $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1
;; if test $? = 0 -a -d $INSTALL_TEST_DIR; then
* ) rmdir $INSTALL_TEST_DIR
dnl we must refer to makefile's $(INSTALL) variable and not dnl we must refer to makefile's $(INSTALL) variable and not
dnl current value of shell variable, hence the single quoting: dnl current value of shell variable, hence the single quoting:
INSTALL_DIR='$(INSTALL) -d' INSTALL_DIR='$(INSTALL) -d'
;; AC_MSG_RESULT([$INSTALL -d])
esac else
INSTALL_DIR="mkdir -p"
AC_MSG_RESULT([mkdir -p])
fi
AC_SUBST(INSTALL_DIR) AC_SUBST(INSTALL_DIR)
LDFLAGS_GUI= LDFLAGS_GUI=
@@ -798,6 +802,12 @@ AC_DEFUN([AC_BAKEFILE],
[ [
AC_PREREQ([2.58]) AC_PREREQ([2.58])
dnl We need to always run C/C++ compiler tests, but it's also possible
dnl for the user to call these macros manually, hence this instead of
dnl simply calling these macros. See http://www.bakefile.org/ticket/64
AC_REQUIRE([AC_BAKEFILE_PROG_CC])
AC_REQUIRE([AC_BAKEFILE_PROG_CXX])
if test "x$BAKEFILE_HOST" = "x"; then if test "x$BAKEFILE_HOST" = "x"; then
if test "x${host}" = "x" ; then if test "x${host}" = "x" ; then
AC_MSG_ERROR([You must call the autoconf "CANONICAL_HOST" macro in your configure.ac (or .in) file.]) AC_MSG_ERROR([You must call the autoconf "CANONICAL_HOST" macro in your configure.ac (or .in) file.])
@@ -818,7 +828,7 @@ AC_DEFUN([AC_BAKEFILE],
AC_BAKEFILE_DEPS AC_BAKEFILE_DEPS
AC_BAKEFILE_RES_COMPILERS AC_BAKEFILE_RES_COMPILERS
BAKEFILE_BAKEFILE_M4_VERSION="0.2.2" BAKEFILE_BAKEFILE_M4_VERSION="0.2.3"
dnl includes autoconf_inc.m4: dnl includes autoconf_inc.m4:
$1 $1
@@ -846,7 +856,7 @@ D='$'
cat <<EOF >bk-deps cat <<EOF >bk-deps
#!/bin/sh #!/bin/sh
# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf # This script is part of Bakefile (http://www.bakefile.org) autoconf
# script. It is used to track C/C++ files dependencies in portable way. # script. It is used to track C/C++ files dependencies in portable way.
# #
# Permission is given to use this file in any way. # Permission is given to use this file in any way.
@@ -860,10 +870,8 @@ mkdir -p ${D}DEPSDIR
if test ${D}DEPSMODE = gcc ; then if test ${D}DEPSMODE = gcc ; then
${D}* ${D}{DEPSFLAG} ${D}* ${D}{DEPSFLAG}
status=${D}? status=${D}?
if test ${D}{status} != 0 ; then
exit ${D}{status} # determine location of created files:
fi
# move created file to the location we want it in:
while test ${D}# -gt 0; do while test ${D}# -gt 0; do
case "${D}1" in case "${D}1" in
-o ) -o )
@@ -880,6 +888,14 @@ if test ${D}DEPSMODE = gcc ; then
done done
depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\` depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\` depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
# if the compiler failed, we're done:
if test ${D}{status} != 0 ; then
rm -f ${D}depfile
exit ${D}{status}
fi
# move created file to the location we want it in:
if test -f ${D}depfile ; then if test -f ${D}depfile ; then
sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
rm -f ${D}depfile rm -f ${D}depfile
@@ -969,6 +985,10 @@ objects=""
linking_flag="-dynamiclib" linking_flag="-dynamiclib"
ldargs="-r -keep_private_externs -nostdlib" ldargs="-r -keep_private_externs -nostdlib"
if test "x${D}CXX" = "x"; then
CXX="c++"
fi
while test ${D}# -gt 0; do while test ${D}# -gt 0; do
case ${D}1 in case ${D}1 in
@@ -982,6 +1002,12 @@ while test ${D}# -gt 0; do
shift shift
;; ;;
-arch|-isysroot)
# collect these options and values
ldargs="${D}{ldargs} ${D}1 ${D}2"
shift
;;
-s|-Wl,*) -s|-Wl,*)
# collect these load args # collect these load args
ldargs="${D}{ldargs} ${D}1" ldargs="${D}{ldargs} ${D}1"
@@ -1021,9 +1047,9 @@ status=0
# Link one module containing all the others # Link one module containing all the others
# #
if test ${D}{verbose} = 1; then if test ${D}{verbose} = 1; then
echo "c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o" echo "${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
fi fi
c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o ${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
status=${D}? status=${D}?
# #
@@ -1032,9 +1058,9 @@ status=${D}?
# #
if test ${D}{status} = 0; then if test ${D}{status} = 0; then
if test ${D}{verbose} = 1; then if test ${D}{verbose} = 1; then
echo "c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}" echo "${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
fi fi
c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args} ${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}
status=${D}? status=${D}?
fi fi
@@ -1057,7 +1083,7 @@ D='$'
cat <<EOF >bk-make-pch cat <<EOF >bk-make-pch
#!/bin/sh #!/bin/sh
# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf # This script is part of Bakefile (http://www.bakefile.org) autoconf
# script. It is used to generated precompiled headers. # script. It is used to generated precompiled headers.
# #
# Permission is given to use this file in any way. # Permission is given to use this file in any way.

72
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Id: configure.in 51259 2008-01-17 05:17:24Z PC . # From configure.in Id: configure.in 51537 2008-02-04 00:16:33Z VZ .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
# #
@@ -46664,6 +46664,9 @@ fi
if test "x$BAKEFILE_HOST" = "x"; then if test "x$BAKEFILE_HOST" = "x"; then
if test "x${host}" = "x" ; then if test "x${host}" = "x" ; then
{ { echo "$as_me:$LINENO: error: You must call the autoconf \"CANONICAL_HOST\" macro in your configure.ac (or .in) file." >&5 { { echo "$as_me:$LINENO: error: You must call the autoconf \"CANONICAL_HOST\" macro in your configure.ac (or .in) file." >&5
@@ -47198,14 +47201,20 @@ else
fi fi
case ${BAKEFILE_HOST} in { echo "$as_me:$LINENO: checking for command to install directories" >&5
*-hp-hpux* ) echo $ECHO_N "checking for command to install directories... $ECHO_C" >&6; }
INSTALL_DIR="mkdir -p" INSTALL_TEST_DIR=acbftest$$
;; $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1
* ) if test $? = 0 -a -d $INSTALL_TEST_DIR; then
INSTALL_DIR='$(INSTALL) -d' rmdir $INSTALL_TEST_DIR
;; INSTALL_DIR='$(INSTALL) -d'
esac { echo "$as_me:$LINENO: result: $INSTALL -d" >&5
echo "${ECHO_T}$INSTALL -d" >&6; }
else
INSTALL_DIR="mkdir -p"
{ echo "$as_me:$LINENO: result: mkdir -p" >&5
echo "${ECHO_T}mkdir -p" >&6; }
fi
LDFLAGS_GUI= LDFLAGS_GUI=
@@ -47299,7 +47308,7 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6; }
PLATFORM_BEOS=1 PLATFORM_BEOS=1
;; ;;
* ) * )
;; ;;
esac esac
fi fi
@@ -47478,6 +47487,10 @@ objects=""
linking_flag="-dynamiclib" linking_flag="-dynamiclib"
ldargs="-r -keep_private_externs -nostdlib" ldargs="-r -keep_private_externs -nostdlib"
if test "x${D}CXX" = "x"; then
CXX="c++"
fi
while test ${D}# -gt 0; do while test ${D}# -gt 0; do
case ${D}1 in case ${D}1 in
@@ -47491,6 +47504,12 @@ while test ${D}# -gt 0; do
shift shift
;; ;;
-arch|-isysroot)
# collect these options and values
ldargs="${D}{ldargs} ${D}1 ${D}2"
shift
;;
-s|-Wl,*) -s|-Wl,*)
# collect these load args # collect these load args
ldargs="${D}{ldargs} ${D}1" ldargs="${D}{ldargs} ${D}1"
@@ -47530,9 +47549,9 @@ status=0
# Link one module containing all the others # Link one module containing all the others
# #
if test ${D}{verbose} = 1; then if test ${D}{verbose} = 1; then
echo "c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o" echo "${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
fi fi
c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o ${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
status=${D}? status=${D}?
# #
@@ -47541,9 +47560,9 @@ status=${D}?
# #
if test ${D}{status} = 0; then if test ${D}{status} = 0; then
if test ${D}{verbose} = 1; then if test ${D}{verbose} = 1; then
echo "c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}" echo "${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
fi fi
c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args} ${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}
status=${D}? status=${D}?
fi fi
@@ -47558,7 +47577,7 @@ EOF
chmod +x shared-ld-sh chmod +x shared-ld-sh
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o" SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC" SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC"
{ echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5 { echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5
@@ -48241,7 +48260,8 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
SONAME_FLAG= SONAME_FLAG=
case "${BAKEFILE_HOST}" in case "${BAKEFILE_HOST}" in
*-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu ) *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
*-*-k*bsd*-gnu | *-*-mirbsd* )
if test "x$SUNCXX" = "xyes"; then if test "x$SUNCXX" = "xyes"; then
SONAME_FLAG="-h " SONAME_FLAG="-h "
else else
@@ -48346,7 +48366,7 @@ D='$'
cat <<EOF >bk-deps cat <<EOF >bk-deps
#!/bin/sh #!/bin/sh
# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf # This script is part of Bakefile (http://www.bakefile.org) autoconf
# script. It is used to track C/C++ files dependencies in portable way. # script. It is used to track C/C++ files dependencies in portable way.
# #
# Permission is given to use this file in any way. # Permission is given to use this file in any way.
@@ -48360,10 +48380,8 @@ mkdir -p ${D}DEPSDIR
if test ${D}DEPSMODE = gcc ; then if test ${D}DEPSMODE = gcc ; then
${D}* ${D}{DEPSFLAG} ${D}* ${D}{DEPSFLAG}
status=${D}? status=${D}?
if test ${D}{status} != 0 ; then
exit ${D}{status} # determine location of created files:
fi
# move created file to the location we want it in:
while test ${D}# -gt 0; do while test ${D}# -gt 0; do
case "${D}1" in case "${D}1" in
-o ) -o )
@@ -48380,6 +48398,14 @@ if test ${D}DEPSMODE = gcc ; then
done done
depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\` depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\` depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
# if the compiler failed, we're done:
if test ${D}{status} != 0 ; then
rm -f ${D}depfile
exit ${D}{status}
fi
# move created file to the location we want it in:
if test -f ${D}depfile ; then if test -f ${D}depfile ; then
sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
rm -f ${D}depfile rm -f ${D}depfile
@@ -48639,7 +48665,7 @@ fi
BAKEFILE_BAKEFILE_M4_VERSION="0.2.2" BAKEFILE_BAKEFILE_M4_VERSION="0.2.3"
BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.3" BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.3"
@@ -48786,7 +48812,7 @@ D='$'
cat <<EOF >bk-make-pch cat <<EOF >bk-make-pch
#!/bin/sh #!/bin/sh
# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf # This script is part of Bakefile (http://www.bakefile.org) autoconf
# script. It is used to generated precompiled headers. # script. It is used to generated precompiled headers.
# #
# Permission is given to use this file in any way. # Permission is given to use this file in any way.