From: Alan T. DeKok <aland@freeradius.org>
Date: Sat, 14 May 2022 17:37:32 +0000 (-0400)
Subject: fix up for OSX
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d933caf40cb11f35a6020f5bb3277378b22037f;p=thirdparty%2Ffreeradius-server.git

fix up for OSX

newer versions of clang can't find things.  So we need to manually
add the paths in.
---

diff --git a/configure b/configure
index e740b7394eb..c209e50f674 100755
--- a/configure
+++ b/configure
@@ -3560,6 +3560,14 @@ test -n "$target_alias" &&
 TARGET_SYSTEM="$target"
 
 
+case "$host" in
+  *-darwin*)
+    CFLAGS="$CFLAGS -DDARWIN"
+    LDFLAGS="-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib $LDFLAGS"
+    LIBS="-F /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/ -framework DirectoryService $LIBS"
+    ;;
+esac
+
 case "$target" in
   *-darwin*)
     library_ext="dylib"
@@ -10851,9 +10859,6 @@ case "$target" in
     CFLAGS="$CFLAGS -D_ALL_SOURCE"
     ;;
   *-darwin*)
-    CFLAGS="$CFLAGS -DDARWIN -mmacosx-version-min=$(sw_vers -productVersion)"
-    LDFLAGS="$LDFLAGS -mmacosx-version-min=$(sw_vers -productVersion)"
-    LIBS="-framework DirectoryService $LIBS"
 
 printf "%s\n" "#define __APPLE_USE_RFC_3542 1" >>confdefs.h
 
diff --git a/configure.ac b/configure.ac
index a06343e8f79..64807cd5c96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,6 +219,18 @@ dnl #
 AC_CANONICAL_SYSTEM
 AC_SUBST(TARGET_SYSTEM, "$target")
 
+dnl #
+dnl #  clang etc. on OSX no longer searches the default paths for things,
+dnl #  so we have to add them back in.
+dnl #
+case "$host" in
+  *-darwin*)
+    CFLAGS="$CFLAGS -DDARWIN"
+    LDFLAGS="-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib $LDFLAGS"
+    LIBS="-F /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/ -framework DirectoryService $LIBS"
+    ;;
+esac
+
 case "$target" in
   *-darwin*)
     library_ext="dylib"
@@ -1228,9 +1240,6 @@ case "$target" in
     CFLAGS="$CFLAGS -D_ALL_SOURCE"
     ;;
   *-darwin*)
-    CFLAGS="$CFLAGS -DDARWIN -mmacosx-version-min=$(sw_vers -productVersion)"
-    LDFLAGS="$LDFLAGS -mmacosx-version-min=$(sw_vers -productVersion)"
-    LIBS="-framework DirectoryService $LIBS"
     AC_DEFINE([__APPLE_USE_RFC_3542], 1, [Force OSX >= 10.7 Lion to use RFC2292 IPv6 socket options])
     ;;
 esac