forked from AuroraMiddleware/gtk
Remove GLIB_DIVERT_BEFORE_HELP() on initialization of gdktarget, that was
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:
parent
e34f0452b4
commit
4fa381d14c
11
ChangeLog
11
ChangeLog
@ -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>
|
||||
|
||||
Fix for #162790, by Iwan Wong:
|
||||
|
@ -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>
|
||||
|
||||
Fix for #162790, by Iwan Wong:
|
||||
|
@ -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>
|
||||
|
||||
Fix for #162790, by Iwan Wong:
|
||||
|
@ -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)
|
||||
|
@ -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>
|
||||
|
||||
* === Released 2.6.1 ===
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user