-# generated automatically by aclocal 1.7.2 -*- Autoconf -*-
+# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
PLATFORM_MSDOS=0
PLATFORM_MAC=0
PLATFORM_MACOSX=0
+ PLATFORM_OS2=0
case "${host}" in
*-*-cygwin* | *-*-mingw32* )
PLATFORM_WIN32=1
;;
- *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
+ *-pc-msdosdjgpp )
PLATFORM_MSDOS=1
;;
+ *-pc-os2_emx | *-pc-os2-emx )
+ PLATFORM_OS2=1
+ ;;
powerpc-*-darwin* )
PLATFORM_MAC=1
PLATFORM_MACOSX=1
AC_SUBST(PLATFORM_MSDOS)
AC_SUBST(PLATFORM_MAC)
AC_SUBST(PLATFORM_MACOSX)
+ AC_SUBST(PLATFORM_OS2)
])
AC_DEFUN(AC_BAKEFILE_SUFFIXES,
[
SO_SUFFIX="so"
+ SO_SUFFIX_MODULE="so"
EXEEXT=""
+ LIBPREFIX=lib
DLLPREFIX=lib
+ DLLPREFIX_MODULE=
case "${host}" in
*-hp-hpux* )
SO_SUFFIX="sl"
+ SO_SUFFIX_MODULE="sl"
;;
*-*-aix* )
dnl quoting from
dnl .a extension. This will explain why you can't link with an
dnl .so and why it works with the name changed to .a.
SO_SUFFIX="a"
+ SO_SUFFIX_MODULE="a"
;;
*-*-cygwin* | *-*-mingw32* )
SO_SUFFIX="dll"
+ SO_SUFFIX_MODULE="dll"
+ EXEEXT=".exe"
+ DLLPREFIX=""
+ ;;
+ *-pc-msdosdjgpp )
EXEEXT=".exe"
DLLPREFIX=""
;;
- *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
+ *-pc-os2_emx | *-pc-os2-emx )
EXEEXT=".exe"
DLLPREFIX=""
+ LIBPREFIX=""
;;
powerpc-*-darwin* )
SO_SUFFIX="dylib"
+ SO_SUFFIX_MODULE="bundle"
;;
esac
AC_SUBST(SO_SUFFIX)
+ AC_SUBST(SO_SUFFIX_MODULE)
AC_SUBST(EXEEXT)
+ AC_SUBST(LIBPREFIX)
AC_SUBST(DLLPREFIX)
+ AC_SUBST(DLLPREFIX_MODULE)
])
dnl or with a double stage link in order to create a single module
dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
- cat <<EOF >shared-ld-sh
+ dnl If using newer dev tools then there is a -single_module flag that
+ dnl we can use to do this, otherwise we'll need to use a helper
+ dnl script. Check the version of gcc to see which way we can go:
+ AC_CACHE_CHECK([for gcc 3.1 or later], wx_cv_gcc31, [
+ AC_TRY_COMPILE([],
+ [
+ #if (__GNUC__ < 3) || \
+ ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
+ #error old gcc
+ #endif
+ ],
+ [
+ wx_cv_gcc31=yes
+ ],
+ [
+ wx_cv_gcc31=no
+ ]
+ )
+ ])
+ if test "$wx_cv_gcc31" = "no"; then
+ cat <<EOF >shared-ld-sh
#!/bin/sh
#-----------------------------------------------------------------------------
#-- Name: distrib/mac/shared-ld-sh
verbose=0
args=""
objects=""
+linking_flag="-dynamiclib"
while test \${#} -gt 0; do
case \${1} in
args="\${args} \${1}"
;;
- -dynamiclib)
- # skip these options
+ -dynamiclib|-bundle)
+ linking_flag="\${1}"
;;
-*)
exit 1
;;
- *.o | *.a)
+ *.o | *.a | *.dylib)
# collect object files
objects="\${objects} \${1}"
;;
# Link the shared library from the single module created
#
if test \${verbose} = 1; then
- echo "cc -dynamiclib master.\$\$.o \${args}"
+ echo "cc \${linking_flag} master.\$\$.o \${args}"
fi
-c++ -dynamiclib master.\$\$.o \${args}
+c++ \${linking_flag} master.\$\$.o \${args}
status=\$?
if test \${status} != 0; then
exit \${status}
exit 0
EOF
- chmod +x shared-ld-sh
+ chmod +x shared-ld-sh
+
+ dnl Use the shared-ld-sh helper script
+ SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -o"
+ SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -o"
+ SHARED_LD_CXX="$SHARED_LD_CC"
+ SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
+ else
+ dnl Use the -single_module flag and let the linker do it for us
+ SHARED_LD_CC="\${CC} -dynamiclib -single_module -o"
+ SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -o"
+ SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -o"
+ SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -o"
+ fi
- SHARED_LD_CC="`pwd`/shared-ld-sh -undefined suppress -flat_namespace -o"
- SHARED_LD_CXX="$SHARED_LD_CC"
PIC_FLAG="-dynamic -fPIC"
- dnl FIXME - what about C libs? Gilles says to use c++ because it doesn't
- dnl matter for C projects and matters for C++ ones
- dnl FIXME - newer devel tools have linker flag to do this, the script
- dnl is not necessary - detect!
;;
*-*-aix* )
*-*-sunos4* | \
*-*-osf* | \
*-*-dgux5* | \
+ *-pc-os2_emx | *-pc-os2-emx | \
*-*-sysv5* )
dnl defaults are ok
;;
AC_MSG_ERROR(unknown system type $host.)
esac
+ if test "x$SHARED_LD_MODULE_CC" = "x" ; then
+ SHARED_LD_MODULE_CC="$SHARED_LD_CC"
+ fi
+ if test "x$SHARED_LD_MODULE_CXX" = "x" ; then
+ SHARED_LD_MODULE_CXX="$SHARED_LD_CXX"
+ fi
+
AC_SUBST(SHARED_LD_CC)
AC_SUBST(SHARED_LD_CXX)
+ AC_SUBST(SHARED_LD_MODULE_CC)
+ AC_SUBST(SHARED_LD_MODULE_CXX)
AC_SUBST(PIC_FLAG)
])
if test "x$GCC" = "xyes"; then
DEPSMODE=gcc
DEPS_TRACKING=1
+ case "${host}" in
+ powerpc-*-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_GCC="-no-cpp-precomp -MMD"
+ ;;
+ * )
+ DEPSFLAG_GCC="-MMD"
+ ;;
+ esac
AC_MSG_RESULT([gcc])
else
AC_MSG_RESULT([none])
cat <<EOF >bk-deps
#!/bin/sh
-# This script is part of Bakefile (http://bakefile.sf.net) autoconf script.
-# It is used to track C/C++ files dependencies in portable way.
+# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
+# script. It is used to track C/C++ files dependencies in portable way.
#
# Permission is given to use this file in any way.
DEPSMODE=$DEPSMODE
DEPSDIR=.deps
+DEPSFLAG_GCC="$DEPSFLAG_GCC"
mkdir -p \$DEPSDIR
if test \$DEPSMODE = gcc ; then
- \${*} -MMD
+ \${*} \${DEPSFLAG_GCC}
status=\${?}
if test \${status} != 0 ; then
exit \${status}
else
depfile=\`basename \$objfile | sed -e 's/\..*$/.d/g'\`
if test -f \$depfile ; then
- sed -e "s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
+ sed -e "/^\$objfile/! s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
rm -f \$depfile
fi
fi
AC_PROG_MAKE_SET
AC_SUBST(MAKE_SET)
- if test "$build" != "$host" ; then
- AR=$host_alias-ar
- STRIP=$host_alias-strip
- else
- AC_CHECK_PROG(AR, ar, ar, ar)
- AC_CHECK_PROG(STRIP, strip, strip, true)
- fi
+ AC_CHECK_TOOL(AR, ar, ar)
+ AC_CHECK_TOOL(STRIP, strip, :)
+ AC_CHECK_TOOL(NM, nm, :)
case ${host} in
*-hp-hpux* )
AC_SUBST(SETFILE)
])
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_PRECOMP_HEADERS
+dnl
+dnl Check for precompiled headers support (GCC >= 3.4)
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_PRECOMP_HEADERS,
+[
+
+ AC_ARG_ENABLE([precomp-headers],
+ [ --disable-precomp-headers don't use precompiled headers even if compiler can],
+ [bk_use_pch="$enableval"])
+
+ GCC_PCH=0
+
+ if test "x$bk_use_pch" = "x" -o "x$bk_use_pch" = "xyes" ; then
+ if test "x$GCC" = "xyes"; then
+ dnl test if we have gcc-3.4:
+ AC_MSG_CHECKING([if the compiler supports precompiled headers])
+ AC_TRY_COMPILE([],
+ [
+ #if !defined(__GNUC__) || !defined(__GNUC_MINOR__)
+ #error "no pch support"
+ #endif
+ #if (__GNUC__ < 3)
+ #error "no pch support"
+ #endif
+ #if (__GNUC__ == 3) && \
+ ((!defined(__APPLE_CC__) && (__GNUC_MINOR__ < 4)) || \
+ ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3)))
+ #error "no pch support"
+ #endif
+ ],
+ [
+ AC_MSG_RESULT([yes])
+ dnl FIXME - this is temporary, till .gch dependencies
+ dnl are fixed in generated Makefiles
+ CPPFLAGS="-fpch-deps $CPPFLAGS"
+ GCC_PCH=1
+ ],
+ [
+ AC_MSG_RESULT([no])
+ ])
+ if test $GCC_PCH = 1 ; then
+ cat <<EOF >bk-make-pch
+#!/bin/sh
+
+# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
+# script. It is used to generated precompiled headers.
+#
+# Permission is given to use this file in any way.
+
+outfile="\${1}"
+header="\${2}"
+shift
+shift
+
+compiler=
+headerfile=
+while test \${#} -gt 0; do
+ case "\${1}" in
+ -I* )
+ incdir=\`echo \${1} | sed -e 's/-I\(.*\)/\1/g'\`
+ if test "x\${headerfile}" = "x" -a -f "\${incdir}/\${header}" ; then
+ headerfile="\${incdir}/\${header}"
+ fi
+ ;;
+ esac
+ compiler="\${compiler} \${1}"
+ shift
+done
+
+if test "x\${headerfile}" = "x" ; then
+ echo "error: can't find header \${header} in include paths" >2
+else
+ if test -f \${outfile} ; then
+ rm -f \${outfile}
+ else
+ mkdir -p \`dirname \${outfile}\`
+ fi
+ depsfile=".deps/\`basename \${outfile}\`.d"
+ mkdir -p .deps
+ # can do this because gcc is >= 3.4:
+ \${compiler} -o \${outfile} -MMD -MF "\${depsfile}" "\${headerfile}"
+ exit \${?}
+fi
+EOF
+ chmod +x bk-make-pch
+ fi
+ fi
+ fi
+
+ AC_SUBST(GCC_PCH)
+])
+
+
+
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE
dnl
projects / wxWidgets.git / blobdiff