More lib and demo changes for dropping the wx prefix, from Jeff G.

[wxWidgets.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 415d17b6cfe4f13b44f11c1970dbb37af63596f1..4a689c1309aed07efbd363ba3820c3e8387e62fe 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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,
@@ -1278,25 +1278,26 @@ AC_DEFUN(AC_BAKEFILE_SHARED_LD,
         dnl or with a double stage link in order to create a single module
         dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
 
-       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
+        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
 #-----------------------------------------------------------------------------
@@ -1325,7 +1326,7 @@ while test \${#} -gt 0; do
         shift
         ;;
 
-       -l*|-L*|-flat_namespace)
+       -l*|-L*|-flat_namespace|-headerpad_max_install_names)
         # collect these options
         args="\${args} \${1}"
         ;;
@@ -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=\$?
@@ -1386,19 +1387,20 @@ exit 0
 EOF
             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"
-       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"
+            dnl Use the shared-ld-sh helper script
+            SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o"
+            SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -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 -headerpad_max_install_names -o"
+            SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -headerpad_max_install_names -o"
+            SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
+            SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -headerpad_max_install_names -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* )
@@ -1579,7 +1581,7 @@ if test \$DEPSMODE = gcc ; then
     else
         depfile=\`basename \$objfile | sed -e 's/\..*$/.d/g'\`
         if test -f \$depfile ; then
-            sed -e "/^\$objfile/! s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
+            sed -e "/^\$objfile/!s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
             rm -f \$depfile
         fi
     fi
@@ -1611,13 +1613,9 @@ AC_DEFUN(AC_BAKEFILE_CHECK_BASIC_STUFF,
     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* )