<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/ccda02dadd4adf18613191c564731952f5f46428">https://github.com/macports/macports-base/commit/ccda02dadd4adf18613191c564731952f5f46428</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ccda02dadd4adf18613191c564731952f5f46428
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Thu Jun 1 17:59:07 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> Fix configure checks for frameworks
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove reference to no longer existing OBJC_RUNTIME variable. The
</span><span style='display:block; white-space:pre;color:#404040;'> previous conidition was also slightly incorrect, as it should check for
</span><span style='display:block; white-space:pre;color:#404040;'> the availability of the linked frameworks.
</span>---
aclocal.m4 | 6 +++---
configure | 7 ++++---
src/macports1.0/Makefile.in | 4 +++-
3 files changed, 10 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aclocal.m4 b/aclocal.m4
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b6dc26..8a69269 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -334,7 +334,7 @@ AC_DEFUN(MP_CHECK_FRAMEWORK_COREFOUNDATION, [
</span> AC_DEFINE([HAVE_FRAMEWORK_COREFOUNDATION], [], [Define if CoreFoundation framework is available])
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(HAVE_FRAMEWORK_COREFOUNDATION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(HAVE_FRAMEWORK_COREFOUNDATION, [$mp_cv_have_framework_corefoundation])
</span> ])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -448,7 +448,7 @@ AC_DEFUN(MP_CHECK_FRAMEWORK_SYSTEMCONFIGURATION, [
</span> AC_DEFINE([HAVE_FRAMEWORK_SYSTEMCONFIGURATION], [], [Define if SystemConfiguration framework is available])
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(HAVE_FRAMEWORK_SYSTEMCONFIGURATION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(HAVE_FRAMEWORK_SYSTEMCONFIGURATION, [$mp_cv_have_framework_systemconfiguration])
</span> ])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -505,7 +505,7 @@ AC_DEFUN(MP_CHECK_FRAMEWORK_IOKIT, [
</span> AC_DEFINE([HAVE_FRAMEWORK_IOKIT], [], [Define if IOKit framework is available])
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(HAVE_FRAMEWORK_IOKIT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(HAVE_FRAMEWORK_IOKITi, [$mp_cv_have_framework_iokit])
</span> ])
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;color:#808080;'>index f2898c8..0f80f73 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -684,7 +684,7 @@ MPCONFIGDIR
</span> PORTSDIR
EXTRA_PROGS
HAVE_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER
<span style='display:block; white-space:pre;background:#ffe0e0;'>-HAVE_FRAMEWORK_IOKIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+HAVE_FRAMEWORK_IOKITi
</span> HAVE_FRAMEWORK_SYSTEMCONFIGURATION
HAVE_FRAMEWORK_COREFOUNDATION
CFLAGS_WERROR
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6252,8 +6252,6 @@ $as_echo "" >&6; }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ACX_PTHREAD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>
FRAMEWORK_LIBS="-framework CoreFoundation"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6312,6 +6310,7 @@ $as_echo "#define HAVE_FRAMEWORK_COREFOUNDATION /**/" >>confdefs.h
</span>
fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_FRAMEWORK_COREFOUNDATION=$mp_cv_have_framework_corefoundation
</span>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6372,6 +6371,7 @@ $as_echo "#define HAVE_FRAMEWORK_SYSTEMCONFIGURATION /**/" >>confdefs.h
</span>
fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_FRAMEWORK_SYSTEMCONFIGURATION=$mp_cv_have_framework_systemconfiguration
</span>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6432,6 +6432,7 @@ $as_echo "#define HAVE_FRAMEWORK_IOKIT /**/" >>confdefs.h
</span>
fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_FRAMEWORK_IOKITi=$mp_cv_have_framework_iokit
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/Makefile.in b/src/macports1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index efff040..4fc9cf7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,9 +11,11 @@ SHLIB_NAME= MacPorts${SHLIB_SUFFIX}
</span> INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/macports1.0
OLDINSTALLDIR= ${datadir}/macports/Tcl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ifeq ($(OBJC_RUNTIME), APPLE_RUNTIME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifeq (@HAVE_FRAMEWORK_COREFOUNDATION@,yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifeq (@HAVE_FRAMEWORK_SYSTEMCONFIGURATION@,yes)
</span> LIBS+= -framework CoreFoundation -framework SystemConfiguration
endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+endif
</span>
pkgIndex.tcl: $(SRCS)
</pre><pre style='margin:0'>
</pre>