Menu
▾
▴
[libdv-cvs] CVS: libdv AUTHORS,1.16,1.17 ChangeLog,1.106,1.107 Makefile.in,1.4,1.5 aclocal.m4,1.3,1.4 config.guess,1.1,1.2 config.h.in,1.1,1.2 config.sub,1.1,1.2 configure,1.12,1.13 configure.ac,1.21,1.22 depcomp,1.1,1.2 install-sh,1.1,1.2 libtool,1.1,1.2 ltmain.sh,1.1,1.2 missing,1.1,1.2
|
From: Dan D. <dde...@us...> - 2004-10-20 03:49:36
|
Update of /cvsroot/libdv/libdv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27641 Modified Files: AUTHORS ChangeLog Makefile.in aclocal.m4 config.guess config.h.in config.sub configure configure.ac depcomp install-sh libtool ltmain.sh missing Log Message: apply x86-64 (tested on AMD64) patch Index: AUTHORS =================================================================== RCS file: /cvsroot/libdv/libdv/AUTHORS,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** AUTHORS 5 Jul 2004 15:55:19 -0000 1.16 --- AUTHORS 20 Oct 2004 03:49:23 -0000 1.17 *************** *** 13,14 **** --- 13,15 ---- Artur Zaprzala <zy...@us...> Dan Dennedy <da...@de...> + Dean Kolosiek <kol...@qw...> Index: ChangeLog =================================================================== RCS file: /cvsroot/libdv/libdv/ChangeLog,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -r1.106 -r1.107 *** ChangeLog 14 Jul 2004 15:39:45 -0000 1.106 --- ChangeLog 20 Oct 2004 03:49:23 -0000 1.107 *************** *** 1,2 **** --- 1,5 ---- + 2004-10-19 Dan Dennedy <da...@de...> + * applied x86-64 patch from Dean Kolosiek. + 2004-07-14 Charles "Buck" Krasic <kr...@ac...> Index: Makefile.in =================================================================== RCS file: /cvsroot/libdv/libdv/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Makefile.in 15 Jul 2004 14:39:39 -0000 1.4 --- Makefile.in 20 Oct 2004 03:49:23 -0000 1.5 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.8.5 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.2 from Makefile.am. # @configure_input@ *************** *** 35,39 **** --- 35,41 ---- PRE_UNINSTALL = : POST_UNINSTALL = : + build_triplet = @build@ host_triplet = @host@ + target_triplet = @target@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ *************** *** 49,53 **** am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno ! mkinstalldirs = $(mkdir_p) CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = libdv.spec libdv.pc --- 51,55 ---- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno ! mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = libdv.spec libdv.pc *************** *** 60,63 **** --- 62,71 ---- pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; + am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(pkgconfigdir)" pkgconfigDATA_INSTALL = $(INSTALL_DATA) *************** *** 111,114 **** --- 119,124 ---- GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ + HOST_X86_64_FALSE = @HOST_X86_64_FALSE@ + HOST_X86_64_TRUE = @HOST_X86_64_TRUE@ HOST_X86_FALSE = @HOST_X86_FALSE@ HOST_X86_TRUE = @HOST_X86_TRUE@ *************** *** 164,167 **** --- 174,179 ---- am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ + am__tar = @am__tar@ + am__untar = @am__untar@ bindir = @bindir@ build = @build@ *************** *** 226,238 **** case '$(am__configure_deps)' in \ *$$dep*) \ ! echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ ! cd $(srcdir) && $(AUTOMAKE) --gnu \ && exit 0; \ exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status --- 238,250 ---- case '$(am__configure_deps)' in \ *$$dep*) \ ! echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ ! cd $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ cd $(top_srcdir) && \ ! $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *************** *** 289,293 **** @list='$(pkgconfig_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ --- 301,305 ---- @list='$(pkgconfig_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f=$(am__strip_dir) \ echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ *************** *** 297,301 **** @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ --- 309,313 ---- @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! f=$(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ *************** *** 452,464 **** fi; \ done ! list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ ! || mkdir "$(distdir)/$$subdir" \ || exit 1; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="../$(top_distdir)" \ ! distdir="../$(distdir)/$$subdir" \ distdir) \ || exit 1; \ --- 464,478 ---- fi; \ done ! list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ ! || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$$top_distdir" \ ! distdir="$$distdir/$$subdir" \ distdir) \ || exit 1; \ *************** *** 474,486 **** || chmod -R a+r $(distdir) dist-gzip: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir ! $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) dist-tarZ: distdir ! $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z $(am__remove_distdir) --- 488,500 ---- || chmod -R a+r $(distdir) dist-gzip: distdir ! tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir ! tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) dist-tarZ: distdir ! tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) *************** *** 495,499 **** dist dist-all: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) --- 509,513 ---- dist dist-all: distdir ! tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) *************** *** 504,512 **** case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ *.tar.bz2*) \ ! bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ *.tar.Z*) \ ! uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ *.shar.gz*) \ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ --- 518,526 ---- case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ ! bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.Z*) \ ! uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *************** *** 593,597 **** distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 607,611 ---- distclean-generic: ! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 655,659 **** check-am clean clean-generic clean-libtool clean-recursive \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ ! dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ distclean-recursive distclean-tags distcleancheck distdir \ --- 669,673 ---- check-am clean clean-generic clean-libtool clean-recursive \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ ! dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ distclean-recursive distclean-tags distcleancheck distdir \ Index: aclocal.m4 =================================================================== RCS file: /cvsroot/libdv/libdv/aclocal.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** aclocal.m4 15 Jul 2004 14:39:39 -0000 1.3 --- aclocal.m4 20 Oct 2004 03:49:23 -0000 1.4 *************** *** 1,3 **** ! # generated automatically by aclocal 1.8.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 --- 1,3 ---- ! # generated automatically by aclocal 1.9.2 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 *************** *** 387,390 **** --- 387,392 ---- [...1007 lines suppressed...] + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar <conftest.tar]) + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) + AC_SUBST([am__untar]) + ]) # _AM_PROG_TAR + Index: config.guess =================================================================== RCS file: /cvsroot/libdv/libdv/config.guess,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** config.guess 14 Jul 2004 15:48:23 -0000 1.1 --- config.guess 20 Oct 2004 03:49:23 -0000 1.2 *************** *** 2,8 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ! timestamp='2003-06-17' # This file is free software; you can redistribute it and/or modify it --- 2,8 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-09-07' # This file is free software; you can redistribute it and/or modify it *************** *** 54,58 **** Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. --- 54,58 ---- Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. *************** *** 137,147 **** UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - ## for Red Hat Linux - if test -f /etc/redhat-release ; then - VENDOR=redhat ; - else - VENDOR= ; - fi - # Note: order is significant - the case branches are not exclusive. --- 137,140 ---- *************** *** 205,217 **** echo "${machine}-${os}${release}" exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; ! arc:OpenBSD:*:*) ! echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} --- 198,216 ---- 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 ;; ! cats:OpenBSD:*:*) ! echo arm-unknown-openbsd${UNAME_RELEASE} exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} *************** *** 229,251 **** echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; sgi:OpenBSD:*:*) ! echo mipseb-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; alpha:OSF1:*:*) ! if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ! fi # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that --- 228,258 ---- echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sgi:OpenBSD:*:*) ! echo mips64-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3: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:*:*) ! case $UNAME_RELEASE in ! *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ! ;; ! *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 *************** *** 285,296 **** UNAME_MACHINE="alphaev79" ;; esac # 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'` ! exit 0 ;; ! Alpha*:OpenVMS:*:*) ! echo alpha-hp-vms exit 0 ;; Alpha\ *:Windows_NT*:*) --- 292,301 ---- 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/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) *************** *** 315,318 **** --- 320,326 ---- echo i370-ibm-openedition exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} *************** *** 407,410 **** --- 415,421 ---- 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} *************** *** 742,746 **** exit 0 ;; *:UNICOS/mp:*:*) ! echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) --- 753,757 ---- exit 0 ;; *:UNICOS/mp:*:*) ! echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) *************** *** 750,753 **** --- 761,769 ---- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} *************** *** 759,775 **** echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; ! *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) ! # Determine whether the default compiler uses glibc. ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #include <features.h> ! #if __GLIBC__ >= 2 ! LIBC=gnu ! #else ! LIBC= ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) --- 775,780 ---- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; ! *:FreeBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; i*:CYGWIN*:*) *************** *** 804,809 **** --- 809,819 ---- exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix *************** *** 815,820 **** echo cris-axis-linux-gnu exit 0 ;; ia64:Linux:*:*) ! echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu exit 0 ;; m68*:Linux:*:*) --- 825,839 ---- echo cris-axis-linux-gnu exit 0 ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit 0 ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit 0 ;; ia64:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu ! exit 0 ;; ! m32r*:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; m68*:Linux:*:*) *************** *** 860,867 **** ;; ppc:Linux:*:*) ! echo powerpc-${VENDOR:-unknown}-linux-gnu exit 0 ;; ppc64:Linux:*:*) ! echo powerpc64-${VENDOR:-unknown}-linux-gnu exit 0 ;; alpha:Linux:*:*) --- 879,886 ---- ;; ppc:Linux:*:*) ! echo powerpc-unknown-linux-gnu exit 0 ;; ppc64:Linux:*:*) ! echo powerpc64-unknown-linux-gnu exit 0 ;; alpha:Linux:*:*) *************** *** 891,895 **** exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) ! echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu exit 0 ;; sh64*:Linux:*:*) --- 910,914 ---- exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) ! echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; sh64*:Linux:*:*) *************** *** 903,907 **** exit 0 ;; x86_64:Linux:*:*) ! echo x86_64-${VENDOR:-unknown}-linux-gnu exit 0 ;; i*86:Linux:*:*) --- 922,926 ---- exit 0 ;; x86_64:Linux:*:*) ! echo x86_64-unknown-linux-gnu exit 0 ;; i*86:Linux:*:*) *************** *** 953,959 **** #endif #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; --- 972,981 ---- #endif #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; *************** *** 983,986 **** --- 1005,1011 ---- echo ${UNAME_MACHINE}-unknown-atheos exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} *************** *** 1052,1058 **** echo m68k-diab-dnix exit 0 ;; ! M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ --- 1077,1083 ---- echo m68k-diab-dnix exit 0 ;; ! M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ *************** *** 1152,1158 **** exit 0 ;; *:Darwin:*:*) ! case `uname -p` in *86) UNAME_PROCESSOR=i686 ;; ! powerpc) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} --- 1177,1184 ---- exit 0 ;; *:Darwin:*:*) ! UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ! case $UNAME_PROCESSOR in *86) UNAME_PROCESSOR=i686 ;; ! unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} *************** *** 1169,1173 **** echo i386-pc-qnx exit 0 ;; ! NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; --- 1195,1199 ---- echo i386-pc-qnx exit 0 ;; ! NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *************** *** 1213,1216 **** --- 1239,1252 ---- echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac Index: config.h.in =================================================================== RCS file: /cvsroot/libdv/libdv/config.h.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** config.h.in 14 Jul 2004 15:29:03 -0000 1.1 --- config.h.in 20 Oct 2004 03:49:23 -0000 1.2 *************** *** 4,7 **** --- 4,10 ---- #undef ARCH_X86 + /* Define as 1 if host is an AMD64 */ + #undef ARCH_X86_64 + /* Define to indicate DEBUGGING is enabled possibly with a level */ #undef DEBUG Index: config.sub =================================================================== RCS file: /cvsroot/libdv/libdv/config.sub,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** config.sub 14 Jul 2004 15:45:07 -0000 1.1 --- config.sub 20 Oct 2004 03:49:23 -0000 1.2 *************** *** 2,8 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ! timestamp='2003-06-18' # This file is (in principle) common to ALL GNU software. --- 2,8 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-08-29' # This file is (in principle) common to ALL GNU software. *************** *** 71,75 **** GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. --- 71,75 ---- GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. *************** *** 119,123 **** maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` --- 119,124 ---- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ ! kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` *************** *** 145,149 **** -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ! -apple | -axis) os= basic_machine=$1 --- 146,150 ---- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ! -apple | -axis | -knuth | -cray) os= basic_machine=$1 *************** *** 229,232 **** --- 230,234 ---- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | c4x | clipper \ *************** *** 235,240 **** | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ ! | ip2k \ ! | m32r | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ --- 237,242 ---- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ ! | ip2k | iq2000 \ ! | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ *************** *** 248,251 **** --- 250,254 ---- | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ *************** *** 258,265 **** | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | s390 | s390x \ | 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 \ | tahoe | thumb | tic4x | tic80 | tron \ --- 261,267 ---- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ *************** *** 299,303 **** | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ! | clipper-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ --- 301,305 ---- | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ! | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ *************** *** 306,311 **** | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ ! | ip2k-* \ ! | m32r-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ --- 308,313 ---- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ ! | ip2k-* | iq2000-* \ ! | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ *************** *** 321,329 **** | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | msp430-* \ ! | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ --- 323,333 ---- | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ | msp430-* \ ! | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ *************** *** 331,339 **** | pyramid-* \ | romp-* | rs6000-* \ - | s390-* | s390x-* \ | 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?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ --- 335,342 ---- | pyramid-* \ | romp-* | rs6000-* \ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ ! | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ *************** *** 362,365 **** --- 365,371 ---- os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe *************** *** 379,382 **** --- 385,391 ---- basic_machine=x86_64-pc ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl *************** *** 438,447 **** --- 447,471 ---- os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 *************** *** 644,651 **** basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k --- 668,671 ---- *************** *** 728,735 **** basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem --- 748,751 ---- *************** *** 743,746 **** --- 759,766 ---- os=-coff ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson *************** *** 834,837 **** --- 854,863 ---- basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd *************** *** 957,960 **** --- 983,990 ---- basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd *************** *** 1030,1033 **** --- 1060,1066 ---- basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm *************** *** 1052,1056 **** basic_machine=sh64-unknown ;; ! sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; --- 1085,1089 ---- basic_machine=sh64-unknown ;; ! sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; *************** *** 1125,1135 **** | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ! | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ ! | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ! | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ --- 1158,1169 ---- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ! | -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* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ! | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ *************** *** 1137,1141 **** | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) # Remember, each alternative MUST END IN *, to match a version number. ;; --- 1171,1175 ---- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; *************** *** 1161,1164 **** --- 1195,1201 ---- os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` *************** *** 1173,1176 **** --- 1210,1216 ---- os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince *************** *** 1194,1197 **** --- 1234,1240 ---- os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd *************** *** 1216,1219 **** --- 1259,1265 ---- os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 *************** *** 1283,1289 **** os=-aout ;; ! c4x-* | tic4x-*) ! os=-coff ! ;; # This must come before the *-dec entry. pdp10-*) --- 1329,1335 ---- os=-aout ;; ! c4x-* | tic4x-*) ! os=-coff ! ;; # This must come before the *-dec entry. pdp10-*) *************** *** 1332,1335 **** --- 1378,1384 ---- os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf *************** *** 1464,1470 **** --- 1513,1525 ---- vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs Index: configure =================================================================== RCS file: /cvsroot/libdv/libdv/configure,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** configure 15 Jul 2004 14:39:39 -0000 1.12 --- configure 20 Oct 2004 03:49:23 -0000 1.13 *************** *** 279,283 **** # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then --- 279,283 ---- # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! (unset CDPATH) >/dev/null 2>&1 && unset CDPATH [...1781 lines suppressed...] --- 23407,23425 ---- continue fi ! # Extract the definition of DEPDIR, am__include, and am__quote ! # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it U=`sed -n 's/^U = //p' < "$mf"` ! # Find all dependency output files, they are included files with ! # $(DEPDIR) in their names. We invoke sed twice because it is the ! # simplest approach to changing $(DEPDIR) to its actual value in the ! # expansion. ! for file in `sed -n " ! s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. Index: configure.ac =================================================================== RCS file: /cvsroot/libdv/libdv/configure.ac,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** configure.ac 15 Jul 2004 14:39:40 -0000 1.21 --- configure.ac 20 Oct 2004 03:49:24 -0000 1.22 *************** *** 7,11 **** AC_CANONICAL_HOST AC_CANONICAL_TARGET ! AM_INIT_AUTOMAKE(libdv, 0.103) AM_MAINTAINER_MODE --- 7,11 ---- AC_CANONICAL_HOST AC_CANONICAL_TARGET ! AM_INIT_AUTOMAKE(libdv, 0.104) AM_MAINTAINER_MODE *************** *** 35,38 **** --- 35,41 ---- [Define as 1 if host is an IA32]) + AH_TEMPLATE([ARCH_X86_64], + [Define as 1 if host is an AMD64]) + AH_TEMPLATE([DEBUG], [Define to indicate DEBUGGING is enabled possibly with a level]) *************** *** 54,57 **** --- 57,61 ---- use_asm=: arch_x86=false + arch_x86_64=false AC_ARG_ENABLE(asm, *************** *** 96,102 **** case "$host_cpu" in i?86) ! arch_x86=: AC_DEFINE(ARCH_X86) ;; *) ;; --- 100,110 ---- case "$host_cpu" in i?86) ! arch_x86=true AC_DEFINE(ARCH_X86) ;; + x86_64) + arch_x86_64=true + AC_DEFINE(ARCH_X86_64) + ;; *) ;; *************** *** 147,152 **** - AM_CONDITIONAL(HOST_X86, $arch_x86) dnl Checks for libraries. --- 155,162 ---- + AM_CONDITIONAL(HOST_X86, test x$arch_x86 = xtrue) + AM_CONDITIONAL(HOST_X86_64, test x$arch_x86_64 = xtrue) + dnl Checks for libraries. Index: depcomp =================================================================== RCS file: /cvsroot/libdv/libdv/depcomp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** depcomp 14 Jul 2004 15:42:46 -0000 1.1 --- depcomp 20 Oct 2004 03:49:24 -0000 1.2 *************** *** 2,6 **** # depcomp - compile a program generating dependencies as side-effects ! scriptversion=2004-04-25.13 # Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. --- 2,6 ---- # depcomp - compile a program generating dependencies as side-effects ! scriptversion=2004-05-31.23 # Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. *************** *** 44,47 **** --- 44,48 ---- source Source file read by `PROGRAMS ARGS'. object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputing dependencies. *************** *** 62,77 **** exit 1 fi - # `libtool' can also be set to `yes' or `no'. - - if test -z "$depfile"; then - base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` - dir=`echo "$object" | sed 's,/.*$,/,'` - if test "$dir" = "$object"; then - dir= - fi - # FIXME: should be _deps on DOS. - depfile="$dir.deps/$base" - fi tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} --- 63,70 ---- exit 1 fi + # Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. + depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} *************** *** 296,302 **** if test "$libtool" = yes; then # Dependencies are output in .lo.d with libtool 1.4. ! # They are output in .o.d with libtool 1.5. tmpdepfile1="$dir.libs/$base.lo.d" ! tmpdepfile2="$dir.libs/$base.o.d" tmpdepfile3="$dir.libs/$base.d" "$@" -Wc,-MD --- 289,298 ---- if test "$libtool" = yes; then # Dependencies are output in .lo.d with libtool 1.4. ! # With libtool 1.5 they are output both in $dir.libs/$base.o.d ! # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the ! # latter, because the former will be cleaned when $dir.libs is ! # erased. tmpdepfile1="$dir.libs/$base.lo.d" ! tmpdepfile2="$dir$base.o.d" tmpdepfile3="$dir.libs/$base.d" "$@" -Wc,-MD Index: install-sh =================================================================== RCS file: /cvsroot/libdv/libdv/install-sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** install-sh 14 Jul 2004 15:42:46 -0000 1.1 --- install-sh 20 Oct 2004 03:49:24 -0000 1.2 *************** *** 2,6 **** # install - install a program, script, or datafile ! scriptversion=2004-04-01.17 # This originates from X11R5 (mit/util/scripts/install.sh), which was --- 2,6 ---- # install - install a program, script, or datafile ! scriptversion=2004-09-10.20 # This originates from X11R5 (mit/util/scripts/install.sh), which was *************** *** 59,65 **** mkdirprog="${MKDIRPROG-mkdir}" - transformbasename= - transform_arg= - instcmd="$mvprog" chmodcmd="$chmodprog 0755" chowncmd= --- 59,62 ---- *************** *** 71,91 **** dst= dir_arg= ! usage="Usage: $0 [OPTION]... SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY ! or: $0 -d DIRECTORIES... ! In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default. ! In the second, create the directory path DIR. Options: ! -b=TRANSFORMBASENAME ! -c copy source (using $cpprog) instead of moving (using $mvprog). -d create directories instead of installing files. ! -g GROUP $chgrp installed files to GROUP. ! -m MODE $chmod installed files to MODE. ! -o USER $chown installed files to USER. ! -s strip installed files (using $stripprog). ! -t=TRANSFORM --help display this help and exit. --version display version info and exit. --- 68,92 ---- dst= dir_arg= + dstarg= + no_target_directory= ! usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY ! or: $0 [OPTION]... -t DIRECTORY SRCFILES... ! or: $0 [OPTION]... -d DIRECTORIES... ! In the 1st form, copy SRCFILE to DSTFILE. ! In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. ! In the 4th, create DIRECTORIES. Options: ! -c (ignored) -d create directories instead of installing files. ! -g GROUP $chgrpprog installed files to GROUP. ! -m MODE $chmodprog installed files to MODE. ! -o USER $chownprog installed files to USER. ! -s $stripprog installed files. ! -t DIRECTORY install into DIRECTORY. ! -T report an error if DSTFILE is a directory. --help display this help and exit. --version display version info and exit. *************** *** 97,106 **** while test -n "$1"; do case $1 in ! -b=*) transformbasename=`echo $1 | sed 's/-b=//'` ! shift ! continue;; ! ! -c) instcmd=$cpprog ! shift continue;; --- 98,102 ---- while test -n "$1"; do case $1 in ! -c) shift continue;; *************** *** 130,141 **** continue;; ! -t=*) transformarg=`echo $1 | sed 's/-t=//'` ! shift ! continue;; --version) echo "$0 $scriptversion"; exit 0;; *) # When -d is used, all remaining arguments are directories to create. ! test -n "$dir_arg" && break # Otherwise, the last argument is the destination. Remove it from $@. for arg --- 126,143 ---- continue;; ! -t) dstarg=$2 ! shift ! shift ! continue;; ! ! -T) no_target_directory=true ! shift ! continue;; --version) echo "$0 $scriptversion"; exit 0;; *) # When -d is used, all remaining arguments are directories to create. ! # When -t is used, the destination is already specified. ! test -n "$dir_arg$dstarg" && break # Otherwise, the last argument is the destination. Remove it from $@. for arg *************** *** 175,185 **** if test -d "$dst"; then ! instcmd=: chmodcmd= else ! instcmd=$mkdirprog fi else ! # Waiting for this to be detected by the "$instcmd $src $dsttmp" command # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. --- 177,187 ---- if test -d "$dst"; then ! mkdircmd=: chmodcmd= else ! mkdircmd=$mkdirprog fi else ! # Waiting for this to be detected by the "$cpprog $src $dsttmp" command # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. *************** *** 203,206 **** --- 205,212 ---- # if double slashes aren't ignored. if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi dst=$dst/`basename "$src"` fi *************** *** 230,238 **** shift if test ! -d "$pathcomp"; then ! $mkdirprog "$pathcomp" || lasterr=$? # mkdir can fail with a `File exist' error in case several # install-sh are creating the directory concurrently. This # is OK. ! test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; } fi pathcomp=$pathcomp/ --- 236,244 ---- shift if test ! -d "$pathcomp"; then ! $mkdirprog "$pathcomp" # mkdir can fail with a `File exist' error in case several # install-sh are creating the directory concurrently. This # is OK. ! test -d "$pathcomp" || exit fi pathcomp=$pathcomp/ *************** *** 241,245 **** if test -n "$dir_arg"; then ! $doit $instcmd "$dst" \ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ --- 247,251 ---- if test -n "$dir_arg"; then ! $doit $mkdircmd "$dst" \ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ *************** *** 248,261 **** else ! # If we're going to rename the final executable, determine the name now. ! if test -z "$transformarg"; then ! dstfile=`basename "$dst"` ! else ! dstfile=`basename "$dst" $transformbasename \ ! | sed $transformarg`$transformbasename ! fi ! ! # don't allow the sed command to completely eliminate the filename. ! test -z "$dstfile" && dstfile=`basename "$dst"` # Make a couple of temp file names in the proper directory. --- 254,258 ---- else ! dstfile=`basename "$dst"` # Make a couple of temp file names in the proper directory. *************** *** 264,272 **** # Trap to clean up those temp files at exit. ! trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 trap '(exit $?); exit' 1 2 13 15 ! # Move or copy the file name to the temp name ! $doit $instcmd "$src" "$dsttmp" && # and set any options; do chmod last to preserve setuid bits. --- 261,269 ---- # Trap to clean up those temp files at exit. ! trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 trap '(exit $?); exit' 1 2 13 15 ! # Copy the file name to the temp name. ! $doit $cpprog "$src" "$dsttmp" && # and set any options; do chmod last to preserve setuid bits. *************** *** 274,278 **** # If any of these fail, we abort the whole thing. If we want to # ignore errors from any of these, just make sure not to ignore ! # errors from the above "$doit $instcmd $src $dsttmp" command. # { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ --- 271,275 ---- # If any of these fail, we abort the whole thing. If we want to # ignore errors from any of these, just make sure not to ignore ! # errors from the above "$doit $cpprog $src $dsttmp" command. # { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ Index: libtool =================================================================== RCS file: /cvsroot/libdv/libdv/libtool,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** libtool 14 Jul 2004 15:55:11 -0000 1.1 --- libtool 20 Oct 2004 03:49:24 -0000 1.2 *************** *** 2,6 **** # libtoolT - Provide generalized library-building support services. ! # Generated automatically by (GNU libdv 0.103) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # --- 2,6 ---- # libtoolT - Provide generalized library-building support services. ! # Generated automatically by (GNU libdv 0.104) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # *************** *** 38,49 **** # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi # The names of the tagged configurations supported by this script. ! available_tags=" CXX F77" # ### BEGIN LIBTOOL CONFIG ! # Libtool was configured on host localhost.localdomain: # Shell to use when invoking shell scripts. --- 38,49 ---- # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! (unset CDPATH) >/dev/null 2>&1 && unset CDPATH # The names of the tagged configurations supported by this script. ! available_tags=" CXX" # ### BEGIN LIBTOOL CONFIG ! # Libtool was configured on host arch: # Shell to use when invoking shell scripts. *************** *** 67,71 **** # The host system. host_alias= ! host=i686-redhat-linux-gnu # An echo program that does not interpret backslashes. --- 67,71 ---- # The host system. host_alias= ! host=i686-pc-linux-gnu # An echo program that does not interpret backslashes. *************** *** 317,324 **** # Compile-time system search path for libraries ! sys_lib_search_path_spec=" /usr/lib/gcc-lib/i386-redhat-linux/3.3.2/ /usr/lib/gcc/i386-redhat-linux/3.3.2/ /usr/lib/gcc-lib/i386-redhat-linux/3.3.2/../../../../i386-redhat-linux/lib/i386-redhat-linux/3.3.2/ /usr/lib/gcc-lib/i386-redhat-linux/3.3.2/../../../../i386-redhat-linux/lib/ /usr/lib/gcc-lib/i386-redhat-linux/3.3.2/../../../i386-redhat-linux/3.3.2/ /usr/lib/gcc-lib/i386-redhat-linux/3.3.2/../../../ /lib/i386-redhat-linux/3.3.2/ /lib/ /usr/lib/i386-redhat-linux/3.3.2/ /usr/lib/" # Run-time system search path for libraries ! sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib/nvidia-graphics-1.0-5328 /usr/lib/nvidia-graphics-1.0-5328 /usr/kerberos/lib /usr/X11R6/lib /usr/lib/sane /usr/local/lib /usr/lib/qt-3.3/lib /usr/lib/mysql /usr/lib/wine " # Fix the shell variable $srcfile for the compiler. --- 317,324 ---- # Compile-time system search path for libraries ! sys_lib_search_path_spec=" /usr/lib/gcc/i686-pc-linux-gnu/3.4.2/ /usr/lib/gcc/i686-pc-linux-gnu/3.4.2/ /usr/lib/gcc/i686-pc-linux-gnu/3.4.2/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/3.4.2/ /usr/lib/gcc/i686-pc-linux-gnu/3.4.2/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc/i686-pc-linux-gnu/3.4.2/../../../i686-pc-linux-gnu/3.4.2/ /usr/lib/gcc/i686-pc-linux-gnu/3.4.2/../../../ /lib/i686-pc-linux-gnu/3.4.2/ /lib/ /usr/lib/i686-pc-linux-gnu/3.4.2/ /usr/lib/" # Run-time system search path for libraries ! sys_lib_dlsearch_path_spec="/lib /usr/lib # # /etc/ld.so.conf # /usr/X11R6/lib # End of file /usr/local/lib /opt/xfce4/lib /opt/gnome/lib /opt/qt/lib /opt/kde/lib /opt/mono/lib /opt/mozilla/lib/mozilla-1.7 " # Fix the shell variable $srcfile for the compiler. *************** *** 377,383 **** progpath="$0" - # RH: define SED for historic ltconfig's generated by Libtool 1.3 - [ -z "$SED" ] && SED=sed - # The name of this program: progname=`echo "$progpath" | $SED $basename` --- 377,380 ---- *************** *** 390,396 **** PROGRAM=ltmain.sh PACKAGE=libtool ! VERSION=1.5.6 ! TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42)" # Check that we have a working $echo. --- 387,398 ---- PROGRAM=ltmain.sh PACKAGE=libtool ! VERSION=1.5.10 ! TIMESTAMP=" (1.1220.2.130 2004/09/19 12:13:49)" + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi # Check that we have a working $echo. *************** *** 582,585 **** --- 584,703 ---- fi } + + + # func_extract_archives gentop oldlib ... + func_extract_archives () { + my_gentop="$1"; shift + my_oldlibs=${1+"$@"} + my_oldobjs="" + my_xlib="" + my_xabs="" + my_xdir="" + my_status="" + + $show "${rm}r $my_gentop" + $run ${rm}r "$my_gentop" + $show "$mkdir $my_gentop" + $run $mkdir "$my_gentop" + my_status=$? + if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then + exit $my_status + fi + + for my_xlib in $my_oldlibs; do + # Extract the objects. + case $my_xlib in + [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + *) my_xabs=`pwd`"/$my_xlib" ;; + esac + my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` + my_xdir="$my_gentop/$my_xlib" + + $show "${rm}r $my_xdir" + $run ${rm}r "$my_xdir" + $show "$mkdir $my_xdir" + $run $mkdir "$my_xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$my_xdir"; then + exit $status + fi + case $host in + *-darwin*) + $show "Extracting $my_xabs" + # Do not bother doing anything if just a dry run + if test -z "$run"; then + darwin_orig_dir=`pwd` + cd $my_xdir || exit $? + darwin_archive=$my_xabs + darwin_curdir=`pwd` + darwin_base_archive=`basename $darwin_archive` + darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` + if test -n "$darwin_arches"; then + darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` + darwin_arch= + $show "$darwin_base_archive has multiple architectures $darwin_arches" + for darwin_arch in $darwin_arches ; do + mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" + lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" + # Remove the table of contents from the thin files. + $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF 2>/dev/null || true + $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF\ SORTED 2>/dev/null || true + cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" + $AR -xo "${darwin_base_archive}" + rm "${darwin_base_archive}" + cd "$darwin_curdir" + done # $darwin_arches + ## Okay now we have a bunch of thin objects, gotta fatten them up :) + darwin_filelist=`find unfat-$$ -type f | xargs basename | sort -u | $NL2SP` + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do + darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` + lipo -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + rm -rf unfat-$$ + cd "$darwin_orig_dir" + else + cd $darwin_orig_dir + (cd $my_xdir && $AR x $my_xabs) || exit $? + fi # $darwin_arches + fi # $run + ;; + *) + # We will extract separately just the conflicting names and we will + # no longer touch any unique names. It is faster to leave these + # extract automatically by $AR in one run. + $show "(cd $my_xdir && $AR x $my_xabs)" + $run eval "(cd \$my_xdir && $AR x \$my_xabs)" || exit $? + if ($AR t "$my_xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$my_xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$my_xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` + done + $show "(cd $my_xdir && $AR xN $i $my_xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$my_xdir && $AR xN $i \$my_xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi + ;; + esac + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + done + + func_extract_archives_result="$my_oldobjs" + } # End of Shell function definitions ##################################### *************** *** 2325,2329 **** case $linkmode in lib) ! if test "$deplibs_check_method" != pass_all; then $echo $echo "*** Warning: Trying to link with static lib archive $deplib." --- 2443,2462 ---- case $linkmode in lib) ! valid_a_lib=no ! case $deplibs_check_method in ! match_pattern*) ! set dummy $deplibs_check_method ! match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` ! if eval $echo \"$deplib\" 2>/dev/null \ ! | $SED 10q \ ! | $EGREP "$match_pattern_regex" > /dev/null; then ! valid_a_lib=yes ! fi ! ;; ! pass_all) ! valid_a_lib=yes ! ;; ! esac ! if test "$valid_a_lib" != yes; then $echo $echo "*** Warning: Trying to link with static lib archive $deplib." *************** *** 2498,2505 **** fi else ! dir="$ladir/$objdir" ! absdir="$abs_ladir/$objdir" ! # Remove this search path later ! notinst_path="$notinst_path $abs_ladir" fi # $installed = yes name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` --- 2631,2645 ---- fi else ! if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then ! dir="$ladir" ! absdir="$abs_ladir" ! # Remove this search path later ! notinst_path="$notinst_path $abs_ladir" ! else ! dir="$ladir/$objdir" ! absdir="$abs_ladir/$objdir" ! # Remove this search path later ! notinst_path="$notinst_path $abs_ladir" ! fi fi # $installed = yes name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` *************** *** 3288,3292 **** # Check that each of the things are valid numbers. case $current in ! [0-9]*) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 --- 3428,3432 ---- # Check that each of the things are valid numbers. case $current in ! 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 *************** *** 3297,3301 **** case $revision in ! [0-9]*) ;; *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 --- 3437,3441 ---- case $revision in ! 0 | [1-9] | [1-9][... [truncated message content] |