callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove GLIB_DIVERT_BEFORE_HELP() on initialization of gdktarget, that was

Browse Source 
2005-01-12  Owen Taylor <otaylor@redhat.com>

        * 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.
This commit is contained in:
Owen Taylor 2005-01-13 01:56:42 +00:00 committed by Owen Taylor
parent e34f0452b4
commit 4fa381d14c
7 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2005-01-12 Owen Taylor <otaylor@redhat.com>
* 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 <tlillqvist@novell.com> 2005-01-12 Tor Lillqvist <tlillqvist@novell.com>
Fix for #162790, by Iwan Wong: Fix for #162790, by Iwan Wong:

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
2005-01-12 Owen Taylor <otaylor@redhat.com>
* 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 <tlillqvist@novell.com> 2005-01-12 Tor Lillqvist <tlillqvist@novell.com>
Fix for #162790, by Iwan Wong: Fix for #162790, by Iwan Wong:

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
2005-01-12 Owen Taylor <otaylor@redhat.com>
* 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 <tlillqvist@novell.com> 2005-01-12 Tor Lillqvist <tlillqvist@novell.com>
Fix for #162790, by Iwan Wong: Fix for #162790, by Iwan Wong:

4
configure.in
View File

@ -207,15 +207,13 @@ AC_ARG_WITH(ie55,
[AC_HELP_STRING([--with-ie55=DIRECTORY], [AC_HELP_STRING([--with-ie55=DIRECTORY],
[IE5.5 libs and headers (for Active IMM)])]) [IE5.5 libs and headers (for Active IMM)])])
GLIB_AC_DIVERT_BEFORE_HELP([
if test "$platform_win32" = yes; then if test "$platform_win32" = yes; then
gdktarget=win32 gdktarget=win32
else else
gdktarget=x11 gdktarget=x11
fi 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) gdktarget=$with_gdktarget)
AC_SUBST(gdktarget) AC_SUBST(gdktarget)

7
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,10 @@
2005-01-12 Owen Taylor <otaylor@redhat.com>
* 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 <mclasen@redhat.com> 2005-01-08 Matthias Clasen <mclasen@redhat.com>
* === Released 2.6.1 === * === Released 2.6.1 ===

2
gdk-pixbuf/Makefile.am
View File

@ -19,7 +19,7 @@ install-libtool-import-lib:
# (Unfortunately the GNU linker doesn't yet understand the PRIVATE # (Unfortunately the GNU linker doesn't yet understand the PRIVATE
# directive in .def files.) # directive in .def files.)
for entry in `grep PRIVATE gdk_pixbuf.def | sed -e 's/PRIVATE//'`; do \ 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; \ ar d .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $$file; \
done done
$(INSTALL) .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir) $(INSTALL) .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)

2
gtk/Makefile.am
View File

@ -47,7 +47,7 @@ gtk-win32res.lo : gtk-win32.rc
install-libtool-import-lib: install-libtool-import-lib:
for entry in `grep PRIVATE gtk.def | sed -e 's/PRIVATE//'`; do \ 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; \ ar d .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $$file; \
done done
$(INSTALL) .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir) $(INSTALL) .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)