(should) fix unix compilation...

[wxWidgets.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 65c388f3293de819b29bd0509ba7ad3501388aba..4a689c1309aed07efbd363ba3820c3e8387e62fe 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1326,7 +1326,7 @@ while test \${#} -gt 0; do
         shift
         ;;
 
         shift
         ;;
 

-       -l*|-L*|-flat_namespace)
+       -l*|-L*|-flat_namespace|-headerpad_max_install_names)

         # collect these options
         args="\${args} \${1}"
         ;;
         # collect these options
         args="\${args} \${1}"
         ;;


@@ -1388,16 +1388,16 @@ EOF
             chmod +x shared-ld-sh
 
             dnl Use the shared-ld-sh helper script
             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_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_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"
+            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"
         fi
 
         PIC_FLAG="-dynamic -fPIC"


@@ -1581,7 +1581,7 @@ if test \$DEPSMODE = gcc ; then
     else
         depfile=\`basename \$objfile | sed -e 's/\..*$/.d/g'\`
         if test -f \$depfile ; 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
             rm -f \$depfile
         fi
     fi