Fixed up shldeps for Linux ltconfig patch, added file libtool-1.2.patch

Fri Sep 18 11:56:19 1998  Owen Taylor  <otaylor@redhat.com>

	* Fixed up shldeps for Linux ltconfig patch, added
	file libtool-1.2.patch which is the patch between
	libtool 1.2 and what was used to generate the ltconfig
	in this directory.

	* gtk+.spec: Build with --xinput=xfree.
This commit is contained in:
Owen Taylor
1998-09-20 14:54:22 +00:00
committed by Owen Taylor
parent a48ad6be3e
commit 41e220c75d
11 changed files with 259 additions and 47 deletions

View File

@@ -1,9 +1,28 @@
Fri Sep 18 11:56:19 1998 Owen Taylor <otaylor@redhat.com>
* Fixed up shldeps for Linux ltconfig patch, added
file libtool-1.2.patch which is the patch between
libtool 1.2 and what was used to generate the ltconfig
in this directory.
* gtk+.spec: Build with --xinput=xfree.
Thu Sep 17 19:10:49 PDT 1998 Manish Singh <yosh@gimp.org>
* install-sh
* missing
* mkinstalldirs: updated to latest automake version
Tue Sep 15 11:30:03 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Keep a list of directories in which we never
want to stat the entries (like /afs), and assume everything in
those directories is a subdirectory.
- When following a path, try to open components even when
we don't find them in their parent's directory to
support automounters.
Mon Sep 14 14:28:24 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c (adjust_adj): Change the way we
@@ -56,11 +75,6 @@ Sat Sep 5 16:01:19 1998 Owen Taylor <otaylor@gtk.org>
then grabbed on a non-input window, ungrab the
devices.
Fri Sep 11 15:26:06 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_event_translate): Don't pass events
for destroyed windows onto gdk_input layer.
Tue Sep 8 12:41:20 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c: Use GDK_INVERT instead of GDK_XOR

View File

@@ -1,9 +1,28 @@
Fri Sep 18 11:56:19 1998 Owen Taylor <otaylor@redhat.com>
* Fixed up shldeps for Linux ltconfig patch, added
file libtool-1.2.patch which is the patch between
libtool 1.2 and what was used to generate the ltconfig
in this directory.
* gtk+.spec: Build with --xinput=xfree.
Thu Sep 17 19:10:49 PDT 1998 Manish Singh <yosh@gimp.org>
* install-sh
* missing
* mkinstalldirs: updated to latest automake version
Tue Sep 15 11:30:03 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Keep a list of directories in which we never
want to stat the entries (like /afs), and assume everything in
those directories is a subdirectory.
- When following a path, try to open components even when
we don't find them in their parent's directory to
support automounters.
Mon Sep 14 14:28:24 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c (adjust_adj): Change the way we
@@ -56,11 +75,6 @@ Sat Sep 5 16:01:19 1998 Owen Taylor <otaylor@gtk.org>
then grabbed on a non-input window, ungrab the
devices.
Fri Sep 11 15:26:06 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_event_translate): Don't pass events
for destroyed windows onto gdk_input layer.
Tue Sep 8 12:41:20 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c: Use GDK_INVERT instead of GDK_XOR

View File

@@ -1,9 +1,28 @@
Fri Sep 18 11:56:19 1998 Owen Taylor <otaylor@redhat.com>
* Fixed up shldeps for Linux ltconfig patch, added
file libtool-1.2.patch which is the patch between
libtool 1.2 and what was used to generate the ltconfig
in this directory.
* gtk+.spec: Build with --xinput=xfree.
Thu Sep 17 19:10:49 PDT 1998 Manish Singh <yosh@gimp.org>
* install-sh
* missing
* mkinstalldirs: updated to latest automake version
Tue Sep 15 11:30:03 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Keep a list of directories in which we never
want to stat the entries (like /afs), and assume everything in
those directories is a subdirectory.
- When following a path, try to open components even when
we don't find them in their parent's directory to
support automounters.
Mon Sep 14 14:28:24 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c (adjust_adj): Change the way we
@@ -56,11 +75,6 @@ Sat Sep 5 16:01:19 1998 Owen Taylor <otaylor@gtk.org>
then grabbed on a non-input window, ungrab the
devices.
Fri Sep 11 15:26:06 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_event_translate): Don't pass events
for destroyed windows onto gdk_input layer.
Tue Sep 8 12:41:20 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c: Use GDK_INVERT instead of GDK_XOR

View File

@@ -1,9 +1,28 @@
Fri Sep 18 11:56:19 1998 Owen Taylor <otaylor@redhat.com>
* Fixed up shldeps for Linux ltconfig patch, added
file libtool-1.2.patch which is the patch between
libtool 1.2 and what was used to generate the ltconfig
in this directory.
* gtk+.spec: Build with --xinput=xfree.
Thu Sep 17 19:10:49 PDT 1998 Manish Singh <yosh@gimp.org>
* install-sh
* missing
* mkinstalldirs: updated to latest automake version
Tue Sep 15 11:30:03 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Keep a list of directories in which we never
want to stat the entries (like /afs), and assume everything in
those directories is a subdirectory.
- When following a path, try to open components even when
we don't find them in their parent's directory to
support automounters.
Mon Sep 14 14:28:24 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c (adjust_adj): Change the way we
@@ -56,11 +75,6 @@ Sat Sep 5 16:01:19 1998 Owen Taylor <otaylor@gtk.org>
then grabbed on a non-input window, ungrab the
devices.
Fri Sep 11 15:26:06 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_event_translate): Don't pass events
for destroyed windows onto gdk_input layer.
Tue Sep 8 12:41:20 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c: Use GDK_INVERT instead of GDK_XOR

View File

@@ -1,9 +1,28 @@
Fri Sep 18 11:56:19 1998 Owen Taylor <otaylor@redhat.com>
* Fixed up shldeps for Linux ltconfig patch, added
file libtool-1.2.patch which is the patch between
libtool 1.2 and what was used to generate the ltconfig
in this directory.
* gtk+.spec: Build with --xinput=xfree.
Thu Sep 17 19:10:49 PDT 1998 Manish Singh <yosh@gimp.org>
* install-sh
* missing
* mkinstalldirs: updated to latest automake version
Tue Sep 15 11:30:03 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Keep a list of directories in which we never
want to stat the entries (like /afs), and assume everything in
those directories is a subdirectory.
- When following a path, try to open components even when
we don't find them in their parent's directory to
support automounters.
Mon Sep 14 14:28:24 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c (adjust_adj): Change the way we
@@ -56,11 +75,6 @@ Sat Sep 5 16:01:19 1998 Owen Taylor <otaylor@gtk.org>
then grabbed on a non-input window, ungrab the
devices.
Fri Sep 11 15:26:06 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_event_translate): Don't pass events
for destroyed windows onto gdk_input layer.
Tue Sep 8 12:41:20 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c: Use GDK_INVERT instead of GDK_XOR

View File

@@ -1,9 +1,28 @@
Fri Sep 18 11:56:19 1998 Owen Taylor <otaylor@redhat.com>
* Fixed up shldeps for Linux ltconfig patch, added
file libtool-1.2.patch which is the patch between
libtool 1.2 and what was used to generate the ltconfig
in this directory.
* gtk+.spec: Build with --xinput=xfree.
Thu Sep 17 19:10:49 PDT 1998 Manish Singh <yosh@gimp.org>
* install-sh
* missing
* mkinstalldirs: updated to latest automake version
Tue Sep 15 11:30:03 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Keep a list of directories in which we never
want to stat the entries (like /afs), and assume everything in
those directories is a subdirectory.
- When following a path, try to open components even when
we don't find them in their parent's directory to
support automounters.
Mon Sep 14 14:28:24 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c (adjust_adj): Change the way we
@@ -56,11 +75,6 @@ Sat Sep 5 16:01:19 1998 Owen Taylor <otaylor@gtk.org>
then grabbed on a non-input window, ungrab the
devices.
Fri Sep 11 15:26:06 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_event_translate): Don't pass events
for destroyed windows onto gdk_input layer.
Tue Sep 8 12:41:20 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c: Use GDK_INVERT instead of GDK_XOR

View File

@@ -1,9 +1,28 @@
Fri Sep 18 11:56:19 1998 Owen Taylor <otaylor@redhat.com>
* Fixed up shldeps for Linux ltconfig patch, added
file libtool-1.2.patch which is the patch between
libtool 1.2 and what was used to generate the ltconfig
in this directory.
* gtk+.spec: Build with --xinput=xfree.
Thu Sep 17 19:10:49 PDT 1998 Manish Singh <yosh@gimp.org>
* install-sh
* missing
* mkinstalldirs: updated to latest automake version
Tue Sep 15 11:30:03 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Keep a list of directories in which we never
want to stat the entries (like /afs), and assume everything in
those directories is a subdirectory.
- When following a path, try to open components even when
we don't find them in their parent's directory to
support automounters.
Mon Sep 14 14:28:24 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c (adjust_adj): Change the way we
@@ -56,11 +75,6 @@ Sat Sep 5 16:01:19 1998 Owen Taylor <otaylor@gtk.org>
then grabbed on a non-input window, ungrab the
devices.
Fri Sep 11 15:26:06 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_event_translate): Don't pass events
for destroyed windows onto gdk_input layer.
Tue Sep 8 12:41:20 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c: Use GDK_INVERT instead of GDK_XOR

View File

@@ -736,7 +736,14 @@ if test "$with_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
# See if GNU ld supports shared libraries.
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
case "$host_os" in
linux-gnu*)
archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs $deplibs'
;;
*)
archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
;;
esac
runpath_var=LD_RUN_PATH
ld_shlibs=yes
else
@@ -988,11 +995,11 @@ void nm_test_func(){}
main(){nm_test_var='a';nm_test_func();return(0);}
EOF
echo "$progname:991: checking if global_symbol_pipe works" >&5
if { (eval echo $progname:992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then
echo "$progname:998: checking if global_symbol_pipe works" >&5
if { (eval echo $progname:999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then
# Now try to grab the symbols.
nlist=conftest.nm
if { echo "$progname:995: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
if { echo "$progname:1002: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
@@ -1050,7 +1057,7 @@ EOF
save_CFLAGS="$CFLAGS"
LIBS='conftestm.o'
CFLAGS="$CFLAGS$no_builtin_flag"
if { (eval echo $progname:1053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo $progname:1060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
pipe_works=yes
else
echo "$progname: failed program was:" >&5

View File

@@ -111,9 +111,9 @@ are in gtk+-devel.
%build
# Needed for snapshot releases.
if [ ! -f configure ]; then
CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix
CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --with-xinput=xfree
else
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --with-xinput=xfree
fi
if [ "$SMP" != "" ]; then

100
libtool-1.2.patch Normal file
View File

@@ -0,0 +1,100 @@
The ltconfig and ltmain.sh in this directory are those from
libtool-1.2, with the following patch applied.
This patch includes two patches from libtool-1.2a, to improve checking
for echo/printf quoting, and to fix a problem with detecting shared
library support on various compilers. (egcs and SunPro CC)
It also includes a patch from the Debian Linux distribution which
reenables shared library dependencies on Linux.
Owen Taylor
20 Sep 1998
diff -ur libtool-1.2/ltconfig.in libtool-1.2.patched/ltconfig.in
--- libtool-1.2/ltconfig.in Sun Sep 20 10:34:07 1998
+++ libtool-1.2.patched/ltconfig.in Sun Sep 20 10:34:22 1998
@@ -32,23 +32,43 @@
echo=echo
if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then :
else
- # The Solaris and AIX default echo program unquotes backslashes.
- # This makes it impossible to quote backslashes using
+ # The Solaris, AIX, and Digital Unix default echo programs unquote
+ # backslashes. This makes it impossible to quote backslashes using
# echo "$something" | sed 's/\\/\\\\/g'
- # So, we emulate echo with printf '%s\n'
- echo="printf %s\\n"
- if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then :
- else
- # Oops. We have no working printf. Try to find a not-so-buggy echo.
- echo=echo
- IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
- for dir in $PATH /usr/ucb; do
- if test -f $dir/echo && test "X`$dir/echo '\t'`" = 'X\t'; then
- echo="$dir/echo"
- break
+ #
+ # So, first we look for a working echo in the user's PATH.
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
+ for dir in $PATH /usr/ucb; do
+ if test -f $dir/echo && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t'; then
+ echo="$dir/echo"
+ break
+ fi
+ done
+ IFS="$save_ifs"
+
+ if test "X$echo" = Xecho; then
+ # We didn't find a better echo, so look for alternatives.
+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t'; then
+ # This shell has a builtin print -r that does the trick.
+ echo='print -r'
+#
+# The following is from libtool-1.2a, won't work with this patched
+# libtool-1.2
+#
+# elif test -f /bin/ksh && test "X$CONFIG_SHELL" != X/bin/ksh; then
+# # If we have ksh, try running ltconfig again with it.
+# CONFIG_SHELL=/bin/ksh
+# export CONFIG_SHELL
+# exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
+ else
+ # Try using printf.
+ echo='printf %s\n'
+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then :
+ else
+ # Oops. We lost completely, so just stick with echo.
+ echo=echo
fi
- done
- IFS="$save_ifs"
+ fi
fi
fi
@@ -541,7 +561,7 @@
# Check to make sure the pic_flag actually works.
echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
$rm conftest*
- echo > conftest.c
+ echo "int some_variable = 0;" > conftest.c
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $pic_flag -DPIC"
echo "$progname:@LINENO@: checking if $compiler PIC flag $pic_flag works" >&5
@@ -716,7 +736,14 @@
# See if GNU ld supports shared libraries.
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
+ case "$host_os" in
+ linux-gnu*)
+ archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs $deplibs'
+ ;;
+ *)
+ archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
+ ;;
+ esac
runpath_var=LD_RUN_PATH
ld_shlibs=yes
else

View File

@@ -736,7 +736,14 @@ if test "$with_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
# See if GNU ld supports shared libraries.
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
case "$host_os" in
linux-gnu*)
archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs $deplibs'
;;
*)
archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
;;
esac
runpath_var=LD_RUN_PATH
ld_shlibs=yes
else
@@ -988,11 +995,11 @@ void nm_test_func(){}
main(){nm_test_var='a';nm_test_func();return(0);}
EOF
echo "$progname:991: checking if global_symbol_pipe works" >&5
if { (eval echo $progname:992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then
echo "$progname:998: checking if global_symbol_pipe works" >&5
if { (eval echo $progname:999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then
# Now try to grab the symbols.
nlist=conftest.nm
if { echo "$progname:995: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
if { echo "$progname:1002: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
@@ -1050,7 +1057,7 @@ EOF
save_CFLAGS="$CFLAGS"
LIBS='conftestm.o'
CFLAGS="$CFLAGS$no_builtin_flag"
if { (eval echo $progname:1053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo $progname:1060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
pipe_works=yes
else
echo "$progname: failed program was:" >&5