<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[119467] trunk/dports/science/gwyddion/files</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/119467">119467</a></dd>
<dt>Author</dt> <dd>rowue@macports.org</dd>
<dt>Date</dt> <dd>2014-04-26 12:07:17 -0700 (Sat, 26 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gwyddion: cleanup of unused files</pre>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencegwyddionfilespatchappMakefileindiff">trunk/dports/science/gwyddion/files/patch-app-Makefile.in.diff</a></li>
<li><a href="#trunkdportssciencegwyddionfilespatchappmac_integrationcdiff">trunk/dports/science/gwyddion/files/patch-app-mac_integration.c.diff</a></li>
<li><a href="#trunkdportssciencegwyddionfilespatchconfigurediff">trunk/dports/science/gwyddion/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegwyddionfilespatchappMakefileindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/gwyddion/files/patch-app-Makefile.in.diff (119466 => 119467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gwyddion/files/patch-app-Makefile.in.diff 2014-04-26 19:06:18 UTC (rev 119466)
+++ trunk/dports/science/gwyddion/files/patch-app-Makefile.in.diff 2014-04-26 19:07:17 UTC (rev 119467)
</span><span class="lines">@@ -1,105 +0,0 @@
</span><del>---- app/Makefile.in.orig 2013-10-17 12:14:55.000000000 +0400
-+++ app/Makefile.in 2013-10-24 11:34:29.000000000 +0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -14,7 +14,7 @@
-
- @SET_MAKE@
-
--# @(#) $Id: Makefile.am 15426 2013-10-13 21:23:46Z yeti-dn $
-+# @(#) $Id: Makefile.am 15447 2013-10-17 17:08:11Z yeti-dn $
-
- # Generic glib-mkenum rules.
- # @(#) $Id: mkenum.mk 11705 2011-01-03 08:32:55Z yeti-dn $
-@@ -176,10 +176,10 @@
- $(libgwyapp2_la_LDFLAGS) $(LDFLAGS) -o $@
- PROGRAMS = $(bin_PROGRAMS)
- am_gwyddion_OBJECTS = about.$(OBJEXT) gwyddion.$(OBJEXT) \
-- ige-mac-menu.$(OBJEXT) mac_integration.$(OBJEXT) \
-- remote.$(OBJEXT) remote-unique.$(OBJEXT) \
-- remote-win32.$(OBJEXT) remote-x11.$(OBJEXT) splash.$(OBJEXT) \
-- tips.$(OBJEXT) toolbox.$(OBJEXT)
-+ mac_integration.$(OBJEXT) remote.$(OBJEXT) \
-+ remote-unique.$(OBJEXT) remote-win32.$(OBJEXT) \
-+ remote-x11.$(OBJEXT) splash.$(OBJEXT) tips.$(OBJEXT) \
-+ toolbox.$(OBJEXT)
- gwyddion_OBJECTS = $(am_gwyddion_OBJECTS)
- am__DEPENDENCIES_1 =
- gwyddion_DEPENDENCIES = $(am__DEPENDENCIES_1) libgwyapp2.la \
-@@ -314,6 +314,8 @@
- GTK_CFLAGS = @GTK_CFLAGS@
- GTK_DOC_PATH = @GTK_DOC_PATH@
- GTK_LIBS = @GTK_LIBS@
-+GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
-+GTK_MAC_LIBS = @GTK_MAC_LIBS@
- GWY_VERSION_MAJOR = @GWY_VERSION_MAJOR@
- GWY_VERSION_MINOR = @GWY_VERSION_MINOR@
- GWY_VERSION_STRING = @GWY_VERSION_STRING@
-@@ -510,7 +512,6 @@
- wait.h
-
- noinst_HEADERS = \
-- ige-mac-menu.h\
- mac_integration.h\
- authors.h \
- gwyappfilechooser.h \
-@@ -553,9 +554,11 @@
- @MAINTAINER_MODE_TRUE@ -e "s/@OWN_HEADER@/$(MKENUM_NAME).h/g" \
- @MAINTAINER_MODE_TRUE@ -e '1s:.*:/* This is a 'GENERATED' file. */:'
-
--@OS_DARWIN_TRUE@carbon_cflags = -ObjC -framework AppKit -framework Carbon -framework ApplicationServices
--AM_CFLAGS = $(carbon_cflags) @FFTW3_CFLAGS@ @UNIQUE_CFLAGS@ @COMMON_CFLAGS@
-+@OS_DARWIN_TRUE@darwin_cflags = -ObjC -g
-+@OS_DARWIN_TRUE@darwin_ldflags = -framework AppKit -framework ApplicationServices
-+AM_CFLAGS = $(darwin_cflags) @GTK_MAC_CFLAGS@ @FFTW3_CFLAGS@ @UNIQUE_CFLAGS@ @COMMON_CFLAGS@
- AM_CPPFLAGS = -I$(top_srcdir)
-+AM_LDFLAGS = $(darwin_ldflags)
-
- # In following order do:
- # Any code change C: R++: A
-@@ -593,7 +596,6 @@
- gwyddion_SOURCES = \
- about.c \
- gwyddion.c \
-- ige-mac-menu.c \
- mac_integration.c \
- remote.c \
- remote-unique.c \
-@@ -603,7 +605,7 @@
- tips.c \
- toolbox.c
-
--gwyddion_LDADD = @COMMON_LDFLAGS@ @GTKGLEXT_LIBS@ @FFTW3_LIBS@ @UNIQUE_LIBS@ @BASIC_LIBS@ $(LIBXMU) \
-+gwyddion_LDADD = @COMMON_LDFLAGS@ @GTK_MAC_LIBS@ @GTKGLEXT_LIBS@ @FFTW3_LIBS@ @UNIQUE_LIBS@ @BASIC_LIBS@ $(LIBXMU) \
- libgwyapp2.la \
- $(libgwymodule) \
- $(libgwydgets) \
-@@ -747,7 +749,6 @@
-
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/about.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwyddion.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ige-mac-menu.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgwyapp2_la-app.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgwyapp2_la-data-browser.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgwyapp2_la-datachooser.Plo@am__quote@
-@@ -783,14 +784,14 @@
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
-+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
</del></span></pre></div>
<a id="trunkdportssciencegwyddionfilespatchappmac_integrationcdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/gwyddion/files/patch-app-mac_integration.c.diff (119466 => 119467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gwyddion/files/patch-app-mac_integration.c.diff 2014-04-26 19:06:18 UTC (rev 119466)
+++ trunk/dports/science/gwyddion/files/patch-app-mac_integration.c.diff 2014-04-26 19:07:17 UTC (rev 119467)
</span><span class="lines">@@ -1,202 +0,0 @@
</span><del>---- app/mac_integration.c.orig 2012-07-20 00:11:23.000000000 +0400
-+++ app/mac_integration.c 2013-10-24 11:12:16.000000000 +0400
-@@ -1,5 +1,5 @@
- /*
-- * @(#) $Id: mac_integration.c 12576 2011-07-11 14:51:57Z yeti-dn $
-+ * @(#) $Id: mac_integration.c 15469 2013-10-22 15:32:45Z yeti-dn $
- * Copyright (C) 2009 Andrey Gruzdev.
- * E-mail: gruzdev@ntmdt.ru.
- *
-@@ -19,28 +19,41 @@
- */
-
- #ifdef __APPLE__
--#include <Carbon/Carbon.h>
-+#include <AppKit/AppKit.h>
- #include <CoreFoundation/CoreFoundation.h>
- #include <file.h>
--#include "ige-mac-menu.h"
-+#include "config.h"
-+
-+#ifdef HAVE_GTK_MAC_INTEGRATION
-+#include <gtkmacintegration/gtkosxapplication.h>
-+#endif
-+
- #define USE_MAC_INTEGRATION
- #define USED_ON_MAC /* */
- #else
- #define USED_ON_MAC G_GNUC_UNUSED
- #endif
-
-+#ifdef HAVE_GTK_MAC_INTEGRATION
-+#define USED_ON_MAC_QUARTZ /* */
-+#else
-+#define USED_ON_MAC_QUARTZ G_GNUC_UNUSED
-+#endif
-+
- #include "mac_integration.h"
-
- #ifdef USE_MAC_INTEGRATION
- int fileModulesReady = 0;
- GPtrArray *files_array = NULL;
-+#ifdef HAVE_GTK_MAC_INTEGRATION
-+GtkosxApplication *theApp = NULL;
-+#endif
- #endif
-
- void
--gwy_osx_get_menu_from_widget(USED_ON_MAC GtkWidget *container)
-+gwy_osx_get_menu_from_widget(USED_ON_MAC_QUARTZ GtkWidget *container)
- {
--#ifdef GDK_WINDOWING_QUARTZ
--#ifdef USE_MAC_INTEGRATION
-+#ifdef HAVE_GTK_MAC_INTEGRATION
- GList *children; //,*subchildren,*subsubchildren;
- GList *l, *ll, *lll;
- GtkWidget *menubar = gtk_menu_bar_new();
-@@ -76,13 +89,14 @@
- }
- gtk_container_add(GTK_CONTAINER(container), menubar);
- gtk_widget_hide(menubar);
-- ige_mac_menu_set_menu_bar(GTK_MENU_SHELL(menubar));
--#endif
-+ gtkosx_application_set_menu_bar ( theApp, GTK_MENU_SHELL(menubar));
-+ gtkosx_application_ready (theApp);
- #endif
- }
-
-
- #ifdef USE_MAC_INTEGRATION
-+
- static void
- gwy_osx_open_file(gpointer data,
- G_GNUC_UNUSED gpointer user_data)
-@@ -90,46 +104,54 @@
- gwy_app_file_load((const gchar*)data, (const gchar*)data, NULL);
- }
-
--static OSStatus
--appleEventHandler(const AppleEvent * event, AppleEvent * event2, long param)
-+@interface GwyOSXEventHandler:NSObject
-+@end
-+
-+@implementation GwyOSXEventHandler
-+- (void)handleOpenEvent:(NSAppleEventDescriptor *)event withReplyEvent: (NSAppleEventDescriptor *)replyEvent
- {
-- enum { BUFLEN = 1024 };
-- AEDescList docs;
-+ #pragma unused (replyEvent)
-+ NSAppleEventDescriptor *descr = [event descriptorForKeyword:keyDirectObject];
-+ NSInteger i,count = [descr numberOfItems];
-+
-+ for(i=0;i<count;i++)
-+ {
-+ NSAppleEventDescriptor *descr1 = i==0?descr:[descr descriptorAtIndex:i];
-+ NSString *url = [descr1 stringValue];
-+ NSString *filename = [[NSURL URLWithString:url] path];
-+
-+
-+ char * strBuffer = (char*)[filename UTF8String];
-+
-+ if (fileModulesReady)
-+ gwy_osx_open_file(strBuffer, NULL);
-+ else {
-+ if (!files_array)
-+ files_array = g_ptr_array_new();
-+ g_ptr_array_add(files_array, g_strdup((gchar*)strBuffer));
-+ }
-+ }
-+}
-
-- if (AEGetParamDesc(event, keyDirectObject, typeAEList, &docs) == noErr) {
-- long n = 0;
-- int i;
-+- (void)handleQuitEvent:(NSAppleEventDescriptor *)event withReplyEvent: (NSAppleEventDescriptor *)replyEvent
-+{
-+ #pragma unused (event)
-+ #pragma unused (replyEvent)
-+ gtk_main_quit();
-+}
-
-- AECountItems(&docs, &n);
-- static UInt8 strBuffer[BUFLEN];
-+@end
-
-- for (i = 0; i < n; i++) {
-- FSRef ref;
-+GwyOSXEventHandler *eventHandler;
-
-- if (AEGetNthPtr(&docs, i + 1, typeFSRef, 0, 0, &ref, sizeof(ref), 0)
-- != noErr)
-- continue;
-- if (FSRefMakePath(&ref, strBuffer, BUFLEN) == noErr) {
-- if (fileModulesReady)
-- gwy_osx_open_file(strBuffer, NULL);
-- else {
-- if (!files_array)
-- files_array = g_ptr_array_new();
-- g_ptr_array_add(files_array, g_strdup((gchar*)strBuffer));
-- }
-- }
-- }
-- }
-- return noErr;
--}
- #endif
-
- void
- gwy_osx_init_handler(USED_ON_MAC int *argc)
- {
- #ifdef USE_MAC_INTEGRATION
-+ NSAppleEventManager *appleEventManager;
- CFURLRef res_url_ref = NULL, bundle_url_ref = NULL;
--
- res_url_ref = CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle());
- bundle_url_ref = CFBundleCopyBundleURL(CFBundleGetMainBundle());
-
-@@ -142,9 +164,24 @@
- if (bundle_url_ref)
- CFRelease(bundle_url_ref);
-
-- AEInstallEventHandler(kCoreEventClass, // handle open file events
-- kAEOpenDocuments,
-- (AEEventHandlerUPP)appleEventHandler, 0, false);
-+
-+ eventHandler = [[GwyOSXEventHandler alloc] init];
-+
-+
-+ appleEventManager = [NSAppleEventManager sharedAppleEventManager];
-+ [appleEventManager setEventHandler:eventHandler
-+ andSelector:@selector(handleOpenEvent:withReplyEvent:)
-+ forEventClass:kCoreEventClass
-+ andEventID:kAEOpenDocuments];
-+
-+ [appleEventManager setEventHandler:eventHandler
-+ andSelector:@selector(handleQuitEvent:withReplyEvent:)
-+ forEventClass:kCoreEventClass
-+ andEventID:kAEQuitApplication];
-+
-+#ifdef HAVE_GTK_MAC_INTEGRATION
-+ theApp = g_object_new (GTKOSX_TYPE_APPLICATION, NULL);
-+#endif
- #endif
- }
-
-@@ -152,9 +189,14 @@
- gwy_osx_remove_handler(void)
- {
- #ifdef USE_MAC_INTEGRATION
-- AERemoveEventHandler(kCoreEventClass,
-- kAEOpenDocuments,
-- (AEEventHandlerUPP)appleEventHandler, false);
-+ NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
-+ [appleEventManager removeEventHandlerForEventClass:kCoreEventClass andEventID:kAEOpenDocuments];
-+ [appleEventManager removeEventHandlerForEventClass:kCoreEventClass andEventID:kAEQuitApplication];
-+ [eventHandler release];
-+ eventHandler = nil;
-+#ifdef HAVE_GTK_MAC_INTEGRATION
-+ g_object_unref (theApp);
-+#endif
- #endif
- }
-
</del></span></pre></div>
<a id="trunkdportssciencegwyddionfilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/gwyddion/files/patch-configure.diff (119466 => 119467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gwyddion/files/patch-configure.diff 2014-04-26 19:06:18 UTC (rev 119466)
+++ trunk/dports/science/gwyddion/files/patch-configure.diff 2014-04-26 19:07:17 UTC (rev 119467)
</span><span class="lines">@@ -1,275 +0,0 @@
</span><del>---- configure.orig 2013-10-17 12:14:54.000000000 +0400
-+++ configure 2013-10-24 11:34:34.000000000 +0400
-@@ -765,6 +765,8 @@
- GTK_LIBS
- GTK_CFLAGS
- LIBXMU
-+GTK_MAC_LIBS
-+GTK_MAC_CFLAGS
- LIBM
- GMODULE_LIBS
- GMODULE_CFLAGS
-@@ -1032,6 +1034,8 @@
- GOBJECT_LIBS
- GMODULE_CFLAGS
- GMODULE_LIBS
-+GTK_MAC_CFLAGS
-+GTK_MAC_LIBS
- GTK_CFLAGS
- GTK_LIBS
- FFTW3_CFLAGS
-@@ -1777,6 +1781,10 @@
- C compiler flags for GMODULE, overriding pkg-config
- GMODULE_LIBS
- linker flags for GMODULE, overriding pkg-config
-+ GTK_MAC_CFLAGS
-+ C compiler flags for GTK_MAC, overriding pkg-config
-+ GTK_MAC_LIBS
-+ linker flags for GTK_MAC, overriding pkg-config
- GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
- GTK_LIBS linker flags for GTK, overriding pkg-config
- FFTW3_CFLAGS
-@@ -3100,7 +3108,7 @@
- case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
--am__api_version='1.13'
-+am__api_version='1.14'
-
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
-@@ -3637,6 +3645,47 @@
-
-
-
-+# POSIX will say in a future version that running "rm -f" with no argument
-+# is OK; and we want to be able to make that assumption in our Makefile
-+# recipes. So use an aggressive probe to check that the usage we want is
-+# actually supported "in the wild" to an acceptable degree.
-+# See automake bug#10828.
-+# To make any issue more visible, cause the running configure to be aborted
-+# by default if the 'rm' program in use doesn't match our expectations; the
-+# user can still override this though.
-+if rm -f && rm -fr && rm -rf; then : OK; else
-+ cat >&2 <<'END'
-+Oops!
-+
-+Your 'rm' program seems unable to run without file operands specified
-+on the command line, even when the '-f' option is present. This is contrary
-+to the behaviour of most rm programs out there, and not conforming with
-+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-+
-+Please tell bug-automake@gnu.org about your system, including the value
-+of your $PATH and any error possibly output before this message. This
-+can help us improve future automake versions.
-+
-+END
-+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-+ echo 'Configuration will proceed anyway, since you have set the' >&2
-+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-+ echo >&2
-+ else
-+ cat >&2 <<'END'
-+Aborting the configuration process, to ensure you take notice of the issue.
-+
-+You can download and install GNU coreutils to get an 'rm' implementation
-+that behaves properly: <http://www.gnu.org/software/coreutils/>.
-+
-+If you want to complete the configuration process using your problematic
-+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-+to "yes", and re-run configure.
-+
-+END
-+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-+ fi
-+fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
- $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-@@ -4531,6 +4580,65 @@
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-+if ${am_cv_prog_cc_c_o+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ # Make sure it works both with $CC and with simple cc.
-+ # Following AC_PROG_CC_C_O, we do the test twice because some
-+ # compilers refuse to overwrite an existing .o file with -o,
-+ # though they will create one.
-+ am_cv_prog_cc_c_o=yes
-+ for am_i in 1 2; do
-+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } \
-+ && test -f conftest2.$ac_objext; then
-+ : OK
-+ else
-+ am_cv_prog_cc_c_o=no
-+ break
-+ fi
-+ done
-+ rm -f core conftest*
-+ unset am_i
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-+$as_echo "$am_cv_prog_cc_c_o" >&6; }
-+if test "$am_cv_prog_cc_c_o" != yes; then
-+ # Losing compiler, so override with the script.
-+ # FIXME: It is wrong to rewrite CC.
-+ # But if we don't then we get into trouble of one sort or another.
-+ # A longer-term fix would be to have automake use am__CC in this case,
-+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-+ CC="$am_aux_dir/compile $CC"
-+fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
- DEPDIR="${am__leading_dot}deps"
-
- ac_config_commands="$ac_config_commands depfiles"
-@@ -11971,14 +12079,10 @@
- # before this can be enabled.
- hardcode_into_libs=yes
-
-- # Add ABI-specific directories to the system library path.
-- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
--
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15806,14 +15910,10 @@
- # before this can be enabled.
- hardcode_into_libs=yes
-
-- # Add ABI-specific directories to the system library path.
-- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
--
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -19283,7 +19383,6 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdk_target" >&5
- $as_echo "$gdk_target" >&6; }
- remote_backend=none
--target_quartz=no
- pangoft2=pangoft2
- case "$gdk_target" in
- x11)
-@@ -19348,7 +19447,79 @@
- fi
- ;;
- quartz)
-- target_quartz=yes
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_MAC" >&5
-+$as_echo_n "checking for GTK_MAC... " >&6; }
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$GTK_MAC_CFLAGS"; then
-+ pkg_cv_GTK_MAC_CFLAGS="$GTK_MAC_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags "gtk-mac-integration" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$GTK_MAC_LIBS"; then
-+ pkg_cv_GTK_MAC_LIBS="$GTK_MAC_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs "gtk-mac-integration" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk-mac-integration"`
-+ else
-+ GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk-mac-integration"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTK_MAC_PKG_ERRORS" >&5
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ :
-+elif test $pkg_failed = untried; then
-+ :
-+else
-+ GTK_MAC_CFLAGS=$pkg_cv_GTK_MAC_CFLAGS
-+ GTK_MAC_LIBS=$pkg_cv_GTK_MAC_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+$as_echo "#define HAVE_GTK_MAC_INTEGRATION 1" >>confdefs.h
-+
-+fi
- pangoft2=
- ;;
- win32)
</del></span></pre>
</div>
</div>
</body>
</html>