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

no real changes, moved Robin's changes to bakefile and regenerated using bakefile version

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-09-13 19:09:50 +00:00
parent ea172e69cf
commit 2a87985348
2 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
aclocal.m4 vendored
View File

@@ -1,6 +1,6 @@
# 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,
@@ -1280,11 +1280,12 @@ AC_DEFUN(AC_BAKEFILE_SHARED_LD,
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.
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))
#if (__GNUC__ < 3) || \
((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
#error old gcc
#endif
],
@@ -1369,7 +1370,7 @@ fi
# Link the shared library from the single module created
#
if test \${verbose} = 1; then
echo "c++ \${linking_flag} master.\$\$.o \${args}"
echo "cc \${linking_flag} master.\$\$.o \${args}"
fi
c++ \${linking_flag} master.\$\$.o \${args}
status=\$?
@@ -1389,16 +1390,17 @@ EOF
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"
else
dnl Use the -single_module flag and let the linker do it for us
SHARED_LD_CC="\${CXX} -dynamiclib -single_module -o"
SHARED_LD_MODULE_CC="\${CXX} -bundle -single_module -o"
fi
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
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
;;
*-*-aix* )

16
configure vendored
View File

@@ -34407,7 +34407,8 @@ int
main ()
{
#if (__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
#if (__GNUC__ < 3) || \
((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
#error old gcc
#endif
@@ -34517,7 +34518,7 @@ fi
# Link the shared library from the single module created
#
if test \${verbose} = 1; then
echo "c++ \${linking_flag} master.\$\$.o \${args}"
echo "cc \${linking_flag} master.\$\$.o \${args}"
fi
c++ \${linking_flag} master.\$\$.o \${args}
status=\$?
@@ -34536,12 +34537,15 @@ EOF
SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -o"
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -o"
else
SHARED_LD_CC="\${CXX} -dynamiclib -single_module -o"
SHARED_LD_MODULE_CC="\${CXX} -bundle -single_module -o"
fi
SHARED_LD_CXX="$SHARED_LD_CC"
SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
else
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
PIC_FLAG="-dynamic -fPIC"
;;