X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7880889720de18a19e58653cb3b07da99053e7db..04a123c642b0fc589e29cdd507faf11b85973f79:/build/aclocal/bakefile.m4

diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4
index a9b644ac4a..8d539f04be 100644
--- a/build/aclocal/bakefile.m4
+++ b/build/aclocal/bakefile.m4
@@ -21,7 +21,7 @@ dnl  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 dnl  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 dnl  DEALINGS IN THE SOFTWARE.
 dnl
-dnl  $Id: bakefile.m4 1322 2009-10-21 07:37:18Z vaclavslavik $
+dnl  $Id$
 dnl
 dnl  Support macros for makefiles generated by BAKEFILE.
 dnl
@@ -126,8 +126,7 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
                 PLATFORM_BEOS=1
             ;;
             * )
-                dnl wxWidgets-specific: allow unknown Unix systems
-                dnl AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
+                AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
             ;;
         esac
     fi
@@ -559,16 +558,7 @@ AC_DEFUN([AC_BAKEFILE_DEPS],
 
         if test "x$GCC" = "xyes"; then
             DEPSMODE=gcc
-            case "${BAKEFILE_HOST}" in
-                *-*-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="-no-cpp-precomp -MMD"
-                ;;
-                * )
-                    DEPSFLAG="-MMD"
-                ;;
-            esac
+            DEPSFLAG="-MMD"
             AC_MSG_RESULT([gcc])
         elif test "x$MWCC" = "xyes"; then
             DEPSMODE=mwcc
@@ -645,21 +635,8 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
     AC_CHECK_TOOL(STRIP, strip, :)
     AC_CHECK_TOOL(NM, nm, :)
 
-    dnl This check is necessary because "install -d" doesn't exist on
-    dnl all platforms (e.g. HP/UX), see http://www.bakefile.org/ticket/80
-    AC_MSG_CHECKING([for command to install directories])
-    INSTALL_TEST_DIR=acbftest$$
-    $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 current value of shell variable, hence the single quoting:
-        INSTALL_DIR='$(INSTALL) -d'
-        AC_MSG_RESULT([$INSTALL -d])
-    else
-        INSTALL_DIR="mkdir -p"
-        AC_MSG_RESULT([mkdir -p])
-    fi
+    dnl Don't use `install -d`, see http://trac.wxwidgets.org/ticket/13452
+    INSTALL_DIR="mkdir -p"
     AC_SUBST(INSTALL_DIR)
 
     LDFLAGS_GUI=
@@ -838,7 +815,7 @@ AC_DEFUN([AC_BAKEFILE],
     AC_SUBST(OBJCXXFLAGS)
 
 
-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.7"
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.9"
 
     dnl includes autoconf_inc.m4:
     $1