Removed all reference to ALPHAFILE, and DIST_TYPE. Now extracts DIST_POINT
from VERSION file. Use DIST_POINT in assigning DSOSUB_VERSION value.
This commit is contained in:
parent
60e16563b9
commit
03bad0db8f
28
configure
vendored
28
configure
vendored
@ -1,5 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# $Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.8 2000-11-22 14:41:35 warmerda Exp $
|
# $Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.9 2000-11-24 06:28:10 warmerda Exp $
|
||||||
#
|
#
|
||||||
# Tag Image File Format (TIFF) Software
|
# Tag Image File Format (TIFF) Software
|
||||||
#
|
#
|
||||||
@ -152,7 +152,7 @@ do
|
|||||||
-target|--target) ac_prev=TARGET;;
|
-target|--target) ac_prev=TARGET;;
|
||||||
-target=*|--target=*) TARGET="$ac_optarg" ;;
|
-target=*|--target=*) TARGET="$ac_optarg" ;;
|
||||||
-version|--version)
|
-version|--version)
|
||||||
echo "This is TIFF configure $Revision: 1.8 $"
|
echo "This is TIFF configure $Revision: 1.9 $"
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
-help|--help) usage; exit 0;;
|
-help|--help) usage; exit 0;;
|
||||||
@ -255,21 +255,11 @@ wrong thing, you can use the information captured here to aid in debugging.
|
|||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
if [ -r $SRCDIR/tiff.alpha ] ; then
|
|
||||||
VERSIONFILE=$SRCDIR/VERSION
|
VERSIONFILE=$SRCDIR/VERSION
|
||||||
ALPHAFILE=$SRCDIR/tiff.alpha
|
|
||||||
else
|
|
||||||
VERSIONFILE=$SRCDIR/VERSION
|
|
||||||
ALPHAFILE=$SRCDIR/dist/tiff.alpha
|
|
||||||
fi
|
|
||||||
DATE=`date`
|
DATE=`date`
|
||||||
|
|
||||||
eval `cat $VERSIONFILE | sed 's/\([0-9][0-9]*\)\.\([0-9][0-9]*\)\(.*\)/DIST_MAJOR=\1; DIST_MINOR=\2; DIST_TYPE=\3/'`
|
eval `cat $VERSIONFILE | sed 's/\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\(.*\)/DIST_MAJOR=\1; DIST_MINOR=\2; DIST_POINT=\3/'`
|
||||||
DIST_ALPHA=`awk '{print $3}' $ALPHAFILE`
|
VERSION="v${DIST_MAJOR}.${DIST_MINOR}.${DIST_POINT}"
|
||||||
VERSION="v${DIST_MAJOR}.${DIST_MINOR}${DIST_TYPE}"
|
|
||||||
if [ $DIST_TYPE = beta ]; then
|
|
||||||
VERSION="${VERSION}${DIST_ALPHA}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
Note()
|
Note()
|
||||||
{
|
{
|
||||||
@ -1161,19 +1151,17 @@ if [ "$DSO" = auto ]; then
|
|||||||
;;
|
;;
|
||||||
*-freebsd*)
|
*-freebsd*)
|
||||||
DSOSUF=so.${DIST_MAJOR}
|
DSOSUF=so.${DIST_MAJOR}
|
||||||
DSOSUF_VERSION=${DSOSUF}.${DIST_MINOR}.${DIST_ALPHA}
|
DSOSUF_VERSION=${DSOSUF}.${DIST_MINOR}.${DIST_POINT}
|
||||||
LIBCOPTS='-fPIC'
|
LIBCOPTS='-fPIC'
|
||||||
DSOOPTS='-shared'
|
DSOOPTS='-shared'
|
||||||
DSO=GNULD
|
DSO=GNULD
|
||||||
;;
|
;;
|
||||||
*-linux*)
|
*-linux*)
|
||||||
if [ -r /lib/libc.so.6 ] || [ -r /lib/libc.so.5 ]; then
|
|
||||||
DSOSUF=so.${DIST_MAJOR}
|
DSOSUF=so.${DIST_MAJOR}
|
||||||
DSOSUF_VERSION=${DSOSUF}.${DIST_MINOR}.${DIST_ALPHA}
|
DSOSUF_VERSION=${DSOSUF}.${DIST_MINOR}.${DIST_POINT}
|
||||||
LIBCOPTS='-fPIC'
|
LIBCOPTS='-fPIC'
|
||||||
DSOOPTS='-shared'
|
DSOOPTS='-shared'
|
||||||
DSO=GNULD
|
DSO=GNULD
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
*-osf3*|*-osf4*)
|
*-osf3*|*-osf4*)
|
||||||
DSOSUF=so
|
DSOSUF=so
|
||||||
@ -1712,7 +1700,6 @@ fi
|
|||||||
# NB: these should be sorted alphabetically
|
# NB: these should be sorted alphabetically
|
||||||
cat>>confsed<<EOF
|
cat>>confsed<<EOF
|
||||||
s;@AR@;${AR};g
|
s;@AR@;${AR};g
|
||||||
s;@ALPHAFILE@;`relativize ${ALPHAFILE}`;g
|
|
||||||
s;@AROPTS@;${AROPTS};g
|
s;@AROPTS@;${AROPTS};g
|
||||||
s;@CONFIGDIR@;${CONFIGDIR};g
|
s;@CONFIGDIR@;${CONFIGDIR};g
|
||||||
s;@CCOMPILER@;${CCOMPILER};g
|
s;@CCOMPILER@;${CCOMPILER};g
|
||||||
@ -1731,10 +1718,9 @@ s;@DIR_INC@;${DIR_INC};g
|
|||||||
s;@DIR_LIB@;${DIR_LIB};g
|
s;@DIR_LIB@;${DIR_LIB};g
|
||||||
s;@DIR_MAN@;${DIR_MAN};g
|
s;@DIR_MAN@;${DIR_MAN};g
|
||||||
s;@DIRS_LIBINC@;`relativize ${DIRS_LIBINC}`;g
|
s;@DIRS_LIBINC@;`relativize ${DIRS_LIBINC}`;g
|
||||||
s;@DIST_ALPHA@;${DIST_ALPHA};g
|
s;@DIST_POINT@;${DIST_POINT};g
|
||||||
s;@DIST_MAJOR@;${DIST_MAJOR};g
|
s;@DIST_MAJOR@;${DIST_MAJOR};g
|
||||||
s;@DIST_MINOR@;${DIST_MINOR};g
|
s;@DIST_MINOR@;${DIST_MINOR};g
|
||||||
s;@DIST_TYPE@;${DIST_TYPE};g
|
|
||||||
s;@DSO@;${DSO};g
|
s;@DSO@;${DSO};g
|
||||||
s;@DSOSUF@;${DSOSUF};g
|
s;@DSOSUF@;${DSOSUF};g
|
||||||
s;@DSOSUF_VERSION@;${DSOSUF_VERSION};g
|
s;@DSOSUF_VERSION@;${DSOSUF_VERSION};g
|
||||||
|
Loading…
Reference in New Issue
Block a user