storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 02535] Name conflicts in configure

Browse Source 
From: Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2001-11-24 19:51:54 +00:00
parent 7bf591ea6c
commit 7f88aaf6cc
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2001-11-25 Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
* [w3m-dev 02535] Name conflicts in configure
* configure: s/libdir/tlibdir/ for loop variables
2001-11-25 Dai Sato <satodai@dog.intcul.tohoku.ac.jp> 2001-11-25 Dai Sato <satodai@dog.intcul.tohoku.ac.jp>
* display.c: call of init_win32_console_handle is deleted * display.c: call of init_win32_console_handle is deleted

44
configure vendored
View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# $Id: configure,v 1.17 2001/11/24 15:45:33 ukai Exp $ # $Id: configure,v 1.18 2001/11/24 19:51:54 ukai Exp $
# Configuration. # Configuration.
# #
@@ -787,11 +787,11 @@ if [ -z "$dtermlib" ]; then
for lib in $TERM_LIBS for lib in $TERM_LIBS
do do
for libdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib $prefix/lib for tlibdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib $prefix/lib
do do
if [ -f $libdir/lib$lib.a -o -f $libdir/lib$lib.$so_ext ] ; then if [ -f $tlibdir/lib$lib.a -o -f $tlibdir/lib$lib.$so_ext ] ; then
# check if the lib works... # check if the lib works...
Echo "Terminal library -l$lib found at $libdir, " Echo "Terminal library -l$lib found at $tlibdir, "
if $cc $cflags -o _zmachdep _zmachdep.c -l$lib > /dev/null 2>&1 if $cc $cflags -o _zmachdep _zmachdep.c -l$lib > /dev/null 2>&1
then then
echo "and it seems to work." echo "and it seems to work."
@@ -829,9 +829,9 @@ fi
use_gpm="" use_gpm=""
gpmlib="" gpmlib=""
if [ "$use_mouse" = y ]; then if [ "$use_mouse" = y ]; then
for libdir in /lib /usr/lib /usr/local/lib $prefix/lib for tlibdir in /lib /usr/lib /usr/local/lib $prefix/lib
do do
if [ -f $libdir/libgpm.a -o -f $libdir/libgpm.so ]; then if [ -f $tlibdir/libgpm.a -o -f $tlibdir/libgpm.so ]; then
echo "GPM library found." echo "GPM library found."
def_use_gpm="#define USE_GPM" def_use_gpm="#define USE_GPM"
gpmlib="-lgpm" gpmlib="-lgpm"
@@ -861,9 +861,9 @@ esac
for lib in $searchlibs for lib in $searchlibs
do do
for libdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib $prefix/lib for tlibdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib $prefix/lib
do do
if [ -f $libdir/lib$lib.a -o -f $libdir/lib$lib.$so_ext ] ; then if [ -f $tlibdir/lib$lib.a -o -f $tlibdir/lib$lib.$so_ext ] ; then
bsdlib="$bsdlib -l$lib" bsdlib="$bsdlib -l$lib"
break break
fi fi
@@ -874,9 +874,9 @@ extlib=''
searchlibs="socket nsl" searchlibs="socket nsl"
for lib in $searchlibs for lib in $searchlibs
do do
for libdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib $prefix/lib for tlibdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib $prefix/lib
do do
if [ -f $libdir/lib$lib.a -o -f $libdir/lib$lib.$so_ext ] ; then if [ -f $tlibdir/lib$lib.a -o -f $tlibdir/lib$lib.$so_ext ] ; then
extlib="$extlib -l$lib" extlib="$extlib -l$lib"
break break
fi fi
@@ -891,11 +891,11 @@ fi
## Search zlib ## Search zlib
zlib= zlib=
for libdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /usr/X11R6/lib $prefix/lib ${HOME}/lib for tlibdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /usr/X11R6/lib $prefix/lib ${HOME}/lib
do do
if [ -f $libdir/libz.a -o -f $libdir/libz.$so_ext ] ; then if [ -f $tlibdir/libz.a -o -f $tlibdir/libz.$so_ext ] ; then
echo "$libdir/libz found" echo "$tlibdir/libz found"
zlib="-L$libdir -lz" zlib="-L$tlibdir -lz"
break break
fi fi
done done
@@ -918,11 +918,11 @@ fi
gclib='' gclib=''
gcinclude='' gcinclude=''
gctarget='' gctarget=''
for libdir in ${gc_libdir} /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib $prefix/lib ${HOME}/lib for tlibdir in ${gc_libdir} /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib $prefix/lib ${HOME}/lib
do do
if [ -f $libdir/libgc.a -o -f $libdir/libgc.$so_ext ] ; then if [ -f $tlibdir/libgc.a -o -f $tlibdir/libgc.$so_ext ] ; then
echo "$libdir/libgc found" echo "$tlibdir/libgc found"
gclib="-L$libdir -lgc" gclib="-L$tlibdir -lgc"
break break
fi fi
done done
@@ -1701,11 +1701,11 @@ EOF
then then
echo "You have getaddrinfo() in libc." echo "You have getaddrinfo() in libc."
else else
for libdir in /usr/local/v6/lib /usr/local/lib /usr/lib $prefix/lib for tlibdir in /usr/local/v6/lib /usr/local/lib /usr/lib $prefix/lib
do do
if [ -e $libdir/libinet6.a ]; then if [ -e $tlibdir/libinet6.a ]; then
if [ "$libdir" != "/usr/lib" ]; then if [ "$tlibdir" != "/usr/lib" ]; then
v6lib="-L$libdir" v6lib="-L$tlibdir"
fi fi
v6lib="$v6lib -linet6" v6lib="$v6lib -linet6"
if $cc $cflags -o _zmachdep _zmachdep.c $extlib $v6lib > /dev/null 2>&1 if $cc $cflags -o _zmachdep _zmachdep.c $extlib $v6lib > /dev/null 2>&1