1 files changed, 10 insertions, 1 deletions
diff --git a/configure b/configure
index 7ac4ff0..16c1fcd 100755
--- a/configure
+++ b/configure
@@ -4323,7 +4323,7 @@ if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt" ]; then
     [ "$CFG_DEV" = "yes" ] && SYNCQT_OPTS="$SYNCQT_OPTS -check-includes"
     if [ "$OPT_SHADOW" = "yes" ]; then
         "$outpath/bin/syncqt" $SYNCQT_OPTS
-    elif [ "$CFG_DEV" = "yes" ] || [ ! -d $relpath/include ]; then
+    elif [ "$CFG_DEV" = "yes" ] || [ ! -d $relpath/include ] || [ -d $relpath/.git ]; then
         QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS
     fi
 fi
@@ -6083,6 +6083,15 @@ if [ "$PLATFORM_MAC" = "yes" ]; then
     fi
 fi
 
+# select Carbon when using the 10.4u SDK
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    if [ "TEST$CFG_SDK" = "TEST/Developer/SDKs/MacOSX10.4u.sdk/" ]; then
+        echo "Carbon on";
+        CFG_MAC_COCOA="no";
+        CFG_MAC_CARBON="yes";
+    fi
+fi
+
 # set the global Mac deployment target. This is overridden on an arch-by-arch basis
 # in some cases, see code further down
 case "$PLATFORM,$CFG_MAC_COCOA" in