diff --git a/ChangeLog b/ChangeLog
index aeebb19684b..906ce828ec0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* configure.ac (xcsdkdir): Only set if using xcrun.
+
 2013-12-29  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* configure.ac (LIBXML2_CFLAGS): Fix xcrun-related quoting problem.
diff --git a/configure.ac b/configure.ac
index d5ae13401cf..059f04b3eda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,9 +92,9 @@ if test -n "$XCRUN"; then
     if test -z "$MAKE_PROG"; then
       MAKE="$XCRUN MAKE"
       export MAKE
+      xcsdkdir=`$XCRUN --show-sdk-path 2>/dev/null`
     fi
   fi
-  xcsdkdir=`$XCRUN --show-sdk-path 2>/dev/null`
 fi
 
 dnl Fairly arbitrary, older versions might work too.