From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Tue, 15 Nov 2016 22:53:54 +0000 (+0000)
Subject: Make OSX 10.12 libxml handler invisible to other platforms and less scary for othres
X-Git-Tag: 2.4.0alpha~215
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99ecf1404911726f728921e96bbf4d21f5f27670;p=postgis

Make OSX 10.12 libxml handler invisible to other platforms and less scary for othres


git-svn-id: http://svn.osgeo.org/postgis/trunk@15230 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/configure.ac b/configure.ac
index 01bab3ba7..1db01bcf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -570,18 +570,28 @@ dnl Extract the linker and include flags
 XML2_LDFLAGS=`$XML2CONFIG --libs`
 XML2_CPPFLAGS=`$XML2CONFIG --cflags`
 
-AC_PATH_PROG([XCRUN], [xcrun])
-if test "x$XCRUN" = "x"; then
-	AC_MSG_RESULT([OSX XCode is OK])
-else
-      XCODE_VER=`$XCRUN --show-sdk-version`
-      if test $XCODE_VER = "10.12"; then
-              AC_MSG_RESULT([OSX XCode 10.12 is Not OK... hacking])
-              XML2_LDFLAGS=`$XML2CONFIG --exec-prefix=/usr --libs`
-      else
-              AC_MSG_RESULT([OSX XCode is OK])
-      fi
-fi
+
+dnl
+dnl XCode in 10.12 supplies bad flags in xml2config resulting
+dnl in compile errors. For that one version, we force the prefix
+dnl to match where we know the libraries reside
+dnl
+case $host_os in
+    darwin*)
+        AC_PATH_PROG([XCRUN], [xcrun])
+        if test "x$XCRUN" = "x"; then
+        	AC_MSG_RESULT([using OSX XCode... yes])
+        else
+              XCODE_VER=`$XCRUN --show-sdk-version`
+              if test $XCODE_VER = "10.12"; then
+                      AC_MSG_RESULT([applying OSX XCode 10.12 libxml special case... yes])
+                      XML2_LDFLAGS=`$XML2CONFIG --exec-prefix=/usr --libs`
+              else
+                      AC_MSG_RESULT([using OSX XCode $XCODE_VER... yes])
+              fi
+        fi
+        ;;
+esac
 
 
 dnl Extract the version