+2004-06-16 Gary V. Vaughan <gary@gnu.org>
+
+ Automake 1.9 won't have the AC_PROG_EGREP bug (aclocal used to
+ pull an old installed libtool.m4 as well as the bootstrap
+ m4/libtool.m4 if an AC_DEFUN was removed), and we have
+ lt~obsolete.m4 to work around it in the mean time. libtoolize
+ can install macro files from $prefix/share/aclocal perfectly well
+ without us needing to move to a whole other directory:
+
+ * Makefile.am (pkgmacro_DATA): Renamed to aclocal_DATA, so m4
+ files are installed to $prefix/share/aclocal again.
+ (install-data-local): Don't remove just installed macros!
+ * libtoolize.in (pkgmacrodir): Renamed to aclocaldir.
+ (func_copy_some_files): New function factored out of...
+ (func_copy_all_files): ...here. Adjust to use func_copy_some_files.
+ (re_pkgaux_files): Renamed to glob_pkgaux_files, since it is not
+ a regular expression.
+ (re_pkgmagro_files): Replaced with...
+ (pkgmacro_files): ...a colon delimited list of libtool installed
+ m4 files from aclocaldir.
+ (Main): Copy macro files from aclocaldir again.
+ * NEWS: Updated.
+
2004-05-21 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* ltmain.sh (check_executable): The WIN32 API and MinGW do not support
# Everything that gets picked up by aclocal is automatically distributed,
# this is the list of macro files we install on the user's system.
-pkgmacrodir = $(pkgdatadir)/m4
-pkgmacro_DATA = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 \
+# NOTE: Ensure that PKGMACRO_FILES in libtoolize.in is updated if you
+# change the contents of aclocal_DATA:
+aclocal_DATA = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 \
m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
# We build ltversion.m4 here, instead of from config.status,
-# because config.status is rerun each time one og configure's
+# because config.status is rerun each time one of configure's
# dependencies change and ltversion.m4 happens to be a configure
-# dependency. configure and ltversion.m4 vould be rebuilt in
+# dependency. configure and ltversion.m4 would be rebuilt in
# a loop otherwise.
# Use `$(top_srcdir)/m4' for the benefit of non-GNU makes: this is
# how ltversion.m4 appears in our dependencies.
install-data-local:
## Don't install over the top of an old pkgdatadir
-rm -rf $(DESTDIR)$(pkgdatadir)
-## Remove old macro definitions
- -rm -rf $(DESTDIR)$(aclocaldir)/ltdl.m4
- -rm -rf $(DESTDIR)$(aclocaldir)/libtool.m4
install-data-hook:
chmod +x $(DESTDIR)$(pkgdatadir)/config.guess
* If you configure libtool with --disable-shared (or if libtool does not
support shared libraries on your platform) trying to build a library using
`-shared' is a fatal error.
-* libtoolize installs libtool.m4 (and ltdl.m4 if used) to AC_CONFIG_MACRO_DIR.
+* libtoolize installs libtool.m4, (ltdl.m4 if used,) and various supporting
+ m4 definitions to AC_CONFIG_MACRO_DIR.
* Mode inferrence removed, shorthand for choosing modes added.
* Specifying -allow-undefined is now an error.
* Speed up max_cmd_len check.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2004-01-05'
+timestamp='2004-03-12'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit 0 ;;
+ amd64:OpenBSD:*:*)
+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
arc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
+ cats:OpenBSD:*:*)
+ echo arm-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit 0 ;;
+ macppc:MirBSD:*:*)
+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit 0 ;;
alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
+ case $UNAME_RELEASE in
+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- fi
+ ;;
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
# According to Compaq, /usr/sbin/psrinfo has been available on
# OSF/1 and Tru64 systems produced since 1995. I hope that
# covers most systems running today. This code pipes the CPU
"EV7.9 (21364A)")
UNAME_MACHINE="alphaev79" ;;
esac
+ # A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
Alpha*:OpenVMS:*:*)
echo alpha-hp-vms
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
exit 0 ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit 0 ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
exit 0 ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE}
exit 0 ;;
- *:DRAGONFLY:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;
esac
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2004-01-05'
+timestamp='2004-03-12'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m68000 | m68k | m88k | mcore \
+ | m32r | m32rle | m68000 | m68k | m88k | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
| pyramid \
| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
| strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
- | m32r-* \
+ | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
basic_machine=a29k-amd
os=-udi
;;
+ abacus)
+ basic_machine=abacus-unknown
+ ;;
adobe68k)
basic_machine=m68010-adobe
os=-scout
basic_machine=j90-cray
os=-unicos
;;
+ cr16c)
+ basic_machine=cr16c-unknown
+ os=-elf
+ ;;
crds | unos)
basic_machine=m68k-crds
;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
+ crx)
+ basic_machine=crx-unknown
+ os=-elf
+ ;;
da30 | da30-*)
basic_machine=m68k-da30
;;
sh64)
basic_machine=sh64-unknown
;;
- sparc | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
cydra)
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
prefix=@prefix@
datadir=@datadir@
pkgdatadir=@pkgdatadir@
-pkgmacrodir="$pkgdatadir/m4"
+aclocaldir=@aclocaldir@
auxdir=
m4dir=
configure_ac=configure.in
my_srcdir="$1"
my_destdir="$2"
my_glob_exclude="$3"
- my_copy_cb=${4-func_copy}
+ my_copy_cb="${4-func_copy}"
+ my_srcfiles=
for my_filename in `cd "$my_srcdir" && ls`; do
# ignore excluded filenames
eval 'case $my_filename in '$my_glob_exclude') continue ;; esac'
fi
+ my_srcfiles="$my_srcfiles${my_srcfiles:+:}$my_filename"
+
+ done
+
+ func_copy_some_files "$my_srcdir" "$my_srcfiles" \
+ "$my_destdir" "$my_copy_cb"
+}
+
+
+# func_copy_some_files srcdir srcfile_spec destdir [copy_cb=func_copy]
+# Call COPY_CB for each regular file in SRCDIR named by the ':' delimited
+# names in SRCFILE_SPEC. The odd calling convention is needed to allow
+# spaces in file and directory names.
+func_copy_some_files ()
+{
+ my_srcdir="$1"
+ my_srcfile_spec="$2"
+ my_destdir="$3"
+ my_copy_cb="${4-func_copy}"
+
+ my_save_IFS="$IFS"
+ IFS=:
+ for my_filename in $my_srcfile_spec; do
+
+ IFS="$my_save_IFS"
if test -f "$my_srcdir/$my_filename"; then
if test "X$my_copy_cb" = Xfunc_copy; then
$opt_force || if test -f "$my_destdir/$my_filename"; then
$my_copy_cb "$my_srcdir/$my_filename" "$my_destdir/$my_filename"
done
+ IFS="$my_save_IFS"
}
# func_grep expression filename
{
rerun_aclocal=false
- re_pkgaux_files='config\.guess|config\.sub|ltmain\.sh'
- re_pkgmacro_files='libtool\.m4|ltdl\.m4'
+ # NOTE: PKGMACRO_FILES must be kept in synch with aclocal_DATA in the
+ # libtool top_srcdir/Makefile.am (libtool.m4 and ltdl.m4 are handled
+ # specially below though, so don't add them here):
+ pkgmacro_files='argz.m4:ltoptions.m4:ltsugar.m4:ltversion.m4'
+
+ glob_exclude_pkgaux_files='config.guess|config.sub|ltmain.sh'
func_scan_files
$opt_quiet || func_check_macros
func_echo "putting files in AC_CONFIG_AUX_DIR, \`$auxdir'."
fi
if $opt_install || $opt_force; then
- func_copy_all_files "$pkgdatadir" "$auxdir" "$re_pkgaux_files"
+ func_copy_all_files "$pkgdatadir" "$auxdir" "$glob_exclude_pkgaux_files"
func_config_update "$pkgdatadir/config.guess" "$auxdir/config.guess"
test -f "$pkgdatadir/config.sub" \
&& func_config_update "$pkgdatadir/config.sub" "$auxdir/config.sub"
func_echo "putting macros in AC_CONFIG_MACRO_DIR, \`$m4dir'."
fi
- libtool_m4="$pkgmacrodir/libtool.m4"
- ltdl_m4="$pkgmacrodir/ltdl.m4"
+ libtool_m4="$aclocaldir/libtool.m4"
+ ltdl_m4="$aclocaldir/ltdl.m4"
- func_copy_all_files "$pkgmacrodir" "$m4dir" \
- "$re_pkgmacro_files" func_serial_update
+ func_copy_some_files "$aclocaldir" "$pkgmacro_files" "$m4dir" func_serial_update
func_serial_update "$libtool_m4" "$m4dir/libtool.m4" LT_INIT 'A[CM]_PROG_LIBTOOL'
if $seen_ltdl; then
projects / thirdparty / libtool.git / commitdiff
