From 4fa381d14c20a66d6286de042adeac2976bb1206 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 13 Jan 2005 01:56:42 +0000 Subject: [PATCH] Remove GLIB_DIVERT_BEFORE_HELP() on initialization of gdktarget, that was 2005-01-12 Owen Taylor * configure.in: Remove GLIB_DIVERT_BEFORE_HELP() on initialization of gdktarget, that was causing it to be evaluated before host was set. Simplify --with-gdktarget help message. * gtk/Makefile.am: Use grep | head -n 1 instead of grep -m 1 which doesn't work with slightly older versions of GNU grep in install-libtool-import-lib rule. --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ ChangeLog.pre-2-8 | 11 +++++++++++ configure.in | 4 +--- gdk-pixbuf/ChangeLog | 7 +++++++ gdk-pixbuf/Makefile.am | 2 +- gtk/Makefile.am | 2 +- 7 files changed, 43 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8759281b8..c5b11a0c21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2005-01-12 Owen Taylor + + * configure.in: Remove GLIB_DIVERT_BEFORE_HELP() on + initialization of gdktarget, that was causing it to be + evaluated before host was set. Simplify --with-gdktarget help + message. + + * gtk/Makefile.am: Use grep | head -n 1 instead of grep -m 1 + which doesn't work with slightly older versions of GNU grep + in install-libtool-import-lib rule. + 2005-01-12 Tor Lillqvist Fix for #162790, by Iwan Wong: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a8759281b8..c5b11a0c21 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +2005-01-12 Owen Taylor + + * configure.in: Remove GLIB_DIVERT_BEFORE_HELP() on + initialization of gdktarget, that was causing it to be + evaluated before host was set. Simplify --with-gdktarget help + message. + + * gtk/Makefile.am: Use grep | head -n 1 instead of grep -m 1 + which doesn't work with slightly older versions of GNU grep + in install-libtool-import-lib rule. + 2005-01-12 Tor Lillqvist Fix for #162790, by Iwan Wong: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a8759281b8..c5b11a0c21 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +2005-01-12 Owen Taylor + + * configure.in: Remove GLIB_DIVERT_BEFORE_HELP() on + initialization of gdktarget, that was causing it to be + evaluated before host was set. Simplify --with-gdktarget help + message. + + * gtk/Makefile.am: Use grep | head -n 1 instead of grep -m 1 + which doesn't work with slightly older versions of GNU grep + in install-libtool-import-lib rule. + 2005-01-12 Tor Lillqvist Fix for #162790, by Iwan Wong: diff --git a/configure.in b/configure.in index 13682b1873..dbea88602c 100644 --- a/configure.in +++ b/configure.in @@ -207,15 +207,13 @@ AC_ARG_WITH(ie55, [AC_HELP_STRING([--with-ie55=DIRECTORY], [IE5.5 libs and headers (for Active IMM)])]) -GLIB_AC_DIVERT_BEFORE_HELP([ if test "$platform_win32" = yes; then gdktarget=win32 else gdktarget=x11 fi -]) -AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/linux-fb/win32]] select GDK target [default=$gdktarget]], +AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/linux-fb/win32]] select non-default GDK target], gdktarget=$with_gdktarget) AC_SUBST(gdktarget) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 7dc929bb5f..db00ecc44b 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,10 @@ +2005-01-12 Owen Taylor + + * Makefile.am: Use grep | head -n 1 instead of grep -m 1 + which doesn't work + with slightly older versions of GNU grep in + install-libtool-import-lib rule. + 2005-01-08 Matthias Clasen * === Released 2.6.1 === diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 46dd1243d4..20a151ab37 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -19,7 +19,7 @@ install-libtool-import-lib: # (Unfortunately the GNU linker doesn't yet understand the PRIVATE # directive in .def files.) for entry in `grep PRIVATE gdk_pixbuf.def | sed -e 's/PRIVATE//'`; do \ - file=`nm -A .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -m 1 -E $$entry'$$' | cut -d: -f2`; \ + file=`nm -A .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -E $$entry'$$' | head -n 1 | cut -d: -f2`; \ ar d .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $$file; \ done $(INSTALL) .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 2e0b8a50f6..e3cfc29b15 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -47,7 +47,7 @@ gtk-win32res.lo : gtk-win32.rc install-libtool-import-lib: for entry in `grep PRIVATE gtk.def | sed -e 's/PRIVATE//'`; do \ - file=`nm -A .libs/libgtk-win32-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -m 1 -E $$entry'$$' | cut -d: -f2`; \ + file=`nm -A .libs/libgtk-win32-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -E $$entry'$$' | head -n 1 | cut -d: -f2`; \ ar d .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $$file; \ done $(INSTALL) .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)