Last active
May 12, 2020 01:19
-
-
Save zurazurataicho/26fe48028c7ca0042d32ed5f27218858 to your computer and use it in GitHub Desktop.
vim configure.ac for macOS 10.15 or later
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/configure.ac b/src/configure.ac | |
index 2037de74f..007ff71f5 100644 | |
--- a/src/configure.ac | |
+++ b/src/configure.ac | |
@@ -1817,7 +1817,7 @@ if test "$enable_tclinterp" = "yes" -o "$enable_tclinterp" = "dynamic"; then | |
tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" | |
else | |
dnl For Mac OS X 10.3, use the OS-provided framework location | |
- tclinc="/System/Library/Frameworks/Tcl.framework/Headers" | |
+ tclinc="`xcrun --show-sdk-path`/usr/include" | |
fi | |
TCL_INC= | |
for try in $tclinc; do | |
@@ -1838,7 +1838,7 @@ if test "$enable_tclinterp" = "yes" -o "$enable_tclinterp" = "dynamic"; then | |
tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" | |
else | |
dnl For Mac OS X 10.3, use the OS-provided framework location | |
- tclcnf="/System/Library/Frameworks/Tcl.framework" | |
+ tclcnf="`xcrun --show-sdk-path`/System/Library/Frameworks/Tcl.framework/Versions/$tclver" | |
fi | |
for try in $tclcnf; do | |
if test -f "$try/tclConfig.sh"; then | |
@@ -1854,6 +1854,10 @@ if test "$enable_tclinterp" = "yes" -o "$enable_tclinterp" = "dynamic"; then | |
dnl "-D_ABC" items. Watch out for -DFOO=long\ long. | |
TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^[[^-]]/d' -e '/^-[[^D]]/d' -e '/-D[[^_]]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'` | |
break | |
+ else | |
+ if test "x$MACOS_X" = "xyes"; then | |
+ TCL_LIBS="-framework Tcl" | |
+ fi | |
fi | |
done | |
if test -z "$TCL_LIBS"; then |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment