diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rwxr-xr-x | ltconfig | 2 | ||||
| -rw-r--r-- | ltmain.sh | 4 |
10 files changed, 53 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Wed Jan 27 20:51:25 PST 1999 Manish Singh <yosh@gimp.org> + + * acinclude.m4: Xsed isn't valid here, don't use it + + * ltmain.sh + * ltconfig: better file magic regexp for Linux libs + Wed Jan 27 23:05:55 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch] (gtk_layout_realize): Move diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 662bb9f20..fe61fdecb 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Wed Jan 27 20:51:25 PST 1999 Manish Singh <yosh@gimp.org> + + * acinclude.m4: Xsed isn't valid here, don't use it + + * ltmain.sh + * ltconfig: better file magic regexp for Linux libs + Wed Jan 27 23:05:55 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch] (gtk_layout_realize): Move diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 662bb9f20..fe61fdecb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Wed Jan 27 20:51:25 PST 1999 Manish Singh <yosh@gimp.org> + + * acinclude.m4: Xsed isn't valid here, don't use it + + * ltmain.sh + * ltconfig: better file magic regexp for Linux libs + Wed Jan 27 23:05:55 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch] (gtk_layout_realize): Move diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 662bb9f20..fe61fdecb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Wed Jan 27 20:51:25 PST 1999 Manish Singh <yosh@gimp.org> + + * acinclude.m4: Xsed isn't valid here, don't use it + + * ltmain.sh + * ltconfig: better file magic regexp for Linux libs + Wed Jan 27 23:05:55 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch] (gtk_layout_realize): Move diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 662bb9f20..fe61fdecb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Wed Jan 27 20:51:25 PST 1999 Manish Singh <yosh@gimp.org> + + * acinclude.m4: Xsed isn't valid here, don't use it + + * ltmain.sh + * ltconfig: better file magic regexp for Linux libs + Wed Jan 27 23:05:55 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch] (gtk_layout_realize): Move diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 662bb9f20..fe61fdecb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Wed Jan 27 20:51:25 PST 1999 Manish Singh <yosh@gimp.org> + + * acinclude.m4: Xsed isn't valid here, don't use it + + * ltmain.sh + * ltconfig: better file magic regexp for Linux libs + Wed Jan 27 23:05:55 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch] (gtk_layout_realize): Move diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 662bb9f20..fe61fdecb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Wed Jan 27 20:51:25 PST 1999 Manish Singh <yosh@gimp.org> + + * acinclude.m4: Xsed isn't valid here, don't use it + + * ltmain.sh + * ltconfig: better file magic regexp for Linux libs + Wed Jan 27 23:05:55 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch] (gtk_layout_realize): Move diff --git a/acinclude.m4 b/acinclude.m4 index dc0cbf171..8f50c74a5 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -206,7 +206,7 @@ changequote([,])dnl case "$host_os" in cygwin*) # Convert to a UNC path for cygwin - test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive"` + test -z "$LD" && LD=`echo X$ac_prog | sed -e "1s/^X//" -e "$sub_uncdrive"` ;; *) test -z "$LD" && LD="$ac_prog" @@ -1658,7 +1658,7 @@ linux-gnu*) soname_spec='${libname}${release}.so$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH - check_shared_deplibs_method='file_magic ELF 32-bit LSB shared object' + check_shared_deplibs_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' sys_lib_search_path="/lib /usr/lib /usr/local/lib `echo $LD_LIBRARY_PATH | sed -e 's/:/ /g'`" if test -f /lib/ld.so.1; then @@ -1460,8 +1460,8 @@ EOF # strict. What do you think Gordon? potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - file_output=`file $potent_lib` - if test `expr "$file_output" : ".*$file_magic_regex"` -ne 0 ; then + + if (file "$potent_lib" | sed '11,$d' | egrep "$file_magic_regex") > /dev/null ; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" break 2 |