Index: /trunk/psLib/config.guess =================================================================== --- /trunk/psLib/config.guess (revision 3406) +++ /trunk/psLib/config.guess (revision 3407) @@ -2,7 +2,7 @@ # 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-01-10' +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + +timestamp='2004-08-11' # This file is free software; you can redistribute it and/or modify it @@ -54,5 +54,5 @@ Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -107,4 +107,5 @@ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; dummy=$tmp/dummy ; @@ -135,4 +136,14 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +case "${UNAME_MACHINE}" in + i?86) + test -z "$VENDOR" && VENDOR=pc + ;; + *) + test -z "$VENDOR" && VENDOR=unknown + ;; +esac +test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse # Note: order is significant - the case branches are not exclusive. @@ -197,4 +208,7 @@ 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} @@ -203,7 +217,13 @@ 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 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} @@ -236,71 +256,65 @@ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - *:MicroBSD:*:*) - echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE} + *: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 + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "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. - eval $set_cc_for_build - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null - if test "$?" = 0 ; then - case `$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; - esac - fi - 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\ *:Windows_NT*:*) @@ -324,4 +338,7 @@ *:OS/390:*:*) echo i370-ibm-openedition + exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) @@ -342,4 +359,7 @@ echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in @@ -414,4 +434,7 @@ 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} @@ -749,5 +772,5 @@ exit 0 ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) @@ -757,4 +780,9 @@ 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} @@ -767,16 +795,5 @@ exit 0 ;; *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #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} + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; i*:CYGWIN*:*) @@ -789,6 +806,6 @@ echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; - x86:Interix*:3*) - echo i586-pc-interix3 + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' exit 0 ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) @@ -811,5 +828,10 @@ 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:*:*) @@ -817,11 +839,17 @@ exit 0 ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux + exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux exit 0 ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux + exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; mips:Linux:*:*) @@ -842,5 +870,5 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0 ;; mips64:Linux:*:*) @@ -861,11 +889,11 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0 ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-${VENDOR}-linux exit 0 ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-${VENDOR}-linux exit 0 ;; alpha:Linux:*:*) @@ -880,29 +908,32 @@ esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC} exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-${VENDOR}-linux ;; + PA8*) echo hppa2.0-${VENDOR}-linux ;; + *) echo hppa-${VENDOR}-linux ;; esac exit 0 ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-${VENDOR}-linux exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux + exit 0 ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo x86_64-${VENDOR}-linux exit 0 ;; i*86:Linux:*:*) @@ -919,16 +950,16 @@ case "$ld_supported_targets" in elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux" ;; a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" + echo "${UNAME_MACHINE}-${VENDOR}-linuxaout" exit 0 ;; coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" + echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff" exit 0 ;; "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or + # Either a pre-BFD a.out linker (linuxoldld) or # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld" exit 0 ;; esac @@ -954,7 +985,10 @@ #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"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; @@ -983,4 +1017,7 @@ i*86:atheos:*:*) 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*:*) @@ -1053,7 +1090,7 @@ echo m68k-diab-dnix exit 0 ;; - M68*:*:R3V[567]*:*) + M68*:*:R3V[5678]*:*) 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) + 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 \ @@ -1153,7 +1190,8 @@ exit 0 ;; *:Darwin:*:*) - case `uname -p` in + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1170,5 +1208,5 @@ echo i386-pc-qnx exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; @@ -1211,4 +1249,17 @@ echo pdp10-unknown-its exit 0 ;; + SEI:*:*:SEIUX) + 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: /trunk/psLib/config.sub =================================================================== --- /trunk/psLib/config.sub (revision 3406) +++ /trunk/psLib/config.sub (revision 3407) @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - -timestamp='2003-01-03' +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + +timestamp='2004-06-24' # This file is (in principle) common to ALL GNU software. @@ -71,5 +71,5 @@ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -119,5 +119,6 @@ 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*) + 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,5 +146,5 @@ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 @@ -229,12 +230,13 @@ | 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 \ - | clipper \ + | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \ + | ip2k | iq2000 \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ @@ -248,4 +250,5 @@ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ @@ -258,10 +261,9 @@ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | s390 | s390x \ - | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | 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 | tic80 | tron \ + | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ @@ -298,6 +300,6 @@ | avr-* \ | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ - | clipper-* | cydra-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ @@ -306,6 +308,6 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ - | m32r-* \ + | ip2k-* | iq2000-* \ + | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ @@ -321,9 +323,11 @@ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ @@ -331,10 +335,11 @@ | pyramid-* \ | romp-* | rs6000-* \ - | s390-* | s390x-* \ - | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ + | 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-* | tic80-* | tron-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ @@ -360,4 +365,7 @@ os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe @@ -374,4 +382,10 @@ os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl @@ -433,4 +447,12 @@ os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds @@ -438,4 +460,8 @@ cris | cris-* | etrax*) basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf ;; da30 | da30-*) @@ -638,8 +664,4 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware ;; monitor) @@ -723,8 +745,4 @@ basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem @@ -738,4 +756,8 @@ os=-coff ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson @@ -769,6 +791,9 @@ basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) @@ -778,6 +803,9 @@ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) @@ -823,4 +851,10 @@ basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd @@ -833,4 +867,8 @@ basic_machine=mipsisa64sb1el-unknown ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent @@ -840,4 +878,7 @@ os=-hms ;; + sh64) + basic_machine=sh64-unknown + ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs @@ -914,12 +955,16 @@ os=-unicos ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown @@ -934,4 +979,8 @@ tower | tower-32) basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf ;; udi29k) @@ -1008,4 +1057,7 @@ basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm @@ -1024,5 +1076,5 @@ basic_machine=we32k-att ;; - sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; @@ -1030,5 +1082,5 @@ basic_machine=sh64-unknown ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; @@ -1103,11 +1155,12 @@ | -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* \ + | -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* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1115,5 +1168,5 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -microbsd*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; @@ -1139,6 +1192,6 @@ os=`echo $os | sed -e 's|mac|macos|'` ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` + -linux-dietlibc) + os=-linux-dietlibc ;; -sunos5*) @@ -1151,4 +1204,7 @@ os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince @@ -1171,4 +1227,7 @@ -atheos*) os=-atheos + ;; + -syllable*) + os=-syllable ;; -386bsd) @@ -1194,4 +1253,7 @@ os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 @@ -1223,4 +1285,10 @@ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos ;; -none) @@ -1255,4 +1323,7 @@ os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) @@ -1300,4 +1371,7 @@ *-ibm) os=-aix + ;; + *-knuth) + os=-mmixware ;; *-wec) @@ -1433,6 +1507,12 @@ vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent + ;; + -tpf*) + vendor=ibm ;; -vxsim* | -vxworks* | -windiss*) Index: /trunk/psLib/ltmain.sh =================================================================== --- /trunk/psLib/ltmain.sh (revision 3406) +++ /trunk/psLib/ltmain.sh (revision 3407) @@ -2,5 +2,5 @@ # NOTE: Changing this file will not affect anything until you rerun configure. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit , 1996 @@ -25,4 +25,32 @@ # the same distribution terms that you use for the rest of that program. +basename="s,^.*/,,g" + +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" + +# The name of this program: +progname=`echo "$progpath" | $SED $basename` +modename="$progname" + +# Global variables: +EXIT_SUCCESS=0 +EXIT_FAILURE=1 + +PROGRAM=ltmain.sh +PACKAGE=libtool +VERSION=1.5.8 +TIMESTAMP=" (1.1220.2.118 2004/08/07 12:24:38)" + +# 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. if test "X$1" = X--no-reexec; then @@ -37,5 +65,5 @@ else # Restart under the correct shell, and then maybe $echo will work. - exec $SHELL "$0" --no-reexec ${1+"$@"} + exec $SHELL "$progpath" --no-reexec ${1+"$@"} fi @@ -46,19 +74,6 @@ $* EOF - exit 0 + exit $EXIT_SUCCESS fi - -# define SED for historic ltconfig's generated by Libtool 1.3 -test -z "$SED" && SED=sed - -# The name of this program. -progname=`$echo "$0" | ${SED} 's%^.*/%%'` -modename="$progname" - -# Constants. -PROGRAM=ltmain.sh -PACKAGE=libtool -VERSION=1.4.3 -TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)" default_mode= @@ -73,15 +88,15 @@ Xsed="${SED}"' -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' -# test EBCDIC or ASCII -case `echo A|od -x` in - *[Cc]1*) # EBCDIC based system - SP2NL="tr '\100' '\n'" - NL2SP="tr '\r\n' '\100\100'" - ;; - *) # Assume ASCII based system - SP2NL="tr '\040' '\012'" - NL2SP="tr '\015\012' '\040\040'" - ;; -esac +# test EBCDIC or ASCII +case `echo A|tr A '\301'` in + A) # EBCDIC based system + SP2NL="tr '\100' '\n'" + NL2SP="tr '\r\n' '\100\100'" + ;; + *) # Assume ASCII based system + SP2NL="tr '\040' '\012'" + NL2SP="tr '\015\012' '\040\040'" + ;; +esac # NLS nuisances. @@ -98,10 +113,11 @@ # Make sure IFS has a sensible default -: ${IFS=" "} +: ${IFS=" +"} if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - echo "$modename: not configured to build any kind of library" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 + $echo "$modename: not configured to build any kind of library" 1>&2 + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 + exit $EXIT_FAILURE fi @@ -118,6 +134,235 @@ o2lo="s/\\.${objext}\$/.lo/" +##################################### +# Shell function definitions: +# This seems to be the best place for them + +# func_win32_libid arg +# return the library type of file 'arg' +# +# Need a lot of goo to handle *both* DLLs and import libs +# Has to be a shell function in order to 'eat' the argument +# that is supplied when $file_magic_command is called. +func_win32_libid () { + win32_libid_type="unknown" + win32_fileres=`file -L $1 2>/dev/null` + case $win32_fileres in + *ar\ archive\ import\ library*) # definitely import + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ + $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + win32_nmres=`eval $NM -f posix -A $1 | \ + sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` + if test "X$win32_nmres" = "Ximport" ; then + win32_libid_type="x86 archive import" + else + win32_libid_type="x86 archive static" + fi + fi + ;; + *DLL*) + win32_libid_type="x86 DLL" + ;; + *executable*) # but shell scripts are "executable" too... + case $win32_fileres in + *MS\ Windows\ PE\ Intel*) + win32_libid_type="x86 DLL" + ;; + esac + ;; + esac + $echo $win32_libid_type +} + + +# func_infer_tag arg +# Infer tagged configuration to use if any are available and +# if one wasn't chosen via the "--tag" command line option. +# Only attempt this if the compiler in the base compile +# command doesn't match the default compiler. +# arg is usually of the form 'gcc ...' +func_infer_tag () { + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + CC_quoted="$CC_quoted $arg" + done + case $@ in + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when configure was run. + " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. + *) + for z in $available_tags; do + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then + # Evaluate the configuration. + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + CC_quoted="$CC_quoted $arg" + done + case "$@ " in + " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) + # The compiler in the base compile command matches + # the one in the tagged configuration. + # Assume this is the tagged configuration we want. + tagname=$z + break + ;; + esac + fi + done + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then + $echo "$modename: unable to infer tagged configuration" + $echo "$modename: specify a tag with \`--tag'" 1>&2 + exit $EXIT_FAILURE +# else +# $echo "$modename: using $tagname tagged configuration" + fi + ;; + esac + 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 +##################################### + +# Darwin sucks +eval std_shrext=\"$shrext_cmds\" + # Parse our command line options once, thoroughly. -while test $# -gt 0 +while test "$#" -gt 0 do arg="$1" @@ -135,4 +380,32 @@ execute_dlfiles="$execute_dlfiles $arg" ;; + tag) + tagname="$arg" + preserve_args="${preserve_args}=$arg" + + # Check whether tagname contains only valid characters + case $tagname in + *[!-_A-Za-z0-9,/]*) + $echo "$progname: invalid tag name: $tagname" 1>&2 + exit $EXIT_FAILURE + ;; + esac + + case $tagname in + CC) + # Don't test for the "default" C tag, as we know, it's there, but + # not specially marked. + ;; + *) + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then + taglist="$taglist $tagname" + # Evaluate the configuration. + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" + else + $echo "$progname: ignoring unknown tag $tagname" 1>&2 + fi + ;; + esac + ;; *) eval "$prev=\$arg" @@ -152,16 +425,25 @@ --version) - echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" - exit 0 + $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" + $echo + $echo "Copyright (C) 2003 Free Software Foundation, Inc." + $echo "This is free software; see the source for copying conditions. There is NO" + $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + exit $EXIT_SUCCESS ;; --config) - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 - exit 0 + ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath + # Now print the configurations for the tags. + for tagname in $taglist; do + ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" + done + exit $EXIT_SUCCESS ;; --debug) - echo "$progname: enabling shell trace mode" + $echo "$progname: enabling shell trace mode" set -x + preserve_args="$preserve_args $arg" ;; @@ -171,16 +453,16 @@ --features) - echo "host: $host" + $echo "host: $host" if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" + $echo "enable shared libraries" else - echo "disable shared libraries" + $echo "disable shared libraries" fi if test "$build_old_libs" = yes; then - echo "enable static libraries" + $echo "enable static libraries" else - echo "disable static libraries" + $echo "disable static libraries" fi - exit 0 + exit $EXIT_SUCCESS ;; @@ -194,4 +476,13 @@ --quiet | --silent) show=: + preserve_args="$preserve_args $arg" + ;; + + --tag) prevopt="--tag" prev=tag ;; + --tag=*) + set tag "$optarg" ${1+"$@"} + shift + prev=tag + preserve_args="$preserve_args --tag" ;; @@ -204,5 +495,5 @@ $echo "$modename: unrecognized option \`$arg'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; @@ -217,5 +508,5 @@ $echo "$modename: option \`$prevopt' requires an argument" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi @@ -229,6 +520,8 @@ # Infer the operation mode. if test -z "$mode"; then + $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 + $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 case $nonopt in - *cc | *++ | gcc* | *-gcc* | xlc*) + *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) mode=link for arg @@ -271,5 +564,5 @@ $echo "$modename: unrecognized option \`-dlopen'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi @@ -285,127 +578,96 @@ # Get the compilation command and the source file. base_compile= - prev= - lastarg= - srcfile="$nonopt" + srcfile="$nonopt" # always keep a non-empty value in "srcfile" + suppress_opt=yes suppress_output= - - user_target=no + arg_mode=normal + libobj= + later= + for arg do - case $prev in - "") ;; - xcompiler) - # Aesthetically quote the previous argument. - prev= - lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - + case "$arg_mode" in + arg ) + # do not "continue". Instead, add this to base_compile + lastarg="$arg" + arg_mode=normal + ;; + + target ) + libobj="$arg" + arg_mode=normal + continue + ;; + + normal ) + # Accept any command-line options. case $arg in - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - - # Add the previous argument to base_compile. - if test -z "$base_compile"; then - base_compile="$lastarg" - else + -o) + if test -n "$libobj" ; then + $echo "$modename: you cannot specify \`-o' more than once" 1>&2 + exit $EXIT_FAILURE + fi + arg_mode=target + continue + ;; + + -static | -prefer-pic | -prefer-non-pic) + later="$later $arg" + continue + ;; + + -no-suppress) + suppress_opt=no + continue + ;; + + -Xcompiler) + arg_mode=arg # the next one goes into the "base_compile" arg list + continue # The current "srcfile" will either be retained or + ;; # replaced later. I would guess that would be a bug. + + -Wc,*) + args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` + lastarg= + save_ifs="$IFS"; IFS=',' + for arg in $args; do + IFS="$save_ifs" + + # Double-quote args containing other shell metacharacters. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + lastarg="$lastarg $arg" + done + IFS="$save_ifs" + lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` + + # Add the arguments to base_compile. base_compile="$base_compile $lastarg" - fi - continue - ;; - esac - - # Accept any command-line options. - case $arg in - -o) - if test "$user_target" != "no"; then - $echo "$modename: you cannot specify \`-o' more than once" 1>&2 - exit 1 - fi - user_target=next - ;; - - -static) - build_old_libs=yes - continue - ;; - - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no - continue - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - lastarg="$lastarg $arg" - done - IFS="$save_ifs" - lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` - - # Add the arguments to base_compile. - if test -z "$base_compile"; then - base_compile="$lastarg" - else - base_compile="$base_compile $lastarg" - fi - continue - ;; - esac - - case $user_target in - next) - # The next one is the -o target name - user_target=yes - continue - ;; - yes) - # We got the output file - user_target=set - libobj="$arg" - continue - ;; - esac - - # Accept the current argument as the source file. - lastarg="$srcfile" - srcfile="$arg" + continue + ;; + + * ) + # Accept the current argument as the source file. + # The previous "srcfile" becomes the current argument. + # + lastarg="$srcfile" + srcfile="$arg" + ;; + esac # case $arg + ;; + esac # case $arg_mode # Aesthetically quote the previous argument. - - # Backslashify any backslashes, double quotes, and dollar signs. - # These are the only characters that are still specially - # interpreted inside of double-quoted scrings. lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` + case $lastarg in # Double-quote args containing other shell metacharacters. # Many Bourne shells cannot handle close brackets correctly # in scan sets, so we specify it separately. - case $lastarg in *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") lastarg="\"$lastarg\"" @@ -413,22 +675,19 @@ esac - # Add the previous argument to base_compile. - if test -z "$base_compile"; then - base_compile="$lastarg" - else - base_compile="$base_compile $lastarg" - fi - done - - case $user_target in - set) + base_compile="$base_compile $lastarg" + done # for arg + + case $arg_mode in + arg) + $echo "$modename: you must specify an argument for -Xcompile" + exit $EXIT_FAILURE ;; - no) - # Get the name of the library object. - libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` + target) + $echo "$modename: you must specify a target with \`-o'" 1>&2 + exit $EXIT_FAILURE ;; *) - $echo "$modename: you must specify a target with \`-o'" 1>&2 - exit 1 + # Get the name of the library object. + [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` ;; esac @@ -436,5 +695,5 @@ # Recognize several different file suffixes. # If the user specifies -o file.o, it is replaced with file.lo - xform='[cCFSfmso]' + xform='[cCFSifmso]' case $libobj in *.ada) xform=ada ;; @@ -444,8 +703,11 @@ *.c++) xform=c++ ;; *.cc) xform=cc ;; + *.ii) xform=ii ;; + *.class) xform=class ;; *.cpp) xform=cpp ;; *.cxx) xform=cxx ;; *.f90) xform=f90 ;; *.for) xform=for ;; + *.java) xform=java ;; esac @@ -456,23 +718,53 @@ *) $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac + + func_infer_tag $base_compile + + for arg in $later; do + case $arg in + -static) + build_old_libs=yes + continue + ;; + + -prefer-pic) + pic_mode=yes + continue + ;; + + -prefer-non-pic) + pic_mode=no + continue + ;; + esac + done + + objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` + xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$obj"; then + xdir= + else + xdir=$xdir/ + fi + lobj=${xdir}$objdir/$objname if test -z "$base_compile"; then $echo "$modename: you must specify a compilation command" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Delete any leftover library objects. if test "$build_old_libs" = yes; then - removelist="$obj $libobj" + removelist="$obj $lobj $libobj ${libobj}T" else - removelist="$libobj" + removelist="$lobj $libobj ${libobj}T" fi $run $rm $removelist - trap "$run $rm $removelist; exit 1" 1 2 15 + trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 # On Cygwin there's no "real" PIC flag so we must build both object types @@ -493,6 +785,7 @@ lockfile="$output_obj.lock" removelist="$removelist $output_obj $lockfile" - trap "$run $rm $removelist; exit 1" 1 2 15 + trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 else + output_obj= need_locks=no lockfile= @@ -502,5 +795,5 @@ # We use this script file to make the link, it avoids creating a new file if test "$need_locks" = yes; then - until $run ln "$0" "$lockfile" 2>/dev/null; do + until $run ln "$progpath" "$lockfile" 2>/dev/null; do $show "Waiting for $lockfile to be removed" sleep 2 @@ -508,5 +801,5 @@ elif test "$need_locks" = warn; then if test -f "$lockfile"; then - echo "\ + $echo "\ *** ERROR, $lockfile exists and contains: `cat $lockfile 2>/dev/null` @@ -520,7 +813,7 @@ $run $rm $removelist - exit 1 - fi - echo $srcfile > "$lockfile" + exit $EXIT_FAILURE + fi + $echo $srcfile > "$lockfile" fi @@ -528,4 +821,18 @@ eval srcfile=\"$fix_srcfile_path\" fi + + $run $rm "$libobj" "${libobj}T" + + # Create a libtool object file (analogous to a ".la" file), + # but don't create it if we're doing a dry run. + test -z "$run" && cat > ${libobj}T </dev/null`" != x"$srcfile"; then - echo "\ + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $echo "\ *** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` @@ -596,11 +888,11 @@ $run $rm $removelist - exit 1 + exit $EXIT_FAILURE fi # Just move the object if needed, then go on to compile the next one - if test x"$output_obj" != x"$libobj"; then - $show "$mv $output_obj $libobj" - if $run $mv $output_obj $libobj; then : + if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then + $show "$mv $output_obj $lobj" + if $run $mv $output_obj $lobj; then : else error=$? @@ -610,46 +902,21 @@ fi - # If we have no pic_flag, then copy the object into place and finish. - if (test -z "$pic_flag" || test "$pic_mode" != default) && - test "$build_old_libs" = yes; then - # Rename the .lo from within objdir to obj - if test -f $obj; then - $show $rm $obj - $run $rm $obj - fi - - $show "$mv $libobj $obj" - if $run $mv $libobj $obj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then - xdir="." - else - xdir="$xdir" - fi - baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"` - libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` - # Now arrange that obj and lo_libobj become the same file - $show "(cd $xdir && $LN_S $baseobj $libobj)" - if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then - # Unlock the critical section if it was locked - if test "$need_locks" != no; then - $run $rm "$lockfile" - fi - exit 0 - else - error=$? - $run $rm $removelist - exit $error - fi - fi + # Append the name of the PIC object to the libtool object file. + test -z "$run" && cat >> ${libobj}T <> ${libobj}T </dev/null`" != x"$srcfile"; then - echo "\ + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $echo "\ *** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` @@ -695,9 +960,9 @@ $run $rm $removelist - exit 1 + exit $EXIT_FAILURE fi # Just move the object if needed - if test x"$output_obj" != x"$obj"; then + if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then $show "$mv $output_obj $obj" if $run $mv $output_obj $obj; then : @@ -709,20 +974,22 @@ fi - # Create an invalid libtool object if no PIC, so that we do not - # accidentally link it into a program. - if test "$build_libtool_libs" != yes; then - $show "echo timestamp > $libobj" - $run eval "echo timestamp > \$libobj" || exit $? - else - # Move the .lo from within objdir - $show "$mv $libobj $lo_libobj" - if $run $mv $libobj $lo_libobj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi + # Append the name of the non-PIC object the libtool object file. + # Only append if the libtool object file exists. + test -z "$run" && cat >> ${libobj}T <> ${libobj}T </dev/null 2>&1; then + pic_object= + non_pic_object= + + # Read the .lo file + # If there is no directory component, then add one. + case $arg in + */* | *\\*) . $arg ;; + *) . ./$arg ;; + esac + + if test -z "$pic_object" || \ + test -z "$non_pic_object" || + test "$pic_object" = none && \ + test "$non_pic_object" = none; then + $echo "$modename: cannot find name of object for \`$arg'" 1>&2 + exit $EXIT_FAILURE + fi + + # Extract subdirectory from the argument. + xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$arg"; then + xdir= + else + xdir="$xdir/" + fi + + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + dlfiles="$dlfiles $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + dlprefiles="$dlprefiles $pic_object" + prev= + fi + + # A PIC object. + libobjs="$libobjs $pic_object" + arg="$pic_object" + fi + + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" + + # A standard non-PIC object + non_pic_objects="$non_pic_objects $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi + fi + else + # Only an error if not doing a dry-run. + if test -z "$run"; then + $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 + exit $EXIT_FAILURE + else + # Dry-run case. + + # Extract subdirectory from the argument. + xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$arg"; then + xdir= + else + xdir="$xdir/" + fi + + pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` + non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` + libobjs="$libobjs $pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" + fi + fi + done + else + $echo "$modename: link input file \`$save_arg' does not exist" + exit $EXIT_FAILURE + fi + arg=$save_arg prev= continue @@ -919,5 +1304,5 @@ *) $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -951,4 +1336,17 @@ continue ;; + xcclinker) + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $qarg" + prev= + compile_command="$compile_command $qarg" + finalize_command="$finalize_command $qarg" + continue + ;; + shrext) + shrext_cmds="$arg" + prev= + continue + ;; *) eval "$prev=\"\$arg\"" @@ -957,5 +1355,5 @@ ;; esac - fi # test -n $prev + fi # test -n "$prev" prevarg="$arg" @@ -999,5 +1397,5 @@ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then $echo "$modename: more than one -exported-symbols argument is not allowed" - exit 1 + exit $EXIT_FAILURE fi if test "X$arg" = "X-export-symbols"; then @@ -1018,5 +1416,5 @@ -L[A-Z][A-Z]*:*) case $with_gcc/$host in - no/*-*-irix* | no/*-*-nonstopux*) + no/*-*-irix* | /*-*-irix*) compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" @@ -1035,5 +1433,5 @@ if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi dir="$absdir" @@ -1073,12 +1471,16 @@ test "X$arg" = "X-lc" && continue ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework + deplibs="$deplibs -framework System" + continue esac - elif test "X$arg" = "X-lc_r"; then - case $host in + elif test "X$arg" = "X-lc_r"; then + case $host in *-*-openbsd* | *-*-freebsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac + # Do not include libc_r directly, use -pthread flag. + continue + ;; + esac fi deplibs="$deplibs $arg" @@ -1086,6 +1488,39 @@ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + deplibs="$deplibs $arg" + continue + ;; + -module) module=yes + continue + ;; + + # gcc -m* arguments should be passed to the linker via $compiler_flags + # in order to pass architecture information to the linker + # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. + -m*) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" + if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" + fi + continue + ;; + + -shrext) + prev=shrext continue ;; @@ -1115,5 +1550,15 @@ ;; + -objectlist) + prev=objectlist + continue + ;; + -o) prev=output ;; + + -precious-files-regex) + prev=precious_regex + continue + ;; -release) @@ -1139,5 +1584,5 @@ *) $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -1165,4 +1610,9 @@ -version-info) prev=vinfo + continue + ;; + -version-number) + prev=vinfo + vinfo_number=yes continue ;; @@ -1215,4 +1665,9 @@ ;; + -XCClinker) + prev=xcclinker + continue + ;; + # Some other compiler flag. -* | +*) @@ -1227,27 +1682,99 @@ ;; - *.lo | *.$objext) - # A library or standard object. - if test "$prev" = dlfiles; then - # This file was specified with -dlopen. - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $arg" - prev= - continue + *.$objext) + # A standard object. + objs="$objs $arg" + ;; + + *.lo) + # A libtool-controlled object. + + # Check to see that this really is a libtool object. + if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + pic_object= + non_pic_object= + + # Read the .lo file + # If there is no directory component, then add one. + case $arg in + */* | *\\*) . $arg ;; + *) . ./$arg ;; + esac + + if test -z "$pic_object" || \ + test -z "$non_pic_object" || + test "$pic_object" = none && \ + test "$non_pic_object" = none; then + $echo "$modename: cannot find name of object for \`$arg'" 1>&2 + exit $EXIT_FAILURE + fi + + # Extract subdirectory from the argument. + xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$arg"; then + xdir= + else + xdir="$xdir/" + fi + + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + dlfiles="$dlfiles $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + dlprefiles="$dlprefiles $pic_object" + prev= + fi + + # A PIC object. + libobjs="$libobjs $pic_object" + arg="$pic_object" + fi + + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" + + # A standard non-PIC object + non_pic_objects="$non_pic_objects $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi + fi + else + # Only an error if not doing a dry-run. + if test -z "$run"; then + $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 + exit $EXIT_FAILURE else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"` - prev= - else - case $arg in - *.lo) libobjs="$libobjs $arg" ;; - *) objs="$objs $arg" ;; - esac + # Dry-run case. + + # Extract subdirectory from the argument. + xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$arg"; then + xdir= + else + xdir="$xdir/" + fi + + pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` + non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` + libobjs="$libobjs $pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" + fi fi ;; @@ -1300,5 +1827,5 @@ $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi @@ -1309,4 +1836,5 @@ fi + oldlibs= # calculate the name of the file, without its directory outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` @@ -1329,9 +1857,9 @@ fi # Create the object directory. - if test ! -d $output_objdir; then + if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir status=$? - if test $status -ne 0 && test ! -d $output_objdir; then + if test "$status" -ne 0 && test ! -d "$output_objdir"; then exit $status fi @@ -1343,5 +1871,5 @@ $echo "$modename: you must specify an output file" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; *.$libext) linkmode=oldlib ;; @@ -1351,5 +1879,15 @@ esac + case $host in + *cygwin* | *mingw* | *pw32*) + # don't eliminate duplications in $postdeps and $predeps + duplicate_compiler_generated_deps=yes + ;; + *) + duplicate_compiler_generated_deps=$duplicate_deps + ;; + esac specialdeplibs= + libs= # Find all interdependent deplibs by searching for libraries @@ -1363,4 +1901,23 @@ libs="$libs $deplib" done + + if test "$linkmode" = lib; then + libs="$predeps $libs $compiler_lib_search_path $postdeps" + + # Compute libraries that are listed more than once in $predeps + # $postdeps and mark them as special (i.e., whose duplicates are + # not to be eliminated). + pre_post_deps= + if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in + *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; + esac + pre_post_deps="$pre_post_deps $pre_post_dep" + done + fi + pre_post_deps= + fi + deplibs= newdependency_libs= @@ -1377,5 +1934,5 @@ *) $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -1394,15 +1951,20 @@ esac for pass in $passes; do - if test $linkmode = prog; then - # Determine which files to process + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan"; then + libs="$deplibs" + deplibs= + fi + if test "$linkmode" = prog; then case $pass in - dlopen) - libs="$dlfiles" - save_deplibs="$deplibs" # Collect dlpreopened libraries - deplibs= - ;; + dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac + fi + if test "$pass" = dlopen; then + # Collect dlpreopened libraries + save_deplibs="$deplibs" + deplibs= fi for deplib in $libs; do @@ -1410,10 +1972,19 @@ found=no case $deplib in + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + fi + continue + ;; -l*) - if test $linkmode = oldlib && test $linkmode = obj; then - $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 + if test "$linkmode" != lib && test "$linkmode" != prog; then + $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 continue fi - if test $pass = conv; then + if test "$pass" = conv; then deplibs="$deplib $deplibs" continue @@ -1421,10 +1992,16 @@ name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do - # Search the libtool library - lib="$searchdir/lib${name}.la" - if test -f "$lib"; then - found=yes - break - fi + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" + if test -f "$lib"; then + if test "$search_ext" = ".la"; then + found=yes + else + found=no + fi + break 2 + fi + done done if test "$found" != yes; then @@ -1435,7 +2012,43 @@ else deplibs="$deplib $deplibs" - test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" fi continue + else # deplib is a libtool library + # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, + # We need to do some special things here, and not later. + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $deplib "*) + if (${SED} -e '2q' $lib | + grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + library_names= + old_library= + case $lib in + */* | *\\*) . $lib ;; + *) . ./$lib ;; + esac + for l in $old_library $library_names; do + ll="$l" + done + if test "X$ll" = "X$old_library" ; then # only static version available + found=no + ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` + test "X$ladir" = "X$lib" && ladir="." + lib=$ladir/$old_library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi + fi + ;; + *) ;; + esac + fi fi ;; # -l @@ -1444,23 +2057,23 @@ lib) deplibs="$deplib $deplibs" - test $pass = conv && continue + test "$pass" = conv && continue newdependency_libs="$deplib $newdependency_libs" newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` ;; prog) - if test $pass = conv; then + if test "$pass" = conv; then deplibs="$deplib $deplibs" continue fi - if test $pass = scan; then + if test "$pass" = scan; then deplibs="$deplib $deplibs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` else compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" fi + newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` ;; *) - $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2 + $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 ;; esac # linkmode @@ -1468,5 +2081,5 @@ ;; # -L -R*) - if test $pass = link; then + if test "$pass" = link; then dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` # Make sure the xrpath contains only unique directories. @@ -1481,5 +2094,5 @@ *.la) lib="$deplib" ;; *.$libext) - if test $pass = conv; then + if test "$pass" = conv; then deplibs="$deplib $deplibs" continue @@ -1487,16 +2100,31 @@ case $linkmode in lib) - if test "$deplibs_check_method" != pass_all; then - echo - echo "*** Warning: Trying to link with static lib archive $deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because the file extensions .$libext of this argument makes me believe" - echo "*** that it is just a static archive that I should not used here." + 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." + $echo "*** I have the capability to make that library automatically link in when" + $echo "*** you link to this library. But I can only do this if you have a" + $echo "*** shared version of the library, which you do not appear to have" + $echo "*** because the file extensions .$libext of this argument makes me believe" + $echo "*** that it is just a static archive that I should not used here." else - echo - echo "*** Warning: Linking the shared library $output against the" - echo "*** static library $deplib is not portable!" + $echo + $echo "*** Warning: Linking the shared library $output against the" + $echo "*** static library $deplib is not portable!" deplibs="$deplib $deplibs" fi @@ -1504,5 +2132,5 @@ ;; prog) - if test $pass != link; then + if test "$pass" != link; then deplibs="$deplib $deplibs" else @@ -1515,12 +2143,16 @@ ;; # *.$libext *.lo | *.$objext) - if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - newdlprefiles="$newdlprefiles $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - newdlfiles="$newdlfiles $deplib" + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + elif test "$linkmode" = prog; then + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlopen support or we're linking statically, + # we need to preload. + newdlprefiles="$newdlprefiles $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + newdlfiles="$newdlfiles $deplib" + fi fi continue @@ -1531,15 +2163,15 @@ ;; esac # case $deplib - if test $found = yes || test -f "$lib"; then : + if test "$found" = yes || test -f "$lib"; then : else $echo "$modename: cannot find the library \`$lib'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit 1 + exit $EXIT_FAILURE fi @@ -1554,6 +2186,7 @@ old_library= # If the library was installed with an old release of libtool, - # it will not redefine variable installed. + # it will not redefine variables installed, or shouldnotlink installed=yes + shouldnotlink=no # Read the .la file @@ -1565,11 +2198,10 @@ if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || - { test $linkmode = oldlib && test $linkmode = obj; }; then - # Add dl[pre]opened files of deplib + { test "$linkmode" != prog && test "$linkmode" != lib; }; then test -n "$dlopen" && dlfiles="$dlfiles $dlopen" test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" fi - if test $pass = conv; then + if test "$pass" = conv; then # Only check for convenience libraries deplibs="$lib $deplibs" @@ -1577,5 +2209,5 @@ if test -z "$old_library"; then $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # It is a libtool convenience library, so add in its objects. @@ -1592,10 +2224,11 @@ tmp_libs="$tmp_libs $deplib" done - elif test $linkmode != prog && test $linkmode != lib; then + elif test "$linkmode" != prog && test "$linkmode" != lib; then $echo "$modename: \`$lib' is not a convenience library" 1>&2 - exit 1 + exit $EXIT_FAILURE fi continue fi # $pass = conv + # Get the name of the library we link against. @@ -1606,17 +2239,21 @@ if test -z "$linklib"; then $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # This library was specified with -dlopen. - if test $pass = dlopen; then + if test "$pass" = dlopen; then if test -z "$libdir"; then $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 - exit 1 - fi - if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + exit $EXIT_FAILURE + fi + if test -z "$dlname" || + test "$dlopen_support" != yes || + test "$build_libtool_libs" = no; then # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. - dlprefiles="$dlprefiles $lib" + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. + dlprefiles="$dlprefiles $lib $dependency_libs" else newdlfiles="$newdlfiles $lib" @@ -1651,16 +2288,23 @@ fi else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + 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//'` # This library was specified with -dlpreopen. - if test $pass = dlpreopen; then + if test "$pass" = dlpreopen; then if test -z "$libdir"; then $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Prefer using a static library (so that no silly _DYNAMIC symbols @@ -1678,5 +2322,5 @@ if test -z "$libdir"; then # Link the convenience library - if test $linkmode = lib; then + if test "$linkmode" = lib; then deplibs="$dir/$old_library $deplibs" elif test "$linkmode,$pass" = "prog,link"; then @@ -1684,10 +2328,11 @@ finalize_deplibs="$dir/$old_library $finalize_deplibs" else - deplibs="$lib $deplibs" + deplibs="$lib $deplibs" # used for prog,scan pass fi continue fi - if test $linkmode = prog && test $pass != link; then + + if test "$linkmode" = prog && test "$pass" != link; then newlib_search_path="$newlib_search_path $ladir" deplibs="$lib $deplibs" @@ -1705,5 +2350,5 @@ esac # Need to link against all dependency_libs? - if test $linkalldeplibs = yes; then + if test "$linkalldeplibs" = yes; then deplibs="$deplib $deplibs" else @@ -1722,11 +2367,17 @@ fi # $linkmode = prog... - link_static=no # Whether the deplib will be linked statically - if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then - # Link against this shared library - - if test "$linkmode,$pass" = "prog,link" || - { test $linkmode = lib && test $hardcode_into_libs = yes; }; then + if test "$linkmode,$pass" = "prog,link"; then + if test -n "$library_names" && + { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + # We need to hardcode the library path + if test -n "$shlibpath_var"; then + # Make sure the rpath contains only unique directories. + case "$temp_rpath " in + *" $dir "*) ;; + *" $absdir "*) ;; + *) temp_rpath="$temp_rpath $dir" ;; + esac + fi + # Hardcode the library path. # Skip directories that are in the system default run-time @@ -1750,15 +2401,4 @@ ;; esac - if test $linkmode = prog; then - # We need to hardcode the library path - if test -n "$shlibpath_var"; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *" $absdir "*) ;; - *) temp_rpath="$temp_rpath $dir" ;; - esac - fi - fi fi # $linkmode,$pass = prog,link... @@ -1770,8 +2410,49 @@ continue fi - + fi + + link_static=no # Whether the deplib will be linked statically + if test -n "$library_names" && + { test "$prefer_static_libs" = no || test -z "$old_library"; }; then if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" need_relink=yes + fi + # This is a shared library + + # Warn about portability, can't link against -module's on + # some systems (darwin) + if test "$shouldnotlink" = yes && test "$pass" = link ; then + $echo + if test "$linkmode" = prog; then + $echo "*** Warning: Linking the executable $output against the loadable module" + else + $echo "*** Warning: Linking the shared library $output against the loadable module" + fi + $echo "*** $linklib is not portable!" + fi + if test "$linkmode" = lib && + test "$hardcode_into_libs" = yes; then + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) compile_rpath="$compile_rpath $absdir" + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" + esac + ;; + esac fi @@ -1788,5 +2469,5 @@ # bleh windows case $host in - *cygwin*) + *cygwin* | mingw*) major=`expr $current - $age` versuffix="-$major" @@ -1800,6 +2481,6 @@ # Make a new name for the extract_expsyms_cmds to use soroot="$soname" - soname=`echo $soroot | ${SED} -e 's/^.*\///'` - newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" + soname=`$echo $soroot | ${SED} -e 's/^.*\///'` + newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" # If the library has no export list, then create one now @@ -1808,7 +2489,8 @@ $show "extracting exported symbol list from \`$soname'" save_ifs="$IFS"; IFS='~' - eval cmds=\"$extract_expsyms_cmds\" + cmds=$extract_expsyms_cmds for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? @@ -1821,7 +2503,8 @@ $show "generating import library for \`$soname'" save_ifs="$IFS"; IFS='~' - eval cmds=\"$old_archive_from_expsyms_cmds\" + cmds=$old_archive_from_expsyms_cmds for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? @@ -1832,7 +2515,7 @@ dir=$output_objdir linklib=$newlib - fi # test -n $old_archive_from_expsyms_cmds - - if test $linkmode = prog || test "$mode" != relink; then + fi # test -n "$old_archive_from_expsyms_cmds" + + if test "$linkmode" = prog || test "$mode" != relink; then add_shlibpath= add_dir= @@ -1843,4 +2526,20 @@ if test "$hardcode_direct" = no; then add="$dir/$linklib" + case $host in + *-*-sco3.2v5* ) add_dir="-L$dir" ;; + *-*-darwin* ) + # if the lib is a module then we can not link against + # it, someone is ignoring the new warnings I added + if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then + $echo "** Warning, lib $linklib is a module, not a shared library" + if test -z "$old_library" ; then + $echo + $echo "** And there doesn't seem to be a static archive available" + $echo "** The link will probably fail, sorry" + else + add="$dir/$old_library" + fi + fi + esac elif test "$hardcode_minus_L" = no; then case $host in @@ -1861,4 +2560,12 @@ elif test "$hardcode_minus_L" = yes; then add_dir="-L$dir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case "$libdir" in + [\\/]*) + add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; + esac + fi add="-l$name" elif test "$hardcode_shlibpath_var" = yes; then @@ -1874,5 +2581,5 @@ if test "$lib_linked" != yes; then $echo "$modename: configuration error: unsupported hardcode properties" - exit 1 + exit $EXIT_FAILURE fi @@ -1883,5 +2590,5 @@ esac fi - if test $linkmode = prog; then + if test "$linkmode" = prog; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" @@ -1900,5 +2607,5 @@ fi - if test $linkmode = prog || test "$mode" = relink; then + if test "$linkmode" = prog || test "$mode" = relink; then add_shlibpath= add_dir= @@ -1908,14 +2615,5 @@ add="$libdir/$linklib" elif test "$hardcode_minus_L" = yes; then - # Try looking first in the location we're being installed to. - add_dir= - if test -n "$inst_prefix_dir"; then - case "$libdir" in - [\\/]*) - add_dir="-L$inst_prefix_dir$libdir" - ;; - esac - fi - add_dir="$add_dir -L$libdir" + add_dir="-L$libdir" add="-l$name" elif test "$hardcode_shlibpath_var" = yes; then @@ -1925,20 +2623,26 @@ esac add="-l$name" + elif test "$hardcode_automatic" = yes; then + if test -n "$inst_prefix_dir" && + test -f "$inst_prefix_dir$libdir/$linklib" ; then + add="$inst_prefix_dir$libdir/$linklib" + else + add="$libdir/$linklib" + fi else # We cannot seem to hardcode it, guess we'll fake it. + add_dir="-L$libdir" # Try looking first in the location we're being installed to. - add_dir= if test -n "$inst_prefix_dir"; then case "$libdir" in - [\\/]*) - add_dir="-L$inst_prefix_dir$libdir" - ;; + [\\/]*) + add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; esac fi - add_dir="$add_dir -L$libdir" add="-l$name" fi - if test $linkmode = prog; then + if test "$linkmode" = prog; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" @@ -1948,14 +2652,5 @@ fi fi - elif test $linkmode = prog; then - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - - # Try to link the static library + elif test "$linkmode" = prog; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and @@ -1977,19 +2672,19 @@ # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. - echo - echo "*** Warning: This system can not link to static lib archive $lib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." + $echo + $echo "*** Warning: This system can not link to static lib archive $lib." + $echo "*** I have the capability to make that library automatically link in when" + $echo "*** you link to this library. But I can only do this if you have a" + $echo "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then - echo "*** But as you try to build a module library, libtool will still create " - echo "*** a static module, that should work as long as the dlopening application" - echo "*** is linked with the -dlopen flag to resolve symbols at runtime." + $echo "*** But as you try to build a module library, libtool will still create " + $echo "*** a static module, that should work as long as the dlopening application" + $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + $echo + $echo "*** However, this would only work if libtool was able to extract symbol" + $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + $echo "*** not find such a program. So, this module is probably useless." + $echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then @@ -2008,8 +2703,9 @@ fi # link shared/static library? - if test $linkmode = lib; then + if test "$linkmode" = lib; then if test -n "$dependency_libs" && - { test $hardcode_into_libs != yes || test $build_old_libs = yes || - test $link_static = yes; }; then + { test "$hardcode_into_libs" != yes || + test "$build_old_libs" = yes || + test "$link_static" = yes; }; then # Extract -R from dependency_libs temp_deplibs= @@ -2042,5 +2738,5 @@ done - if test $link_all_deplibs != no; then + if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do @@ -2062,18 +2758,63 @@ esac if grep "^installed=no" $deplib > /dev/null; then - path="-L$absdir/$objdir" + path="$absdir/$objdir" else eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit 1 + exit $EXIT_FAILURE fi if test "$absdir" != "$libdir"; then $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 fi - path="-L$absdir" + path="$absdir" fi + depdepl= + case $host in + *-*-darwin*) + # we do not want to link against static libs, + # but need to link against shared + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done + if test -f "$path/$depdepl" ; then + depdepl="$path/$depdepl" + fi + # do not add paths which are already there + case " $newlib_search_path " in + *" $path "*) ;; + *) newlib_search_path="$newlib_search_path $path";; + esac + fi + path="" + ;; + *) + path="-L$path" + ;; + esac + ;; + -l*) + case $host in + *-*-darwin*) + # Again, we only want to link against shared libraries + eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` + for tmp in $newlib_search_path ; do + if test -f "$tmp/lib$tmp_libs.dylib" ; then + eval depdepl="$tmp/lib$tmp_libs.dylib" + break + fi + done + path="" + ;; + *) continue ;; + esac ;; *) continue ;; + esac + case " $deplibs " in + *" $depdepl "*) ;; + *) deplibs="$depdepl $deplibs" ;; esac case " $deplibs " in @@ -2085,5 +2826,6 @@ fi # linkmode = lib done # for deplib in $libs - if test $pass = dlpreopen; then + dependency_libs="$newdependency_libs" + if test "$pass" = dlpreopen; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do @@ -2091,7 +2833,6 @@ done fi - if test $pass != dlopen; then - test $pass != scan && dependency_libs="$newdependency_libs" - if test $pass != conv; then + if test "$pass" != dlopen; then + if test "$pass" != conv; then # Make sure lib_search_path contains only unique directories. lib_search_path= @@ -2115,7 +2856,28 @@ new_libs= for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so + # that some nasty dependency loop isn't accidentally + # broken: + #new_libs="$deplib $new_libs" + # Pragmatically, this seems to cause very few problems in + # practice: case $deplib in -L*) new_libs="$deplib $new_libs" ;; + -R*) ;; *) + # And here is the reason: when a library appears more + # than once as an explicit dependence of a library, or + # is implicitly linked in more than once by the + # compiler, it is considered special, and multiple + # occurrences thereof are not removed. Compare this + # with having the same library being listed as a + # dependency of multiple other libraries: in this case, + # we know (pedantically, we assume) the library does not + # need to be listed more than once, so we keep only the + # last copy. This is not always right, but it is rare + # enough that we require users that really mean to play + # such unportable linking tricks to link the library + # using -Wl,-lname, so that libtool does not consider it + # for duplicate removal. case " $specialdeplibs " in *" $deplib "*) new_libs="$deplib $new_libs" ;; @@ -2145,11 +2907,20 @@ done # for var fi - if test "$pass" = "conv" && - { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then - libs="$deplibs" # reset libs - deplibs= - fi + # Last step: remove runtime libs from dependency_libs + # (they stay in deplibs) + tmp_libs= + for i in $dependency_libs ; do + case " $predeps $postdeps $compiler_lib_search_path " in + *" $i "*) + i="" + ;; + esac + if test -n "$i" ; then + tmp_libs="$tmp_libs $i" + fi + done + dependency_libs=$tmp_libs done # for pass - if test $linkmode = prog; then + if test "$linkmode" = prog; then dlfiles="$newdlfiles" dlprefiles="$newdlprefiles" @@ -2158,4 +2929,8 @@ case $linkmode in oldlib) + if test -n "$deplibs"; then + $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 + fi + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 @@ -2171,5 +2946,5 @@ if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2 + $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 fi @@ -2193,4 +2968,5 @@ lib*) name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` + eval shared_ext=\"$shrext_cmds\" eval libname=\"$libname_spec\" ;; @@ -2199,9 +2975,10 @@ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi if test "$need_lib_prefix" != no; then # Add the "lib" prefix for modules if required name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` + eval shared_ext=\"$shrext_cmds\" eval libname=\"$libname_spec\" else @@ -2214,9 +2991,9 @@ if test "$deplibs_check_method" != pass_all; then $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 - exit 1 + exit $EXIT_FAILURE else - echo - echo "*** Warning: Linking the shared library $output against the non-libtool" - echo "*** objects $objs is not portable!" + $echo + $echo "*** Warning: Linking the shared library $output against the non-libtool" + $echo "*** objects $objs is not portable!" libobjs="$libobjs $objs" fi @@ -2228,5 +3005,5 @@ set dummy $rpath - if test $# -gt 2; then + if test "$#" -gt 2; then $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 fi @@ -2237,5 +3014,7 @@ if test "$build_libtool_libs" = yes; then # Building a libtool convenience library. - libext=al + # Some compilers have problems with a `.al' extension so + # convenience libraries should have the same extension an + # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" build_libtool_libs=convenience @@ -2244,5 +3023,5 @@ if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2 + $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 fi @@ -2260,43 +3039,80 @@ $echo "$modename: too many parameters to \`-version-info'" 1>&2 $echo "$help" 1>&2 - exit 1 - fi - - current="$2" - revision="$3" - age="$4" + exit $EXIT_FAILURE + fi + + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts + # to make the code below a bit more comprehensible + + case $vinfo_number in + yes) + number_major="$2" + number_minor="$3" + number_revision="$4" + # + # There are really only two kinds -- those that + # use the current revision as the major version + # and those that subtract age and use age as + # a minor version. But, then there is irix + # which has an extra 1 added just for fun + # + case $version_type in + darwin|linux|osf|windows) + current=`expr $number_major + $number_minor` + age="$number_minor" + revision="$number_revision" + ;; + freebsd-aout|freebsd-elf|sunos) + current="$number_major" + revision="$number_minor" + age="0" + ;; + irix|nonstopux) + current=`expr $number_major + $number_minor - 1` + age="$number_minor" + revision="$number_minor" + ;; + esac + ;; + no) + current="$2" + revision="$3" + age="$4" + ;; + esac # Check that each of the things are valid numbers. case $current in - [0-9]*) ;; + 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac case $revision in - [0-9]*) ;; + 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac case $age in - [0-9]*) ;; + 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac - if test $age -gt $current; then + if test "$age" -gt "$current"; then $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 + exit $EXIT_FAILURE fi @@ -2315,5 +3131,5 @@ # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" ;; @@ -2339,5 +3155,5 @@ # Add in all the interfaces that we are compatible with. loop=$revision - while test $loop != 0; do + while test "$loop" -ne 0; do iface=`expr $revision - $loop` loop=`expr $loop - 1` @@ -2362,5 +3178,5 @@ # Add in all the interfaces that we are compatible with. loop=$age - while test $loop != 0; do + while test "$loop" -ne 0; do iface=`expr $current - $loop` loop=`expr $loop - 1` @@ -2386,6 +3202,6 @@ *) $echo "$modename: unknown library version type \`$version_type'" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 + exit $EXIT_FAILURE ;; esac @@ -2394,10 +3210,9 @@ if test -z "$vinfo" && test -n "$release"; then major= - verstring="0.0" case $version_type in darwin) # we can't check for "0.0" in archive_cmds due to quoting # problems, so we reset it completely - verstring="" + verstring= ;; *) @@ -2433,7 +3248,28 @@ if test "$mode" != relink; then - # Remove our outputs. - $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" - $run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.* + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= + tempremovelist=`$echo "$output_objdir/*"` + for p in $tempremovelist; do + case $p in + *.$objext) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) + if test "X$precious_files_regex" != "X"; then + if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 + then + continue + fi + fi + removelist="$removelist $p" + ;; + *) ;; + esac + done + if test -n "$removelist"; then + $show "${rm}r $removelist" + $run ${rm}r $removelist + fi fi @@ -2448,7 +3284,7 @@ # Eliminate all temporary directories. for path in $notinst_path; do - lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'` - deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'` - dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` + lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` + deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` done @@ -2463,5 +3299,5 @@ esac done - if test $hardcode_into_libs != yes || test $build_old_libs = yes; then + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then dependency_libs="$temp_xrpath $dependency_libs" fi @@ -2503,8 +3339,9 @@ *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue ;; - *) + *) # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then + if test "$build_libtool_need_lc" = "yes"; then deplibs="$deplibs -lc" fi @@ -2533,5 +3370,5 @@ # whether the library exists or not. But this is on # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behaviour. + # implementing what was already the behavior. newdeplibs=$deplibs ;; @@ -2546,43 +3383,20 @@ EOF $rm conftest - $CC -o conftest conftest.c $deplibs - if test $? -eq 0 ; then + $LTCC -o conftest conftest.c $deplibs + if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do name="`expr $i : '-l\(.*\)'`" # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - libname=`eval \\$echo \"$libname_spec\"` - deplib_matches=`eval \\$echo \"$library_names_spec\"` - set dummy $deplib_matches - deplib_match=$2 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs="$newdeplibs $i" - else - droppeddeps=yes - echo - echo "*** Warning: dynamic linker does not accept needed library $i." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which I believe you do not have" - echo "*** because a test_compile did reveal that the linker did not use it for" - echo "*** its dynamic dependency list that programs get resolved with at runtime." - fi - else - newdeplibs="$newdeplibs $i" - fi - done - else - # Error occured in the first compile. Let's try to salvage - # the situation: Compile a separate program for each library. - for i in $deplibs; do - name="`expr $i : '-l\(.*\)'`" - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - $rm conftest - $CC -o conftest conftest.c $i - # Did it work? - if test $? -eq 0 ; then - ldd_output=`ldd conftest` + if test "$name" != "" && test "$name" -ne "0"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) + newdeplibs="$newdeplibs $i" + i="" + ;; + esac + fi + if test -n "$i" ; then libname=`eval \\$echo \"$libname_spec\"` deplib_matches=`eval \\$echo \"$library_names_spec\"` @@ -2593,19 +3407,62 @@ else droppeddeps=yes - echo - echo "*** Warning: dynamic linker does not accept needed library $i." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because a test_compile did reveal that the linker did not use this one" - echo "*** as a dynamic dependency that programs can get resolved with at runtime." + $echo + $echo "*** Warning: dynamic linker does not accept needed library $i." + $echo "*** I have the capability to make that library automatically link in when" + $echo "*** you link to this library. But I can only do this if you have a" + $echo "*** shared version of the library, which I believe you do not have" + $echo "*** because a test_compile did reveal that the linker did not use it for" + $echo "*** its dynamic dependency list that programs get resolved with at runtime." + fi + fi + else + newdeplibs="$newdeplibs $i" + fi + done + else + # Error occurred in the first compile. Let's try to salvage + # the situation: Compile a separate program for each library. + for i in $deplibs; do + name="`expr $i : '-l\(.*\)'`" + # If $name is empty we are operating on a -L argument. + if test "$name" != "" && test "$name" != "0"; then + $rm conftest + $LTCC -o conftest conftest.c $i + # Did it work? + if test "$?" -eq 0 ; then + ldd_output=`ldd conftest` + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) + newdeplibs="$newdeplibs $i" + i="" + ;; + esac + fi + if test -n "$i" ; then + libname=`eval \\$echo \"$libname_spec\"` + deplib_matches=`eval \\$echo \"$library_names_spec\"` + set dummy $deplib_matches + deplib_match=$2 + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + newdeplibs="$newdeplibs $i" + else + droppeddeps=yes + $echo + $echo "*** Warning: dynamic linker does not accept needed library $i." + $echo "*** I have the capability to make that library automatically link in when" + $echo "*** you link to this library. But I can only do this if you have a" + $echo "*** shared version of the library, which you do not appear to have" + $echo "*** because a test_compile did reveal that the linker did not use this one" + $echo "*** as a dynamic dependency that programs can get resolved with at runtime." + fi fi else droppeddeps=yes - echo - echo "*** Warning! Library $i is needed by this library but I was not able to" - echo "*** make it link in! You will probably need to install it or some" - echo "*** library that it depends on before this library will be fully" - echo "*** functional. Installing it before continuing would be even better." + $echo + $echo "*** Warning! Library $i is needed by this library but I was not able to" + $echo "*** make it link in! You will probably need to install it or some" + $echo "*** library that it depends on before this library will be fully" + $echo "*** functional. Installing it before continuing would be even better." fi else @@ -2621,9 +3478,18 @@ name="`expr $a_deplib : '-l\(.*\)'`" # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do + if test "$name" != "" && test "$name" != "0"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then + libname=`eval \\$echo \"$libname_spec\"` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do # Follow soft links. if ls -lLd "$potent_lib" 2>/dev/null \ @@ -2646,24 +3512,25 @@ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ | ${SED} 10q \ - | egrep "$file_magic_regex" > /dev/null; then + | $EGREP "$file_magic_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" break 2 fi - done - done + done + done + fi if test -n "$a_deplib" ; then droppeddeps=yes - echo - echo "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" + $echo + $echo "*** Warning: linker path does not have real file for library $a_deplib." + $echo "*** I have the capability to make that library automatically link in when" + $echo "*** you link to this library. But I can only do this if you have a" + $echo "*** shared version of the library, which you do not appear to have" + $echo "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then - echo "*** with $libname but no candidates were found. (...for file magic test)" + $echo "*** with $libname but no candidates were found. (...for file magic test)" else - echo "*** with $libname and none of the candidates passed a file format test" - echo "*** using a file magic. Last file checked: $potlib" + $echo "*** with $libname and none of the candidates passed a file format test" + $echo "*** using a file magic. Last file checked: $potlib" fi fi @@ -2681,31 +3548,41 @@ # If $name is empty we are operating on a -L argument. if test -n "$name" && test "$name" != "0"; then - libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check below in file_magic test - if eval echo \"$potent_lib\" 2>/dev/null \ - | ${SED} 10q \ - | egrep "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then + libname=`eval \\$echo \"$libname_spec\"` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib="$potent_lib" # see symlink-check above in file_magic test + if eval $echo \"$potent_lib\" 2>/dev/null \ + | ${SED} 10q \ + | $EGREP "$match_pattern_regex" > /dev/null; then + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + break 2 + fi + done done - done + fi if test -n "$a_deplib" ; then droppeddeps=yes - echo - echo "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" + $echo + $echo "*** Warning: linker path does not have real file for library $a_deplib." + $echo "*** I have the capability to make that library automatically link in when" + $echo "*** you link to this library. But I can only do this if you have a" + $echo "*** shared version of the library, which you do not appear to have" + $echo "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then - echo "*** with $libname but no candidates were found. (...for regex pattern test)" + $echo "*** with $libname but no candidates were found. (...for regex pattern test)" else - echo "*** with $libname and none of the candidates passed a file format test" - echo "*** using a regex pattern. Last file checked: $potlib" + $echo "*** with $libname and none of the candidates passed a file format test" + $echo "*** using a regex pattern. Last file checked: $potlib" fi fi @@ -2718,14 +3595,21 @@ none | unknown | *) newdeplibs="" - if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ - -e 's/ -[LR][^ ]*//g' -e 's/[ ]//g' | - grep . >/dev/null; then - echo + tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ + -e 's/ -[LR][^ ]*//g'` + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + for i in $predeps $postdeps ; do + # can't use Xsed below, because $i might contain '/' + tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` + done + fi + if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ + | grep . >/dev/null; then + $echo if test "X$deplibs_check_method" = "Xnone"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." + $echo "*** Warning: inter-library dependencies are not supported in this platform." else - echo "*** Warning: inter-library dependencies are not known to be supported." + $echo "*** Warning: inter-library dependencies are not known to be supported." fi - echo "*** All declared inter-library dependencies are being dropped." + $echo "*** All declared inter-library dependencies are being dropped." droppeddeps=yes fi @@ -2747,15 +3631,15 @@ if test "$droppeddeps" = yes; then if test "$module" = yes; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" - echo "*** dependencies of module $libname. Therefore, libtool will create" - echo "*** a static module, that should work as long as the dlopening" - echo "*** application is linked with the -dlopen flag." + $echo + $echo "*** Warning: libtool could not satisfy all declared inter-library" + $echo "*** dependencies of module $libname. Therefore, libtool will create" + $echo "*** a static module, that should work as long as the dlopening" + $echo "*** application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + $echo + $echo "*** However, this would only work if libtool was able to extract symbol" + $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + $echo "*** not find such a program. So, this module is probably useless." + $echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then @@ -2767,14 +3651,14 @@ fi else - echo "*** The inter-library dependencies that have been dropped here will be" - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." - - if test $allow_undefined = no; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." + $echo "*** The inter-library dependencies that have been dropped here will be" + $echo "*** automatically added whenever a program is linked with this library" + $echo "*** or is declared to -dlopen it." + + if test "$allow_undefined" = no; then + $echo + $echo "*** Since this library must not contain undefined symbols," + $echo "*** because either the platform does not support them or" + $echo "*** it was explicitly requested with -no-undefined," + $echo "*** libtool will only create a static version of it." if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" @@ -2798,5 +3682,5 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then - if test $hardcode_into_libs = yes; then + if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -2834,5 +3718,9 @@ test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - eval dep_rpath=\"$hardcode_libdir_flag_spec\" + if test -n "$hardcode_libdir_flag_spec_ld"; then + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else + eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -2854,4 +3742,5 @@ # Get the real and link names of the library. + eval shared_ext=\"$shrext_cmds\" eval library_names=\"$library_names_spec\" set dummy $library_names @@ -2864,5 +3753,7 @@ soname="$realname" fi - test -z "$dlname" && dlname=$soname + if test -z "$dlname"; then + dlname=$soname + fi lib="$output_objdir/$realname" @@ -2870,21 +3761,4 @@ do linknames="$linknames $link" - done - - # Ensure that we have .o objects for linkers which dislike .lo - # (e.g. aix) in case we are running --disable-static - for obj in $libobjs; do - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then - xdir="." - else - xdir="$xdir" - fi - baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` - if test ! -f $xdir/$oldobj; then - $show "(cd $xdir && ${LN_S} $baseobj $oldobj)" - $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $? - fi done @@ -2898,15 +3772,24 @@ export_symbols="$output_objdir/$libname.exp" $run $rm $export_symbols - eval cmds=\"$export_symbols_cmds\" + cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? + eval cmd=\"$cmd\" + if len=`expr "X$cmd" : ".*"` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then + $show "$cmd" + $run eval "$cmd" || exit $? + skipped_export=false + else + # The command line is too long to execute in one step. + $show "using reloadable object file for export list..." + skipped_export=: + fi done IFS="$save_ifs" if test -n "$export_symbols_regex"; then - $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" - $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" + $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' $show "$mv \"${export_symbols}T\" \"$export_symbols\"" $run eval '$mv "${export_symbols}T" "$export_symbols"' @@ -2919,44 +3802,28 @@ fi + tmp_deplibs= + for test_deplib in $deplibs; do + case " $convenience " in + *" $test_deplib "*) ;; + *) + tmp_deplibs="$tmp_deplibs $test_deplib" + ;; + esac + done + deplibs="$tmp_deplibs" + if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs eval libobjs=\"\$libobjs $whole_archive_flag_spec\" else gentop="$output_objdir/${outputname}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "mkdir $gentop" - $run mkdir "$gentop" - status=$? - if test $status -ne 0 && test ! -d "$gentop"; then - exit $status - fi generated="$generated $gentop" - for xlib in $convenience; do - # Extract the objects. - case $xlib in - [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; - *) xabs=`pwd`"/$xlib" ;; - esac - xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` - xdir="$gentop/$xlib" - - $show "${rm}r $xdir" - $run ${rm}r "$xdir" - $show "mkdir $xdir" - $run mkdir "$xdir" - status=$? - if test $status -ne 0 && test ! -d "$xdir"; then - exit $status - fi - $show "(cd $xdir && $AR x $xabs)" - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - - libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` - done - fi - fi - + func_extract_archives $gentop $convenience + libobjs="$libobjs $func_extract_archives_result" + fi + fi + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" @@ -2970,23 +3837,145 @@ # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else + eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi + else if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval cmds=\"$archive_expsym_cmds\" + eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds else - save_deplibs="$deplibs" - for conv in $convenience; do - tmp_deplibs= - for test_deplib in $deplibs; do - if test "$test_deplib" != "$conv"; then - tmp_deplibs="$tmp_deplibs $test_deplib" + eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi + fi + + if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else + # The command line is too long to link in one step, link piecewise. + $echo "creating reloadable object files..." + + # Save the value of $output and $libobjs because we want to + # use them later. If we have whole_archive_flag_spec, we + # want to use save_libobjs as it was before + # whole_archive_flag_spec was expanded, because we can't + # assume the linker understands whole_archive_flag_spec. + # This may have to be revisited, in case too many + # convenience libraries get linked in and end up exceeding + # the spec. + if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + fi + save_output=$output + + # Clear the reloadable object creation command queue and + # initialize k to one. + test_cmds= + concat_cmds= + objlist= + delfiles= + last_robj= + k=1 + output=$output_objdir/$save_output-${k}.$objext + # Loop over the list of objects to be linked. + for obj in $save_libobjs + do + eval test_cmds=\"$reload_cmds $objlist $last_robj\" + if test "X$objlist" = X || + { len=`expr "X$test_cmds" : ".*"` && + test "$len" -le "$max_cmd_len"; }; then + objlist="$objlist $obj" + else + # The command $test_cmds is almost too long, add a + # command to the queue. + if test "$k" -eq 1 ; then + # The first file doesn't have a previous command to add. + eval concat_cmds=\"$reload_cmds $objlist $last_robj\" + else + # All subsequent reloadable object files will link in + # the last one created. + eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" fi - done - deplibs="$tmp_deplibs" + last_robj=$output_objdir/$save_output-${k}.$objext + k=`expr $k + 1` + output=$output_objdir/$save_output-${k}.$objext + objlist=$obj + len=1 + fi done - eval cmds=\"$archive_cmds\" - deplibs="$save_deplibs" + # Handle the remaining objects by creating one last + # reloadable object file. All subsequent reloadable object + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" + + if ${skipped_export-false}; then + $show "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $run $rm $export_symbols + libobjs=$output + # Append the command to create the export file. + eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" + fi + + # Set up a command to remove the reloadale object files + # after they are used. + i=0 + while test "$i" -lt "$k" + do + i=`expr $i + 1` + delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" + done + + $echo "creating a temporary reloadable object file: $output" + + # Loop through the commands generated above and execute them. + save_ifs="$IFS"; IFS='~' + for cmd in $concat_cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + + libobjs=$output + # Restore the value of output. + output=$save_output + + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + fi + # Expand the library linking commands again to reset the + # value of $libobjs for piecewise linking. + + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + cmds=$module_expsym_cmds + else + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + cmds=$archive_expsym_cmds + else + cmds=$archive_cmds + fi + fi + + # Append the command to remove the reloadable object files + # to the just-reset $cmds. + eval cmds=\"\$cmds~\$rm $delfiles\" fi save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? @@ -2997,5 +3986,5 @@ if test "$mode" = relink; then $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? - exit 0 + exit $EXIT_SUCCESS fi @@ -3045,5 +4034,5 @@ if test -n "$objs$old_deplibs"; then $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit 1 + exit $EXIT_FAILURE fi libobj="$output" @@ -3074,36 +4063,8 @@ else gentop="$output_objdir/${obj}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "mkdir $gentop" - $run mkdir "$gentop" - status=$? - if test $status -ne 0 && test ! -d "$gentop"; then - exit $status - fi generated="$generated $gentop" - for xlib in $convenience; do - # Extract the objects. - case $xlib in - [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; - *) xabs=`pwd`"/$xlib" ;; - esac - xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` - xdir="$gentop/$xlib" - - $show "${rm}r $xdir" - $run ${rm}r "$xdir" - $show "mkdir $xdir" - $run mkdir "$xdir" - status=$? - if test $status -ne 0 && test ! -d "$xdir"; then - exit $status - fi - $show "(cd $xdir && $AR x $xabs)" - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - - reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` - done + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi @@ -3113,8 +4074,9 @@ output="$obj" - eval cmds=\"$reload_cmds\" + cmds=$reload_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? @@ -3129,5 +4091,5 @@ fi - exit 0 + exit $EXIT_SUCCESS fi @@ -3140,7 +4102,7 @@ # Create an invalid libtool object if no PIC, so that we don't # accidentally link it into a program. - $show "echo timestamp > $libobj" - $run eval "echo timestamp > $libobj" || exit $? - exit 0 + # $show "echo timestamp > $libobj" + # $run eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS fi @@ -3149,26 +4111,13 @@ reload_objs="$libobjs $reload_conv_objs" output="$libobj" - eval cmds=\"$reload_cmds\" + cmds=$reload_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? done IFS="$save_ifs" - else - # Just create a symlink. - $show $rm $libobj - $run $rm $libobj - xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$libobj"; then - xdir="." - else - xdir="$xdir" - fi - baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` - oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` - $show "(cd $xdir && $LN_S $oldobj $baseobj)" - $run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $? fi @@ -3178,10 +4127,10 @@ fi - exit 0 + exit $EXIT_SUCCESS ;; prog) case $host in - *cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; + *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; esac if test -n "$vinfo"; then @@ -3205,12 +4154,15 @@ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - case $host in - *darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" - ;; - esac - ;; + ;; + esac + + case $host in + *darwin*) + # Don't allow lazy linking, it breaks C++ global constructors + if test "$tagname" = CXX ; then + compile_command="$compile_command ${wl}-bind_at_load" + finalize_command="$finalize_command ${wl}-bind_at_load" + fi + ;; esac @@ -3365,10 +4317,10 @@ if test -n "$exclude_expsyms"; then - $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' + $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' $run eval '$mv "$nlist"T "$nlist"' fi if test -n "$export_symbols_regex"; then - $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T' + $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' $run eval '$mv "$nlist"T "$nlist"' fi @@ -3388,6 +4340,6 @@ for arg in $dlprefiles; do $show "extracting global C symbols from \`$arg'" - name=`echo "$arg" | ${SED} -e 's%^.*/%%'` - $run eval 'echo ": $name " >> "$nlist"' + name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` + $run eval '$echo ": $name " >> "$nlist"' $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" done @@ -3398,5 +4350,5 @@ if test -n "$exclude_expsyms"; then - egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T + $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T $mv "$nlist"T "$nlist" fi @@ -3418,5 +4370,5 @@ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' else - echo '/* NONE */' >> "$output_objdir/$dlsyms" + $echo '/* NONE */' >> "$output_objdir/$dlsyms" fi @@ -3470,16 +4422,16 @@ case "$compile_command " in *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; + *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; esac;; *-*-hpux*) case "$compile_command " in *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DPIC";; + *) pic_flag_for_symtable=" $pic_flag";; esac esac # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. @@ -3493,5 +4445,5 @@ *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -3506,5 +4458,5 @@ fi - if test $need_relink = no || test "$build_libtool_libs" != yes; then + if test "$need_relink" = no || test "$build_libtool_libs" != yes; then # Replace the output file specification. compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` @@ -3581,5 +4533,5 @@ $show "$link_command" $run eval "$link_command" || exit $? - exit 0 + exit $EXIT_SUCCESS fi @@ -3636,8 +4588,8 @@ # Quote $echo for shipping. - if test "X$echo" = "X$SHELL $0 --fallback-echo"; then - case $0 in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; - *) qecho="$SHELL `pwd`/$0 --fallback-echo";; + if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then + case $progpath in + [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; + *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; esac qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` @@ -3651,13 +4603,228 @@ # a .exe suffix, so we strip it off here. case $output in - *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;; + *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; esac # test for cygwin because mv fails w/o .exe extensions case $host in - *cygwin*) exeext=.exe ;; + *cygwin*) + exeext=.exe + outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; *) exeext= ;; esac + case $host in + *cygwin* | *mingw* ) + cwrappersource=`$echo ${objdir}/lt-${output}.c` + cwrapper=`$echo ${output}.exe` + $rm $cwrappersource $cwrapper + trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + + cat > $cwrappersource <> $cwrappersource<<"EOF" +#include +#include +#include +#include +#include +#include + +#if defined(PATH_MAX) +# define LT_PATHMAX PATH_MAX +#elif defined(MAXPATHLEN) +# define LT_PATHMAX MAXPATHLEN +#else +# define LT_PATHMAX 1024 +#endif + +#ifndef DIR_SEPARATOR +#define DIR_SEPARATOR '/' +#endif + +#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ + defined (__OS2__) +#define HAVE_DOS_BASED_FILE_SYSTEM +#ifndef DIR_SEPARATOR_2 +#define DIR_SEPARATOR_2 '\\' +#endif +#endif + +#ifndef DIR_SEPARATOR_2 +# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +#else /* DIR_SEPARATOR_2 */ +# define IS_DIR_SEPARATOR(ch) \ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +#endif /* DIR_SEPARATOR_2 */ + +#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) +#define XFREE(stale) do { \ + if (stale) { free ((void *) stale); stale = 0; } \ +} while (0) + +const char *program_name = NULL; + +void * xmalloc (size_t num); +char * xstrdup (const char *string); +char * basename (const char *name); +char * fnqualify(const char *path); +char * strendzap(char *str, const char *pat); +void lt_fatal (const char *message, ...); + +int +main (int argc, char *argv[]) +{ + char **newargz; + int i; + + program_name = (char *) xstrdup ((char *) basename (argv[0])); + newargz = XMALLOC(char *, argc+2); +EOF + + cat >> $cwrappersource <> $cwrappersource <<"EOF" + newargz[1] = fnqualify(argv[0]); + /* we know the script has the same name, without the .exe */ + /* so make sure newargz[1] doesn't end in .exe */ + strendzap(newargz[1],".exe"); + for (i = 1; i < argc; i++) + newargz[i+1] = xstrdup(argv[i]); + newargz[argc+1] = NULL; +EOF + + cat >> $cwrappersource <> $cwrappersource <<"EOF" +} + +void * +xmalloc (size_t num) +{ + void * p = (void *) malloc (num); + if (!p) + lt_fatal ("Memory exhausted"); + + return p; +} + +char * +xstrdup (const char *string) +{ + return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL +; +} + +char * +basename (const char *name) +{ + const char *base; + +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + /* Skip over the disk name in MSDOS pathnames. */ + if (isalpha (name[0]) && name[1] == ':') + name += 2; +#endif + + for (base = name; *name; name++) + if (IS_DIR_SEPARATOR (*name)) + base = name + 1; + return (char *) base; +} + +char * +fnqualify(const char *path) +{ + size_t size; + char *p; + char tmp[LT_PATHMAX + 1]; + + assert(path != NULL); + + /* Is it qualified already? */ +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + if (isalpha (path[0]) && path[1] == ':') + return xstrdup (path); +#endif + if (IS_DIR_SEPARATOR (path[0])) + return xstrdup (path); + + /* prepend the current directory */ + /* doesn't handle '~' */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); + size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ + p = XMALLOC(char, size); + sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); + return p; +} + +char * +strendzap(char *str, const char *pat) +{ + size_t len, patlen; + + assert(str != NULL); + assert(pat != NULL); + + len = strlen(str); + patlen = strlen(pat); + + if (patlen <= len) + { + str += len - patlen; + if (strcmp(str, pat) == 0) + *str = '\0'; + } + return str; +} + +static void +lt_error_core (int exit_status, const char * mode, + const char * message, va_list ap) +{ + fprintf (stderr, "%s: %s: ", program_name, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); + + if (exit_status >= 0) + exit (exit_status); +} + +void +lt_fatal (const char *message, ...) +{ + va_list ap; + va_start (ap, message); + lt_error_core (EXIT_FAILURE, "FATAL", message, ap); + va_end (ap); +} +EOF + # we should really use a build-platform specific compiler + # here, but OTOH, the wrappers (shell script and this C one) + # are only useful if you want to execute the "real" binary. + # Since the "real" binary is built for $host, then this + # wrapper might as well be built for $host, too. + $run $LTCC -s -o $cwrapper $cwrappersource + ;; + esac $rm $output - trap "$rm $output; exit 1" 1 2 15 + trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 $echo > $output "\ @@ -3675,10 +4842,10 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' +Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH relink_command=\"$relink_command\" @@ -3735,5 +4902,5 @@ if test "$fast_install" = yes; then - echo >> $output "\ + $echo >> $output "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" @@ -3751,5 +4918,5 @@ fi" - echo >> $output "\ + $echo >> $output "\ # relink executable if necessary @@ -3759,5 +4926,5 @@ $echo \"\$relink_command_output\" >&2 $rm \"\$progdir/\$file\" - exit 1 + exit $EXIT_FAILURE fi fi @@ -3769,5 +4936,5 @@ fi" else - echo >> $output "\ + $echo >> $output "\ program='$outputname' progdir=\"\$thisdir/$objdir\" @@ -3775,5 +4942,5 @@ fi - echo >> $output "\ + $echo >> $output "\ if test -f \"\$progdir/\$program\"; then" @@ -3786,5 +4953,5 @@ # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 ${SED} + # The second colon is a workaround for a bug in BeOS R4 sed $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` @@ -3806,12 +4973,4 @@ " case $host in - # win32 systems need to use the prog path for dll - # lookup to work - *-*-cygwin* | *-*-pw32*) - $echo >> $output "\ - exec \$progdir/\$program \${1+\"\$@\"} -" - ;; - # Backslashes separate directories on plain windows *-*-mingw | *-*-os2*) @@ -3823,9 +4982,5 @@ *) $echo >> $output "\ - # Export the path to the program. - PATH=\"\$progdir:\$PATH\" - export PATH - - exec \$program \${1+\"\$@\"} + exec \$progdir/\$program \${1+\"\$@\"} " ;; @@ -3833,5 +4988,5 @@ $echo >> $output "\ \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" - exit 1 + exit $EXIT_FAILURE fi else @@ -3839,6 +4994,6 @@ \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 \$echo \"This script is just a wrapper for \$program.\" 1>&2 - echo \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 + $echo \"See the $PACKAGE documentation for more information.\" 1>&2 + exit $EXIT_FAILURE fi fi\ @@ -3846,5 +5001,5 @@ chmod +x $output fi - exit 0 + exit $EXIT_SUCCESS ;; esac @@ -3862,5 +5017,5 @@ build_libtool_libs=no else - oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP` + oldobjs="$old_deplibs $non_pic_objects" fi addlibs="$old_convenience" @@ -3869,65 +5024,77 @@ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "mkdir $gentop" - $run mkdir "$gentop" - status=$? - if test $status -ne 0 && test ! -d "$gentop"; then - exit $status - fi generated="$generated $gentop" - # Add in members from convenience archives. - for xlib in $addlibs; do - # Extract the objects. - case $xlib in - [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; - *) xabs=`pwd`"/$xlib" ;; - esac - xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` - xdir="$gentop/$xlib" - - $show "${rm}r $xdir" - $run ${rm}r "$xdir" - $show "mkdir $xdir" - $run mkdir "$xdir" - status=$? - if test $status -ne 0 && test ! -d "$xdir"; then - exit $status - fi - $show "(cd $xdir && $AR x $xabs)" - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - - oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` - done + func_extract_archives $gentop $addlibs + oldobjs="$oldobjs $func_extract_archives_result" fi # Do each command in the archive commands. if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - eval cmds=\"$old_archive_from_new_cmds\" + cmds=$old_archive_from_new_cmds else - # Ensure that we have .o objects in place in case we decided - # not to build a shared library, and have fallen back to building - # static libs even though --disable-static was passed! - for oldobj in $oldobjs; do - if test ! -f $oldobj; then - xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$oldobj"; then - xdir="." + eval cmds=\"$old_archive_cmds\" + + if len=`expr "X$cmds" : ".*"` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + $echo "using piecewise archive linking..." + save_RANLIB=$RANLIB + RANLIB=: + objlist= + concat_cmds= + save_oldobjs=$oldobjs + # GNU ar 2.10+ was changed to match POSIX; thus no paths are + # encoded into archives. This makes 'ar r' malfunction in + # this piecewise linking case whenever conflicting object + # names appear in distinct ar calls; check, warn and compensate. + if (for obj in $save_oldobjs + do + $echo "X$obj" | $Xsed -e 's%^.*/%%' + done | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2 + $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2 + AR_FLAGS=cq + fi + # Is there a better way of finding the last object in the list? + for obj in $save_oldobjs + do + last_oldobj=$obj + done + for obj in $save_oldobjs + do + oldobjs="$objlist $obj" + objlist="$objlist $obj" + eval test_cmds=\"$old_archive_cmds\" + if len=`expr "X$test_cmds" : ".*"` && + test "$len" -le "$max_cmd_len"; then + : else - xdir="$xdir" + # the above command should be used before it gets too long + oldobjs=$objlist + if test "$obj" = "$last_oldobj" ; then + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= fi - baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'` - obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` - $show "(cd $xdir && ${LN_S} $obj $baseobj)" - $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $? - fi - done - - eval cmds=\"$old_archive_cmds\" + done + RANLIB=$save_RANLIB + oldobjs=$objlist + if test "X$oldobjs" = "X" ; then + eval cmds=\"\$concat_cmds\" + else + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi fi save_ifs="$IFS"; IFS='~' for cmd in $cmds; do + eval cmd=\"$cmd\" IFS="$save_ifs" $show "$cmd" @@ -3961,6 +5128,10 @@ done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + if test "$hardcode_automatic" = yes ; then + relink_command= + fi + # Only create the output if not a dry run. @@ -3981,5 +5152,5 @@ if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit 1 + exit $EXIT_FAILURE fi newdependency_libs="$newdependency_libs $libdir/$name" @@ -3995,5 +5166,5 @@ if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit 1 + exit $EXIT_FAILURE fi newdlfiles="$newdlfiles $libdir/$name" @@ -4006,9 +5177,28 @@ if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit 1 + exit $EXIT_FAILURE fi newdlprefiles="$newdlprefiles $libdir/$name" done dlprefiles="$newdlprefiles" + else + newdlfiles= + for lib in $dlfiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + newdlfiles="$newdlfiles $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + newdlprefiles="$newdlprefiles $abs" + done + dlprefiles="$newdlprefiles" fi $rm $output @@ -4016,5 +5206,5 @@ tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; esac $echo > $output "\ @@ -4045,4 +5235,7 @@ installed=$installed +# Should we warn about portability when linking against -modules? +shouldnotlink=$module + # Files to dlopen/dlpreopen dlopen='$dlfiles' @@ -4051,5 +5244,5 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test $need_relink = yes; then + if test "$installed" = no && test "$need_relink" = yes; then $echo >> $output "\ relink_command=\"$relink_command\"" @@ -4064,5 +5257,5 @@ ;; esac - exit 0 + exit $EXIT_SUCCESS ;; @@ -4153,5 +5346,5 @@ $echo "$modename: you must specify an install program" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi @@ -4159,5 +5352,5 @@ $echo "$modename: the \`$prev' option requires an argument" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi @@ -4169,5 +5362,5 @@ fi $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi @@ -4187,8 +5380,8 @@ # Not a directory, so check to see that there is only one file specified. set dummy $files - if test $# -gt 2; then + if test "$#" -gt 2; then $echo "$modename: \`$dest' is not a directory" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi fi @@ -4202,5 +5395,5 @@ $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -4227,9 +5420,9 @@ *.la) # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi @@ -4263,19 +5456,22 @@ if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` + inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that # are installed to the same prefix. + # At present, this check doesn't affect windows .dll's that + # are installed into $libdir/../bin (currently, that works fine) + # but it's something to keep an eye on. if test "$inst_prefix_dir" = "$destdir"; then $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 - exit 1 + exit $EXIT_FAILURE fi if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` + relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi @@ -4285,5 +5481,5 @@ else $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - exit 1 + exit $EXIT_FAILURE fi fi @@ -4307,5 +5503,5 @@ fi - if test $# -gt 0; then + if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. for linkname @@ -4320,8 +5516,9 @@ # Do each command in the postinstall commands. lib="$destdir/$realname" - eval cmds=\"$postinstall_cmds\" + cmds=$postinstall_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? @@ -4363,5 +5560,5 @@ $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -4381,5 +5578,5 @@ $run eval "$install_prog \$staticobj \$staticdest" || exit $? fi - exit 0 + exit $EXIT_SUCCESS ;; @@ -4393,8 +5590,21 @@ fi + # If the file is missing, and there is a .exe on the end, strip it + # because it is most likely a libtool script we actually want to + # install + stripped_ext="" + case $file in + *.exe) + if test ! -f "$file"; then + file=`$echo $file|${SED} 's,.exe$,,'` + stripped_ext=".exe" + fi + ;; + esac + # Do a test to see if this is really a libtool program. case $host in *cygwin*|*mingw*) - wrapper=`echo $file | ${SED} -e 's,.exe$,,'` + wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` ;; *) @@ -4402,12 +5612,19 @@ ;; esac - if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then + if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then notinst_deplibs= relink_command= + # To insure that "foo" is sourced, and not "foo.exe", + # finese the cygwin/MSYS system by explicitly sourcing "foo." + # which disallows the automatic-append-.exe behavior. + case $build in + *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; + *) wrapperdot=${wrapper} ;; + esac # If there is no directory component, then add one. case $file in - */* | *\\*) . $wrapper ;; - *) . ./$wrapper ;; + */* | *\\*) . ${wrapperdot} ;; + *) . ./${wrapperdot} ;; esac @@ -4415,5 +5632,5 @@ if test -z "$notinst_deplibs"; then $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi @@ -4437,8 +5654,15 @@ relink_command= + # To insure that "foo" is sourced, and not "foo.exe", + # finese the cygwin/MSYS system by explicitly sourcing "foo." + # which disallows the automatic-append-.exe behavior. + case $build in + *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; + *) wrapperdot=${wrapper} ;; + esac # If there is no directory component, then add one. case $file in - */* | *\\*) . $wrapper ;; - *) . ./$wrapper ;; + */* | *\\*) . ${wrapperdot} ;; + *) . ./${wrapperdot} ;; esac @@ -4448,17 +5672,15 @@ tmpdir="/tmp" test -n "$TMPDIR" && tmpdir="$TMPDIR" - tmpdir_mktemp=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` - if test $? = 0 ; then - tmpdir="$tmpdir_mktemp" - unset tmpdir_mktemp - else - tmpdir="$tmpdir/libtool-$$" - fi - if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : + tmpdir="$tmpdir/libtool-$$" + save_umask=`umask` + umask 0077 + if $mkdir "$tmpdir"; then + umask $save_umask else + umask $save_umask $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 continue fi - file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. @@ -4478,5 +5700,5 @@ else # Install the binary that we compiled earlier. - file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` fi fi @@ -4485,5 +5707,5 @@ # one anyways case $install_prog,$host in - /usr/bin/install*,*cygwin*) + */usr/bin/install*,*cygwin*) case $file:$destfile in *.exe:*.exe) @@ -4494,5 +5716,5 @@ ;; *:*.exe) - destfile=`echo $destfile | ${SED} -e 's,.exe$,,'` + destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` ;; esac @@ -4515,5 +5737,5 @@ $run eval "$install_prog \$file \$oldlib" || exit $? - if test -n "$stripme" && test -n "$striplib"; then + if test -n "$stripme" && test -n "$old_striplib"; then $show "$old_striplib $oldlib" $run eval "$old_striplib $oldlib" || exit $? @@ -4521,8 +5743,9 @@ # Do each command in the postinstall commands. - eval cmds=\"$old_postinstall_cmds\" + cmds=$old_postinstall_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? @@ -4538,7 +5761,7 @@ # Maybe just do a dry run. test -n "$run" && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $0 --finish$current_libdirs' + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' else - exit 0 + exit $EXIT_SUCCESS fi ;; @@ -4559,8 +5782,9 @@ if test -n "$finish_cmds"; then # Do each command in the finish commands. - eval cmds=\"$finish_cmds\" + cmds=$finish_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || admincmds="$admincmds @@ -4579,23 +5803,23 @@ # Exit here if they wanted silent mode. - test "$show" = ":" && exit 0 - - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" + test "$show" = : && exit $EXIT_SUCCESS + + $echo "----------------------------------------------------------------------" + $echo "Libraries have been installed in:" for libdir in $libdirs; do - echo " $libdir" + $echo " $libdir" done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" + $echo + $echo "If you ever happen to want to link against installed libraries" + $echo "in a given directory, LIBDIR, you must either use libtool, and" + $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + $echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" + $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + $echo " during execution" fi if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" + $echo " - add LIBDIR to the \`$runpath_var' environment variable" + $echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then @@ -4603,17 +5827,17 @@ eval flag=\"$hardcode_libdir_flag_spec\" - echo " - use the \`$flag' linker flag" + $echo " - use the \`$flag' linker flag" fi if test -n "$admincmds"; then - echo " - have your system administrator run these commands:$admincmds" + $echo " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" fi - echo - echo "See any operating system documentation about shared libraries for" - echo "more information, such as the ld(1) and ld.so(8) manual pages." - echo "----------------------------------------------------------------------" - exit 0 + $echo + $echo "See any operating system documentation about shared libraries for" + $echo "more information, such as the ld(1) and ld.so(8) manual pages." + $echo "----------------------------------------------------------------------" + exit $EXIT_SUCCESS ;; @@ -4627,5 +5851,5 @@ $echo "$modename: you must specify a COMMAND" 1>&2 $echo "$help" - exit 1 + exit $EXIT_FAILURE fi @@ -4635,5 +5859,5 @@ $echo "$modename: \`$file' is not a file" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi @@ -4642,9 +5866,9 @@ *.la) # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi @@ -4673,5 +5897,5 @@ else $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi ;; @@ -4713,5 +5937,5 @@ *) # Do a test to see if this is really a libtool program. - if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then # If there is no directory component, then add one. case $file in @@ -4736,5 +5960,5 @@ fi - # Restore saved enviroment variables + # Restore saved environment variables if test "${save_LC_ALL+set}" = set; then LC_ALL="$save_LC_ALL"; export LC_ALL @@ -4745,5 +5969,5 @@ # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" + exec_cmd="\"\$cmd\"$args" else # Display what would be done. @@ -4752,6 +5976,6 @@ $echo "export $shlibpath_var" fi - $echo "$cmd$args" - exit 0 + eval \$echo \"\$cmd\"$args + exit $EXIT_SUCCESS fi ;; @@ -4781,22 +6005,23 @@ $echo "$modename: you must specify an RM program" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi rmdirs= + origobjdir="$objdir" for file in $files; do dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` if test "X$dir" = "X$file"; then dir=. - objdir="$objdir" + objdir="$origobjdir" else - objdir="$dir/$objdir" + objdir="$dir/$origobjdir" fi name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - test $mode = uninstall && objdir="$dir" + test "$mode" = uninstall && objdir="$dir" # Remember objdir for removal later, being careful to avoid duplicates - if test $mode = clean; then + if test "$mode" = clean; then case " $rmdirs " in *" $objdir "*) ;; @@ -4822,5 +6047,5 @@ *.la) # Possibly a libtool archive, so verify it. - if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then . $dir/$name @@ -4830,16 +6055,17 @@ done test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - - if test $mode = uninstall; then + test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + + if test "$mode" = uninstall; then if test -n "$library_names"; then # Do each command in the postuninstall commands. - eval cmds=\"$postuninstall_cmds\" + cmds=$postuninstall_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" - if test $? != 0 && test "$rmforce" != yes; then + if test "$?" -ne 0 && test "$rmforce" != yes; then exit_status=1 fi @@ -4850,11 +6076,12 @@ if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - eval cmds=\"$old_postuninstall_cmds\" + cmds=$old_postuninstall_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" - if test $? != 0 && test "$rmforce" != yes; then + if test "$?" -ne 0 && test "$rmforce" != yes; then exit_status=1 fi @@ -4868,20 +6095,50 @@ *.lo) - if test "$build_old_libs" = yes; then - oldobj=`$echo "X$name" | $Xsed -e "$lo2o"` - rmfiles="$rmfiles $dir/$oldobj" + # Possibly a libtool object, so verify it. + if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + + # Read the .lo file + . $dir/$name + + # Add PIC object to the list of files to remove. + if test -n "$pic_object" \ + && test "$pic_object" != none; then + rmfiles="$rmfiles $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" \ + && test "$non_pic_object" != none; then + rmfiles="$rmfiles $dir/$non_pic_object" + fi fi ;; *) - # Do a test to see if this is a libtool program. - if test $mode = clean && - (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - relink_command= - . $dir/$file - - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" + if test "$mode" = clean ; then + noexename=$name + case $file in + *.exe) + file=`$echo $file|${SED} 's,.exe$,,'` + noexename=`$echo $name|${SED} 's,.exe$,,'` + # $file with .exe has already been added to rmfiles, + # add $file without .exe + rmfiles="$rmfiles $file" + ;; + esac + # Do a test to see if this is a libtool program. + if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + relink_command= + . $dir/$noexename + + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles + rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" + if test "$fast_install" = yes && test -n "$relink_command"; then + rmfiles="$rmfiles $objdir/lt-$name" + fi + if test "X$noexename" != "X$name" ; then + rmfiles="$rmfiles $objdir/lt-${noexename}.c" + fi fi fi @@ -4891,4 +6148,5 @@ $run $rm $rmfiles || exit_status=1 done + objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files @@ -4906,5 +6164,5 @@ $echo "$modename: you must specify a MODE" 1>&2 $echo "$generic_help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -4913,5 +6171,5 @@ $echo "$modename: invalid operation mode \`$mode'" 1>&2 $echo "$generic_help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi fi # test -z "$show_help" @@ -4919,5 +6177,5 @@ if test -n "$exec_cmd"; then eval exec $exec_cmd - exit 1 + exit $EXIT_FAILURE fi @@ -4938,4 +6196,5 @@ --quiet same as \`--silent' --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG --version print version information @@ -4951,6 +6210,8 @@ MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -a more detailed description of MODE." - exit 0 +a more detailed description of MODE. + +Report bugs to ." + exit $EXIT_SUCCESS ;; @@ -5063,4 +6324,7 @@ -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -objectlist FILE Use a list of object files found in FILE to specify objects + -precious-files-regex REGEX + don't remove output files matching REGEX -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR @@ -5104,12 +6368,32 @@ $echo "$modename: invalid operation mode \`$mode'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac -echo +$echo $echo "Try \`$modename --help' for more information about other modes." -exit 0 +exit $EXIT_SUCCESS + +# The TAGs below are defined such that we never get into a situation +# in which we disable both kinds of libraries. Given conflicting +# choices, we go for a static library, that is the most portable, +# since we can't tell whether shared libraries were disabled because +# the user asked for that or because the platform doesn't support +# them. This is particularly important on AIX, because we don't +# support having both static and shared libraries enabled at the same +# time on that platform, so we default to a shared-only configuration. +# If a disable-shared tag is given, we'll fallback to a static-only +# configuration. But we'll never go from static-only to shared-only. + +# ### BEGIN LIBTOOL TAG CONFIG: disable-shared +build_libtool_libs=no +build_old_libs=yes +# ### END LIBTOOL TAG CONFIG: disable-shared + +# ### BEGIN LIBTOOL TAG CONFIG: disable-static +build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` +# ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: Index: /trunk/psLib/pslib.kdevses =================================================================== --- /trunk/psLib/pslib.kdevses (revision 3406) +++ /trunk/psLib/pslib.kdevses (revision 3407) @@ -4,17 +4,17 @@ - + - + - + - - + + - - + + Index: /trunk/psLib/src/astronomy/psMetadata.c =================================================================== --- /trunk/psLib/src/astronomy/psMetadata.c (revision 3406) +++ /trunk/psLib/src/astronomy/psMetadata.c (revision 3407) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.54 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-07 20:58:50 $ +* @version $Revision: 1.55 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,4 +67,32 @@ /* FUNCTION IMPLEMENTATION - LOCAL */ /*****************************************************************************/ + +static psMetadataItem* makeMetaMulti(psHash* table, const char* key, psMetadataItem* existing) +{ + + if (existing != NULL && existing->type == PS_META_MULTI) { + return existing; + } + + // move any existing entry into a psList + psList* newList = psListAlloc(existing); + + psMetadataItem* item = psMetadataItemAlloc(key, + PS_META_MULTI, + "", + newList); + + if (existing != NULL) { + psHashRemove(table,key); // take out the old entry + } + + psHashAdd(table, key, item); // put in the new entry + + // free local references of newly allocated items. + psFree(newList); + psFree(item); + + return item; +} static void metadataItemFree(psMetadataItem* metadataItem) @@ -253,27 +281,31 @@ existingEntry = (psMetadataItem*)psHashLookup(mdTable, key); - // how the item is added to the hash depends on flags & prior existence - if(existingEntry != NULL) { - if ((flags & PS_META_DUPLICATE_OK) != 0) { + if (metadataItem->type == PS_META_MULTI) { + // the incoming entry is PS_META_MULTI + + // force the hash entry to be PS_META_MULTI + existingEntry = makeMetaMulti(mdTable,key,existingEntry); + + // add all the items in the incoming entry to metadata + psList* list = metadataItem->data.list; + if (list != NULL) { + psListIterator* iter = psListIteratorAlloc(list,PS_LIST_HEAD,true); + psMetadataItem* listItem; + while ((listItem=(psMetadataItem*)psListGetAndIncrement(iter)) != NULL) { + psMetadataAddItem(md,listItem,location,flags); + } + psFree(iter); + } + + return true; // all done. + } + + // how the item is added to the hash depends on prior existence, flags, etc. + if(existingEntry != NULL) { // prior existence + if (existingEntry->type == PS_META_MULTI || (flags & PS_META_DUPLICATE_OK) != 0) { // duplicate entries allowed - add another entry. - if (existingEntry->type != PS_META_MULTI) { - // first duplicate, transfer the hash's old entry into a - // list of entries with the type PS_META_MULTI. - - // add entry to a list and dereference the local pointer - psList* newList = psListAlloc(existingEntry); - - existingEntry = psMetadataItemAlloc(key, - PS_META_MULTI, - "", - newList); - psHashRemove(mdTable,key); // take out the old entry - psHashAdd(mdTable, key, existingEntry); // put in the new entry - - // free local references of newly allocated items. - psFree(newList); - psFree(existingEntry); - - } + + // make sure the existing entry is PS_META_MULTI + existingEntry = makeMetaMulti(mdTable,key,existingEntry); // add to the hash's list of duplicate entries @@ -282,12 +314,9 @@ return false; } - // (added to list below) - } else if ((flags & PS_META_REPLACE) != 0) { // replace entry instead of creating a duplicate entry. // remove the existing entry from metadata - psListRemoveData(mdList, existingEntry); - psHashRemove(mdTable, key); + psMetadataRemove(md,0,key); // treat as if new (added to list below) @@ -423,11 +452,4 @@ // multiple entries with same key, remove just the specified one psListRemoveData(tableItem->data.list, entry); - if (psListGet(tableItem->data.list,PS_LIST_HEAD) == NULL) { - // list is empty, so let's clear the whole entry now. - if (!psHashRemove(mdTable, key)) { - psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psMetadata_REMOVE_TABLE_FAILED, key); - return false; - } - } } else { if (!psHashRemove(mdTable, key)) { Index: /trunk/psLib/src/astronomy/psMetadata.h =================================================================== --- /trunk/psLib/src/astronomy/psMetadata.h (revision 3406) +++ /trunk/psLib/src/astronomy/psMetadata.h (revision 3407) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.39 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-07 20:58:50 $ +* @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -37,9 +37,9 @@ */ typedef enum { - PS_META_S32, ///< psS32 primitive data. - PS_META_F32, ///< psF32 primitive data. - PS_META_F64, ///< psF64 primitive data. - PS_META_BOOL, ///< psBool primitive data. - PS_META_LIST, ///< List data (Stored as item.data.list). + PS_META_S32 = PS_TYPE_S32, ///< psS32 primitive data. + PS_META_F32 = PS_TYPE_F32, ///< psF32 primitive data. + PS_META_F64 = PS_TYPE_F64, ///< psF64 primitive data. + PS_META_BOOL = PS_TYPE_BOOL, ///< psBool primitive data. + PS_META_LIST = 0x10000, ///< List data (Stored as item.data.list). PS_META_STR, ///< String data (Stored as item.data.V). PS_META_VEC, ///< Vector data (Stored as item.data.V). @@ -51,6 +51,5 @@ PS_META_ASTROM, ///< Astrometric coefficients (Stored as item.data.V). PS_META_UNKNOWN, ///< Other data (Stored as item.data.V). - PS_META_MULTI, ///< Used internally, do not create an metadata item of this type. - PS_META_NTYPE ///< Number of types. Must be last. + PS_META_MULTI ///< Used internally, do not create an metadata item of this type. } psMetadataType; Index: /trunk/psLib/src/collections/psMetadata.c =================================================================== --- /trunk/psLib/src/collections/psMetadata.c (revision 3406) +++ /trunk/psLib/src/collections/psMetadata.c (revision 3407) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.54 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-07 20:58:50 $ +* @version $Revision: 1.55 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,4 +67,32 @@ /* FUNCTION IMPLEMENTATION - LOCAL */ /*****************************************************************************/ + +static psMetadataItem* makeMetaMulti(psHash* table, const char* key, psMetadataItem* existing) +{ + + if (existing != NULL && existing->type == PS_META_MULTI) { + return existing; + } + + // move any existing entry into a psList + psList* newList = psListAlloc(existing); + + psMetadataItem* item = psMetadataItemAlloc(key, + PS_META_MULTI, + "", + newList); + + if (existing != NULL) { + psHashRemove(table,key); // take out the old entry + } + + psHashAdd(table, key, item); // put in the new entry + + // free local references of newly allocated items. + psFree(newList); + psFree(item); + + return item; +} static void metadataItemFree(psMetadataItem* metadataItem) @@ -253,27 +281,31 @@ existingEntry = (psMetadataItem*)psHashLookup(mdTable, key); - // how the item is added to the hash depends on flags & prior existence - if(existingEntry != NULL) { - if ((flags & PS_META_DUPLICATE_OK) != 0) { + if (metadataItem->type == PS_META_MULTI) { + // the incoming entry is PS_META_MULTI + + // force the hash entry to be PS_META_MULTI + existingEntry = makeMetaMulti(mdTable,key,existingEntry); + + // add all the items in the incoming entry to metadata + psList* list = metadataItem->data.list; + if (list != NULL) { + psListIterator* iter = psListIteratorAlloc(list,PS_LIST_HEAD,true); + psMetadataItem* listItem; + while ((listItem=(psMetadataItem*)psListGetAndIncrement(iter)) != NULL) { + psMetadataAddItem(md,listItem,location,flags); + } + psFree(iter); + } + + return true; // all done. + } + + // how the item is added to the hash depends on prior existence, flags, etc. + if(existingEntry != NULL) { // prior existence + if (existingEntry->type == PS_META_MULTI || (flags & PS_META_DUPLICATE_OK) != 0) { // duplicate entries allowed - add another entry. - if (existingEntry->type != PS_META_MULTI) { - // first duplicate, transfer the hash's old entry into a - // list of entries with the type PS_META_MULTI. - - // add entry to a list and dereference the local pointer - psList* newList = psListAlloc(existingEntry); - - existingEntry = psMetadataItemAlloc(key, - PS_META_MULTI, - "", - newList); - psHashRemove(mdTable,key); // take out the old entry - psHashAdd(mdTable, key, existingEntry); // put in the new entry - - // free local references of newly allocated items. - psFree(newList); - psFree(existingEntry); - - } + + // make sure the existing entry is PS_META_MULTI + existingEntry = makeMetaMulti(mdTable,key,existingEntry); // add to the hash's list of duplicate entries @@ -282,12 +314,9 @@ return false; } - // (added to list below) - } else if ((flags & PS_META_REPLACE) != 0) { // replace entry instead of creating a duplicate entry. // remove the existing entry from metadata - psListRemoveData(mdList, existingEntry); - psHashRemove(mdTable, key); + psMetadataRemove(md,0,key); // treat as if new (added to list below) @@ -423,11 +452,4 @@ // multiple entries with same key, remove just the specified one psListRemoveData(tableItem->data.list, entry); - if (psListGet(tableItem->data.list,PS_LIST_HEAD) == NULL) { - // list is empty, so let's clear the whole entry now. - if (!psHashRemove(mdTable, key)) { - psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psMetadata_REMOVE_TABLE_FAILED, key); - return false; - } - } } else { if (!psHashRemove(mdTable, key)) { Index: /trunk/psLib/src/collections/psMetadata.h =================================================================== --- /trunk/psLib/src/collections/psMetadata.h (revision 3406) +++ /trunk/psLib/src/collections/psMetadata.h (revision 3407) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.39 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-07 20:58:50 $ +* @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -37,9 +37,9 @@ */ typedef enum { - PS_META_S32, ///< psS32 primitive data. - PS_META_F32, ///< psF32 primitive data. - PS_META_F64, ///< psF64 primitive data. - PS_META_BOOL, ///< psBool primitive data. - PS_META_LIST, ///< List data (Stored as item.data.list). + PS_META_S32 = PS_TYPE_S32, ///< psS32 primitive data. + PS_META_F32 = PS_TYPE_F32, ///< psF32 primitive data. + PS_META_F64 = PS_TYPE_F64, ///< psF64 primitive data. + PS_META_BOOL = PS_TYPE_BOOL, ///< psBool primitive data. + PS_META_LIST = 0x10000, ///< List data (Stored as item.data.list). PS_META_STR, ///< String data (Stored as item.data.V). PS_META_VEC, ///< Vector data (Stored as item.data.V). @@ -51,6 +51,5 @@ PS_META_ASTROM, ///< Astrometric coefficients (Stored as item.data.V). PS_META_UNKNOWN, ///< Other data (Stored as item.data.V). - PS_META_MULTI, ///< Used internally, do not create an metadata item of this type. - PS_META_NTYPE ///< Number of types. Must be last. + PS_META_MULTI ///< Used internally, do not create an metadata item of this type. } psMetadataType; Index: /trunk/psLib/src/collections/psVector.c =================================================================== --- /trunk/psLib/src/collections/psVector.c (revision 3406) +++ /trunk/psLib/src/collections/psVector.c (revision 3407) @@ -1,3 +1,2 @@ - /** @file psVector.c * @@ -10,6 +9,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-17 19:26:23 $ +* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -18,4 +17,5 @@ #include // for memcpy #include +#include #include @@ -407,2 +407,91 @@ return outVector; } + +char* psVectorToString(psVector* vector, int maxLength) +{ + + if (maxLength < 5) { + return NULL; + } + + char* str = psAlloc(sizeof(char)*maxLength+1); + + if (vector == NULL) { + snprintf(str,maxLength, "NULL"); + return str; + } + + int size = vector->n; + + if (size == 0) { + snprintf(str,maxLength, "[]"); + return str; + } + + char* tempStr = psAlloc(sizeof(char)*maxLength+1); + *str = '\0'; + bool full = false; + + #define APPEND_ELEMENTS_CASE(TYPE, NATIVE_TYPE, FORMAT) \ +case PS_TYPE_##TYPE: \ + for (lcv=0; lcv < size && ! full; lcv++) { \ + snprintf(tempStr, maxLength, "%s" FORMAT, prefix, (NATIVE_TYPE) (vector->data.TYPE[lcv])); \ + strncat(str,tempStr,maxLength); \ + full = (strlen(str) > maxLength-2); \ + prefix = ","; \ + } \ + break; + + #define APPEND_ELEMENTS_CASE_COMPLEX(TYPE,CREAL,CIMAG) \ +case PS_TYPE_##TYPE: \ + for (lcv=0; lcv < size && ! full; lcv++) { \ + snprintf(tempStr, maxLength, "%s%g%+gi", prefix, \ + CREAL(vector->data.TYPE[lcv]), \ + CIMAG(vector->data.TYPE[lcv])); \ + full = (strlen(str) > maxLength-2); \ + prefix = ","; \ + } \ + break; + + int lcv; + char* prefix = "["; + switch(vector->type.type) { + APPEND_ELEMENTS_CASE(S8,char,"%hd") + APPEND_ELEMENTS_CASE(S16,short int,"%hd") + APPEND_ELEMENTS_CASE(S32,int,"%d") + APPEND_ELEMENTS_CASE(S64,long,"%ld") + APPEND_ELEMENTS_CASE(U8,unsigned char,"%hu") + APPEND_ELEMENTS_CASE(U16,unsigned short,"%hu") + APPEND_ELEMENTS_CASE(U32,unsigned int, "%u") + APPEND_ELEMENTS_CASE(U64,unsigned long,"%lu") + APPEND_ELEMENTS_CASE(F32,double,"%g") + APPEND_ELEMENTS_CASE(F64,double,"%g") + APPEND_ELEMENTS_CASE_COMPLEX(C32,crealf,cimagf) + APPEND_ELEMENTS_CASE_COMPLEX(C64,creal,cimag) + default: + snprintf(str,maxLength,"[...]"); + break; + } + + if (full) { + // couldn't all fit in given string length + + // remove elements until there is room for ",...]" + while (strlen(str) > maxLength - 5) { + char* lastComma = strrchr(str,','); + if (lastComma == NULL) { // no comma, must be first number + str[1] = '\0'; + } else { + *lastComma = '\0'; + } + } + strncat(str,",...]",maxLength); + } else { + strncat(str,"]",maxLength); + } + + psFree(tempStr); + + return str; +} + Index: /trunk/psLib/src/collections/psVector.h =================================================================== --- /trunk/psLib/src/collections/psVector.h (revision 3406) +++ /trunk/psLib/src/collections/psVector.h (revision 3407) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -144,4 +144,13 @@ ); +/** Creates a string from a psVector's values in the form "[x0,x1,x2]". + * + * @return psPtr a newly allocated string + */ +char* psVectorToString( + psVector* vector, ///< vector to create a string from + int maxLength ///< the maximum length of the resulting string +); + /// @} Index: /trunk/psLib/src/dataIO/psFits.c =================================================================== --- /trunk/psLib/src/dataIO/psFits.c (revision 3406) +++ /trunk/psLib/src/dataIO/psFits.c (revision 3407) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-28 23:34:10 $ + * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -98,4 +98,5 @@ break; + case PS_TYPE_BOOL: case PS_TYPE_S8: bitpix = BYTE_IMG; @@ -1450,5 +1451,5 @@ psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_NULL); - return NULL; + return false; } @@ -1619,2 +1620,69 @@ return true; } + +bool psFitsUpdateTable(psFits* fits, + psMetadata* data, + int row) +{ + int status = 0; + + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psFits_NULL); + return false; + } + + if (data == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psFits_IMAGE_NULL); + return false; + } + + + // check to see if we even are positioned on a table HDU + int hdutype; + if ( fits_get_hdu_type(fits->p_fd,&hdutype, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED, + fitsErr); + return false; + } + if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) { + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psFits_NOT_TABLE_TYPE); + return false; + } + + + psMetadataIterator* iter = psMetadataIteratorAlloc(data,PS_LIST_HEAD,NULL); + + psMetadataItem* item; + + while ( (item=psMetadataGetAndIncrement(iter)) != NULL) { + if (PS_META_IS_PRIMITIVE(item->type)) { + // operating on primitive data type, i.e., not a complex object + int colnum = 0; + + if ( fits_get_colnum(fits->p_fd, CASESEN, item->name, &colnum, &status) == 0) { + // cooresponding column found in table + int dataType = 0; + convertPsTypeToFits(item->type, NULL, NULL, &dataType); + + if (fits_write_col(fits->p_fd, dataType, colnum, row, 0,1,&item->data,&status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psFits_WRITE_FAILED, + fits->filename, fitsErr); + return false; + } + } + } + } + + psFree(iter); + + return true; +} Index: /trunk/psLib/src/dataIO/psFits.h =================================================================== --- /trunk/psLib/src/dataIO/psFits.h (revision 3406) +++ /trunk/psLib/src/dataIO/psFits.h (revision 3407) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -249,5 +249,5 @@ ); -#if 0 + /** Updates a FITS table. The current HDU type must be either * PS_FITS_TYPE_BINARY_TABLE or PS_FITS_TYPE_ASCII_TABLE. @@ -259,6 +259,8 @@ bool psFitsUpdateTable( psFits* fits, ///< the psFits object - psArray* table + psMetadata* data, ///< Array of psMetadata items, which contains the output data items of each row. + int row ///< the row number to update. + ); @@ -266,4 +268,2 @@ #endif - -#endif Index: /trunk/psLib/src/fileUtils/psFits.c =================================================================== --- /trunk/psLib/src/fileUtils/psFits.c (revision 3406) +++ /trunk/psLib/src/fileUtils/psFits.c (revision 3407) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-28 23:34:10 $ + * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -98,4 +98,5 @@ break; + case PS_TYPE_BOOL: case PS_TYPE_S8: bitpix = BYTE_IMG; @@ -1450,5 +1451,5 @@ psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_NULL); - return NULL; + return false; } @@ -1619,2 +1620,69 @@ return true; } + +bool psFitsUpdateTable(psFits* fits, + psMetadata* data, + int row) +{ + int status = 0; + + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psFits_NULL); + return false; + } + + if (data == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psFits_IMAGE_NULL); + return false; + } + + + // check to see if we even are positioned on a table HDU + int hdutype; + if ( fits_get_hdu_type(fits->p_fd,&hdutype, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED, + fitsErr); + return false; + } + if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) { + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psFits_NOT_TABLE_TYPE); + return false; + } + + + psMetadataIterator* iter = psMetadataIteratorAlloc(data,PS_LIST_HEAD,NULL); + + psMetadataItem* item; + + while ( (item=psMetadataGetAndIncrement(iter)) != NULL) { + if (PS_META_IS_PRIMITIVE(item->type)) { + // operating on primitive data type, i.e., not a complex object + int colnum = 0; + + if ( fits_get_colnum(fits->p_fd, CASESEN, item->name, &colnum, &status) == 0) { + // cooresponding column found in table + int dataType = 0; + convertPsTypeToFits(item->type, NULL, NULL, &dataType); + + if (fits_write_col(fits->p_fd, dataType, colnum, row, 0,1,&item->data,&status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psFits_WRITE_FAILED, + fits->filename, fitsErr); + return false; + } + } + } + } + + psFree(iter); + + return true; +} Index: /trunk/psLib/src/fileUtils/psFits.h =================================================================== --- /trunk/psLib/src/fileUtils/psFits.h (revision 3406) +++ /trunk/psLib/src/fileUtils/psFits.h (revision 3407) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -249,5 +249,5 @@ ); -#if 0 + /** Updates a FITS table. The current HDU type must be either * PS_FITS_TYPE_BINARY_TABLE or PS_FITS_TYPE_ASCII_TABLE. @@ -259,6 +259,8 @@ bool psFitsUpdateTable( psFits* fits, ///< the psFits object - psArray* table + psMetadata* data, ///< Array of psMetadata items, which contains the output data items of each row. + int row ///< the row number to update. + ); @@ -266,4 +268,2 @@ #endif - -#endif Index: /trunk/psLib/src/fits/psFits.c =================================================================== --- /trunk/psLib/src/fits/psFits.c (revision 3406) +++ /trunk/psLib/src/fits/psFits.c (revision 3407) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-28 23:34:10 $ + * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -98,4 +98,5 @@ break; + case PS_TYPE_BOOL: case PS_TYPE_S8: bitpix = BYTE_IMG; @@ -1450,5 +1451,5 @@ psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_NULL); - return NULL; + return false; } @@ -1619,2 +1620,69 @@ return true; } + +bool psFitsUpdateTable(psFits* fits, + psMetadata* data, + int row) +{ + int status = 0; + + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psFits_NULL); + return false; + } + + if (data == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psFits_IMAGE_NULL); + return false; + } + + + // check to see if we even are positioned on a table HDU + int hdutype; + if ( fits_get_hdu_type(fits->p_fd,&hdutype, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED, + fitsErr); + return false; + } + if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) { + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psFits_NOT_TABLE_TYPE); + return false; + } + + + psMetadataIterator* iter = psMetadataIteratorAlloc(data,PS_LIST_HEAD,NULL); + + psMetadataItem* item; + + while ( (item=psMetadataGetAndIncrement(iter)) != NULL) { + if (PS_META_IS_PRIMITIVE(item->type)) { + // operating on primitive data type, i.e., not a complex object + int colnum = 0; + + if ( fits_get_colnum(fits->p_fd, CASESEN, item->name, &colnum, &status) == 0) { + // cooresponding column found in table + int dataType = 0; + convertPsTypeToFits(item->type, NULL, NULL, &dataType); + + if (fits_write_col(fits->p_fd, dataType, colnum, row, 0,1,&item->data,&status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psFits_WRITE_FAILED, + fits->filename, fitsErr); + return false; + } + } + } + } + + psFree(iter); + + return true; +} Index: /trunk/psLib/src/fits/psFits.h =================================================================== --- /trunk/psLib/src/fits/psFits.h (revision 3406) +++ /trunk/psLib/src/fits/psFits.h (revision 3407) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -249,5 +249,5 @@ ); -#if 0 + /** Updates a FITS table. The current HDU type must be either * PS_FITS_TYPE_BINARY_TABLE or PS_FITS_TYPE_ASCII_TABLE. @@ -259,6 +259,8 @@ bool psFitsUpdateTable( psFits* fits, ///< the psFits object - psArray* table + psMetadata* data, ///< Array of psMetadata items, which contains the output data items of each row. + int row ///< the row number to update. + ); @@ -266,4 +268,2 @@ #endif - -#endif Index: /trunk/psLib/src/mathtypes/psVector.c =================================================================== --- /trunk/psLib/src/mathtypes/psVector.c (revision 3406) +++ /trunk/psLib/src/mathtypes/psVector.c (revision 3407) @@ -1,3 +1,2 @@ - /** @file psVector.c * @@ -10,6 +9,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-17 19:26:23 $ +* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -18,4 +17,5 @@ #include // for memcpy #include +#include #include @@ -407,2 +407,91 @@ return outVector; } + +char* psVectorToString(psVector* vector, int maxLength) +{ + + if (maxLength < 5) { + return NULL; + } + + char* str = psAlloc(sizeof(char)*maxLength+1); + + if (vector == NULL) { + snprintf(str,maxLength, "NULL"); + return str; + } + + int size = vector->n; + + if (size == 0) { + snprintf(str,maxLength, "[]"); + return str; + } + + char* tempStr = psAlloc(sizeof(char)*maxLength+1); + *str = '\0'; + bool full = false; + + #define APPEND_ELEMENTS_CASE(TYPE, NATIVE_TYPE, FORMAT) \ +case PS_TYPE_##TYPE: \ + for (lcv=0; lcv < size && ! full; lcv++) { \ + snprintf(tempStr, maxLength, "%s" FORMAT, prefix, (NATIVE_TYPE) (vector->data.TYPE[lcv])); \ + strncat(str,tempStr,maxLength); \ + full = (strlen(str) > maxLength-2); \ + prefix = ","; \ + } \ + break; + + #define APPEND_ELEMENTS_CASE_COMPLEX(TYPE,CREAL,CIMAG) \ +case PS_TYPE_##TYPE: \ + for (lcv=0; lcv < size && ! full; lcv++) { \ + snprintf(tempStr, maxLength, "%s%g%+gi", prefix, \ + CREAL(vector->data.TYPE[lcv]), \ + CIMAG(vector->data.TYPE[lcv])); \ + full = (strlen(str) > maxLength-2); \ + prefix = ","; \ + } \ + break; + + int lcv; + char* prefix = "["; + switch(vector->type.type) { + APPEND_ELEMENTS_CASE(S8,char,"%hd") + APPEND_ELEMENTS_CASE(S16,short int,"%hd") + APPEND_ELEMENTS_CASE(S32,int,"%d") + APPEND_ELEMENTS_CASE(S64,long,"%ld") + APPEND_ELEMENTS_CASE(U8,unsigned char,"%hu") + APPEND_ELEMENTS_CASE(U16,unsigned short,"%hu") + APPEND_ELEMENTS_CASE(U32,unsigned int, "%u") + APPEND_ELEMENTS_CASE(U64,unsigned long,"%lu") + APPEND_ELEMENTS_CASE(F32,double,"%g") + APPEND_ELEMENTS_CASE(F64,double,"%g") + APPEND_ELEMENTS_CASE_COMPLEX(C32,crealf,cimagf) + APPEND_ELEMENTS_CASE_COMPLEX(C64,creal,cimag) + default: + snprintf(str,maxLength,"[...]"); + break; + } + + if (full) { + // couldn't all fit in given string length + + // remove elements until there is room for ",...]" + while (strlen(str) > maxLength - 5) { + char* lastComma = strrchr(str,','); + if (lastComma == NULL) { // no comma, must be first number + str[1] = '\0'; + } else { + *lastComma = '\0'; + } + } + strncat(str,",...]",maxLength); + } else { + strncat(str,"]",maxLength); + } + + psFree(tempStr); + + return str; +} + Index: /trunk/psLib/src/mathtypes/psVector.h =================================================================== --- /trunk/psLib/src/mathtypes/psVector.h (revision 3406) +++ /trunk/psLib/src/mathtypes/psVector.h (revision 3407) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -144,4 +144,13 @@ ); +/** Creates a string from a psVector's values in the form "[x0,x1,x2]". + * + * @return psPtr a newly allocated string + */ +char* psVectorToString( + psVector* vector, ///< vector to create a string from + int maxLength ///< the maximum length of the resulting string +); + /// @} Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 3406) +++ /trunk/psLib/src/types/psMetadata.c (revision 3407) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.54 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-07 20:58:50 $ +* @version $Revision: 1.55 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,4 +67,32 @@ /* FUNCTION IMPLEMENTATION - LOCAL */ /*****************************************************************************/ + +static psMetadataItem* makeMetaMulti(psHash* table, const char* key, psMetadataItem* existing) +{ + + if (existing != NULL && existing->type == PS_META_MULTI) { + return existing; + } + + // move any existing entry into a psList + psList* newList = psListAlloc(existing); + + psMetadataItem* item = psMetadataItemAlloc(key, + PS_META_MULTI, + "", + newList); + + if (existing != NULL) { + psHashRemove(table,key); // take out the old entry + } + + psHashAdd(table, key, item); // put in the new entry + + // free local references of newly allocated items. + psFree(newList); + psFree(item); + + return item; +} static void metadataItemFree(psMetadataItem* metadataItem) @@ -253,27 +281,31 @@ existingEntry = (psMetadataItem*)psHashLookup(mdTable, key); - // how the item is added to the hash depends on flags & prior existence - if(existingEntry != NULL) { - if ((flags & PS_META_DUPLICATE_OK) != 0) { + if (metadataItem->type == PS_META_MULTI) { + // the incoming entry is PS_META_MULTI + + // force the hash entry to be PS_META_MULTI + existingEntry = makeMetaMulti(mdTable,key,existingEntry); + + // add all the items in the incoming entry to metadata + psList* list = metadataItem->data.list; + if (list != NULL) { + psListIterator* iter = psListIteratorAlloc(list,PS_LIST_HEAD,true); + psMetadataItem* listItem; + while ((listItem=(psMetadataItem*)psListGetAndIncrement(iter)) != NULL) { + psMetadataAddItem(md,listItem,location,flags); + } + psFree(iter); + } + + return true; // all done. + } + + // how the item is added to the hash depends on prior existence, flags, etc. + if(existingEntry != NULL) { // prior existence + if (existingEntry->type == PS_META_MULTI || (flags & PS_META_DUPLICATE_OK) != 0) { // duplicate entries allowed - add another entry. - if (existingEntry->type != PS_META_MULTI) { - // first duplicate, transfer the hash's old entry into a - // list of entries with the type PS_META_MULTI. - - // add entry to a list and dereference the local pointer - psList* newList = psListAlloc(existingEntry); - - existingEntry = psMetadataItemAlloc(key, - PS_META_MULTI, - "", - newList); - psHashRemove(mdTable,key); // take out the old entry - psHashAdd(mdTable, key, existingEntry); // put in the new entry - - // free local references of newly allocated items. - psFree(newList); - psFree(existingEntry); - - } + + // make sure the existing entry is PS_META_MULTI + existingEntry = makeMetaMulti(mdTable,key,existingEntry); // add to the hash's list of duplicate entries @@ -282,12 +314,9 @@ return false; } - // (added to list below) - } else if ((flags & PS_META_REPLACE) != 0) { // replace entry instead of creating a duplicate entry. // remove the existing entry from metadata - psListRemoveData(mdList, existingEntry); - psHashRemove(mdTable, key); + psMetadataRemove(md,0,key); // treat as if new (added to list below) @@ -423,11 +452,4 @@ // multiple entries with same key, remove just the specified one psListRemoveData(tableItem->data.list, entry); - if (psListGet(tableItem->data.list,PS_LIST_HEAD) == NULL) { - // list is empty, so let's clear the whole entry now. - if (!psHashRemove(mdTable, key)) { - psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psMetadata_REMOVE_TABLE_FAILED, key); - return false; - } - } } else { if (!psHashRemove(mdTable, key)) { Index: /trunk/psLib/src/types/psMetadata.h =================================================================== --- /trunk/psLib/src/types/psMetadata.h (revision 3406) +++ /trunk/psLib/src/types/psMetadata.h (revision 3407) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.39 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-07 20:58:50 $ +* @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -37,9 +37,9 @@ */ typedef enum { - PS_META_S32, ///< psS32 primitive data. - PS_META_F32, ///< psF32 primitive data. - PS_META_F64, ///< psF64 primitive data. - PS_META_BOOL, ///< psBool primitive data. - PS_META_LIST, ///< List data (Stored as item.data.list). + PS_META_S32 = PS_TYPE_S32, ///< psS32 primitive data. + PS_META_F32 = PS_TYPE_F32, ///< psF32 primitive data. + PS_META_F64 = PS_TYPE_F64, ///< psF64 primitive data. + PS_META_BOOL = PS_TYPE_BOOL, ///< psBool primitive data. + PS_META_LIST = 0x10000, ///< List data (Stored as item.data.list). PS_META_STR, ///< String data (Stored as item.data.V). PS_META_VEC, ///< Vector data (Stored as item.data.V). @@ -51,6 +51,5 @@ PS_META_ASTROM, ///< Astrometric coefficients (Stored as item.data.V). PS_META_UNKNOWN, ///< Other data (Stored as item.data.V). - PS_META_MULTI, ///< Used internally, do not create an metadata item of this type. - PS_META_NTYPE ///< Number of types. Must be last. + PS_META_MULTI ///< Used internally, do not create an metadata item of this type. } psMetadataType; Index: /trunk/psLib/test/astronomy/tst_psMetadataIO.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadataIO.c (revision 3406) +++ /trunk/psLib/test/astronomy/tst_psMetadataIO.c (revision 3407) @@ -14,6 +14,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-07 20:58:50 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -66,6 +66,8 @@ static void printMetadataItem(psMetadataItem *metadataItem, char *spaces) { + char* vecStr; + printf("%sKey Name: %8s ", spaces, metadataItem->name); - printf("Key mdType: %d ", metadataItem->type); + printf("Key mdType: 0x%08x ", metadataItem->type); switch (metadataItem->type) { @@ -85,9 +87,14 @@ printf("Key Value: %15.3f ", metadataItem->data.F64); break; + case PS_META_VEC: + vecStr = (char*)psVectorToString((psVector*)metadataItem->data.V, 15); + printf("Key Value: %15s ", vecStr); + psFree(vecStr); + break; case PS_META_STR: printf("Key Value: %15s ", (char*)metadataItem->data.V); break; default: - printf("Bad type: %d ", metadataItem->type); + printf("Bad type: 0x%08x ", metadataItem->type); } printf("Key Comment: %s\n", metadataItem->comment); Index: /trunk/psLib/test/astronomy/tst_psMetadata_01.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_01.c (revision 3406) +++ /trunk/psLib/test/astronomy/tst_psMetadata_01.c (revision 3407) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-07 20:58:50 $ +* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -72,5 +72,5 @@ { printf("%sKey Name: %8s ", spaces, metadataItem->name); - printf("Key mdType: %d ", metadataItem->type); + printf("Key mdType: 0x%08x ", metadataItem->type); switch (metadataItem->type) { @@ -126,4 +126,5 @@ printFooter(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file", true); + printf("ID=%d\n",(int)psMemGetId()); // Test B - Read 2nd hdr from complex FITS file @@ -173,4 +174,5 @@ printFooter(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file", true); + printf("ID=%d\n",(int)psMemGetId()); // Test C - Read named hdr from complex FITS file Index: /trunk/psLib/test/astronomy/tst_psMetadata_02.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_02.c (revision 3406) +++ /trunk/psLib/test/astronomy/tst_psMetadata_02.c (revision 3407) @@ -15,6 +15,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-07 20:58:50 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -29,5 +29,5 @@ { printf("Key Name: %8s ", metadataItem->name); - printf("Key mdType: %2d ", metadataItem->type); + printf("Key mdType: 0x%08x ", metadataItem->type); switch (metadataItem->type) { @@ -98,5 +98,5 @@ printNegativeTestHeader(stdout,"psMetadata", "Test C - Attempt to create metadata item with invalid type", "Invalid psMetadataType: 6", 0); - badItem = psMetadataItemAlloc("badItem", PS_META_NTYPE, "I am bad", "Bad comment"); + badItem = psMetadataItemAlloc("badItem", -1, "I am bad", "Bad comment"); printFooter(stdout, "psMetadata", "Test C - Attempt to create metadata item with invalid type", true); Index: /trunk/psLib/test/astronomy/tst_psMetadata_03.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_03.c (revision 3406) +++ /trunk/psLib/test/astronomy/tst_psMetadata_03.c (revision 3407) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-07 20:58:50 $ +* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -32,5 +32,5 @@ { printf("Key Name: %8s ", metadataItem->name); - printf("Key mdType: %2d ", metadataItem->type); + printf("Key mdType: 0x%08x ", metadataItem->type); switch (metadataItem->type) { Index: /trunk/psLib/test/astronomy/tst_psMetadata_04.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_04.c (revision 3406) +++ /trunk/psLib/test/astronomy/tst_psMetadata_04.c (revision 3407) @@ -23,6 +23,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-07 20:58:50 $ +* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -37,5 +37,5 @@ { printf("Key Name: %8s ", metadataItem->name); - printf("Key mdType: %2d ", metadataItem->type); + printf("Key mdType: 0x%08x ", metadataItem->type); switch (metadataItem->type) { Index: /trunk/psLib/test/astronomy/tst_psMetadata_05.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_05.c (revision 3406) +++ /trunk/psLib/test/astronomy/tst_psMetadata_05.c (revision 3407) @@ -22,6 +22,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-07 20:58:50 $ +* @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -36,5 +36,5 @@ { printf("Key Name: %8s ", metadataItem->name); - printf("Key mdType: %2d ", metadataItem->type); + printf("Key mdType: 0x%08x ", metadataItem->type); switch (metadataItem->type) { Index: /trunk/psLib/test/astronomy/tst_psMetadata_06.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_06.c (revision 3406) +++ /trunk/psLib/test/astronomy/tst_psMetadata_06.c (revision 3407) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-07 20:58:50 $ +* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-03-11 20:38:56 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -27,5 +27,5 @@ { printf("Key Name: %8s ", metadataItem->name); - printf("Key mdType: %2d ", metadataItem->type); + printf("Key mdType: 0x%08x ", metadataItem->type); switch (metadataItem->type) { Index: /trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stdout =================================================================== --- /trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stdout (revision 3406) +++ /trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stdout (revision 3407) @@ -7,41 +7,41 @@ Failed lines: 6 Expected: 6 Contents of metadata list: - Key Name: pi Key mdType: 2 Key Value: 3.142 Key Comment: Definition of pi - Key Name: altitude Key mdType: 0 Key Value: 10000 Key Comment: - Key Name: time Key mdType: 1 Key Value: 1234.568 Key Comment: - Key Name: myBool Key mdType: 3 Key Value: 0 Key Comment: F, f, 0, T, t, 1 are also acceptable - Key Name: title1 Key mdType: 5 Key Value: Hello world Key Comment: This is a comment for the string value - Key Name: title2 Key mdType: 5 Key Value: Good bye world Key Comment: STRING or STR may be used as the string type - Key Name: primes Key mdType: 6 Bad type: 6 Key Comment: These are prime numbers - Key Name: negatives Key mdType: 6 Bad type: 6 Key Comment: - Key Name: comment Key mdType: 5 Key Value: This Key Comment: - Key Name: comment Key mdType: 5 Key Value: is Key Comment: - Key Name: comment Key mdType: 5 Key Value: an Key Comment: - Key Name: comment Key mdType: 5 Key Value: ugly Key Comment: - Key Name: comment Key mdType: 5 Key Value: comment Key Comment: - Key Name: comment Key mdType: 5 Key Value: but Key Comment: - Key Name: comment Key mdType: 5 Key Value: still Key Comment: - Key Name: comment Key mdType: 5 Key Value: valid Key Comment: - Key Name: speed Key mdType: 1 Key Value: 66.660 Key Comment: + Key Name: pi Key mdType: 0x00000408 Key Value: 3.142 Key Comment: Definition of pi + Key Name: altitude Key mdType: 0x00000104 Key Value: 10000 Key Comment: + Key Name: time Key mdType: 0x00000404 Key Value: 1234.568 Key Comment: + Key Name: myBool Key mdType: 0x00001301 Key Value: 0 Key Comment: F, f, 0, T, t, 1 are also acceptable + Key Name: title1 Key mdType: 0x00010001 Key Value: Hello world Key Comment: This is a comment for the string value + Key Name: title2 Key mdType: 0x00010001 Key Value: Good bye world Key Comment: STRING or STR may be used as the string type + Key Name: primes Key mdType: 0x00010002 Key Value: [2,3,5,7,...] Key Comment: These are prime numbers + Key Name: negatives Key mdType: 0x00010002 Key Value: [-1,-2,-3,...] Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: This Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: is Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: an Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: ugly Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: comment Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: but Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: still Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: valid Key Comment: + Key Name: speed Key mdType: 0x00000404 Key Value: 66.660 Key Comment: Contents of metadata table: - Key Name: comment Key mdType: 14 Key Value: Key Comment: - Key Name: comment Key mdType: 5 Key Value: This Key Comment: - Key Name: comment Key mdType: 5 Key Value: is Key Comment: - Key Name: comment Key mdType: 5 Key Value: an Key Comment: - Key Name: comment Key mdType: 5 Key Value: ugly Key Comment: - Key Name: comment Key mdType: 5 Key Value: comment Key Comment: - Key Name: comment Key mdType: 5 Key Value: but Key Comment: - Key Name: comment Key mdType: 5 Key Value: still Key Comment: - Key Name: comment Key mdType: 5 Key Value: valid Key Comment: - Key Name: title2 Key mdType: 5 Key Value: Good bye world Key Comment: STRING or STR may be used as the string type - Key Name: time Key mdType: 1 Key Value: 1234.568 Key Comment: - Key Name: negatives Key mdType: 6 Bad type: 6 Key Comment: - Key Name: pi Key mdType: 2 Key Value: 3.142 Key Comment: Definition of pi - Key Name: myBool Key mdType: 3 Key Value: 0 Key Comment: F, f, 0, T, t, 1 are also acceptable - Key Name: primes Key mdType: 6 Bad type: 6 Key Comment: These are prime numbers - Key Name: altitude Key mdType: 0 Key Value: 10000 Key Comment: - Key Name: speed Key mdType: 1 Key Value: 66.660 Key Comment: - Key Name: title1 Key mdType: 5 Key Value: Hello world Key Comment: This is a comment for the string value + Key Name: comment Key mdType: 0x0001000a Key Value: Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: This Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: is Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: an Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: ugly Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: comment Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: but Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: still Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: valid Key Comment: + Key Name: title2 Key mdType: 0x00010001 Key Value: Good bye world Key Comment: STRING or STR may be used as the string type + Key Name: time Key mdType: 0x00000404 Key Value: 1234.568 Key Comment: + Key Name: negatives Key mdType: 0x00010002 Key Value: [-1,-2,-3,...] Key Comment: + Key Name: pi Key mdType: 0x00000408 Key Value: 3.142 Key Comment: Definition of pi + Key Name: myBool Key mdType: 0x00001301 Key Value: 0 Key Comment: F, f, 0, T, t, 1 are also acceptable + Key Name: primes Key mdType: 0x00010002 Key Value: [2,3,5,7,...] Key Comment: These are prime numbers + Key Name: altitude Key mdType: 0x00000104 Key Value: 10000 Key Comment: + Key Name: speed Key mdType: 0x00000404 Key Value: 66.660 Key Comment: + Key Name: title1 Key mdType: 0x00010001 Key Value: Hello world Key Comment: This is a comment for the string value ---> TESTPOINT PASSED (psMetadata{Test A - Read config file with overwrite set true} | tst_psMetadataIO.c) @@ -54,41 +54,41 @@ Failed lines: 7 Expected: 7 Contents of metadata list: - Key Name: pi Key mdType: 2 Key Value: 3.142 Key Comment: Definition of pi - Key Name: altitude Key mdType: 0 Key Value: 10000 Key Comment: - Key Name: time Key mdType: 1 Key Value: 1234.568 Key Comment: - Key Name: myBool Key mdType: 3 Key Value: 0 Key Comment: F, f, 0, T, t, 1 are also acceptable - Key Name: title1 Key mdType: 5 Key Value: Hello world Key Comment: This is a comment for the string value - Key Name: title2 Key mdType: 5 Key Value: Good bye world Key Comment: STRING or STR may be used as the string type - Key Name: primes Key mdType: 6 Bad type: 6 Key Comment: These are prime numbers - Key Name: negatives Key mdType: 6 Bad type: 6 Key Comment: - Key Name: comment Key mdType: 5 Key Value: This Key Comment: - Key Name: comment Key mdType: 5 Key Value: is Key Comment: - Key Name: comment Key mdType: 5 Key Value: an Key Comment: - Key Name: comment Key mdType: 5 Key Value: ugly Key Comment: - Key Name: comment Key mdType: 5 Key Value: comment Key Comment: - Key Name: comment Key mdType: 5 Key Value: but Key Comment: - Key Name: comment Key mdType: 5 Key Value: still Key Comment: - Key Name: comment Key mdType: 5 Key Value: valid Key Comment: - Key Name: speed Key mdType: 1 Key Value: 55.550 Key Comment: + Key Name: pi Key mdType: 0x00000408 Key Value: 3.142 Key Comment: Definition of pi + Key Name: altitude Key mdType: 0x00000104 Key Value: 10000 Key Comment: + Key Name: time Key mdType: 0x00000404 Key Value: 1234.568 Key Comment: + Key Name: myBool Key mdType: 0x00001301 Key Value: 0 Key Comment: F, f, 0, T, t, 1 are also acceptable + Key Name: title1 Key mdType: 0x00010001 Key Value: Hello world Key Comment: This is a comment for the string value + Key Name: title2 Key mdType: 0x00010001 Key Value: Good bye world Key Comment: STRING or STR may be used as the string type + Key Name: primes Key mdType: 0x00010002 Key Value: [2,3,5,7,...] Key Comment: These are prime numbers + Key Name: negatives Key mdType: 0x00010002 Key Value: [-1,-2,-3,...] Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: This Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: is Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: an Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: ugly Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: comment Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: but Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: still Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: valid Key Comment: + Key Name: speed Key mdType: 0x00000404 Key Value: 55.550 Key Comment: Contents of metadata table: - Key Name: comment Key mdType: 14 Key Value: Key Comment: - Key Name: comment Key mdType: 5 Key Value: This Key Comment: - Key Name: comment Key mdType: 5 Key Value: is Key Comment: - Key Name: comment Key mdType: 5 Key Value: an Key Comment: - Key Name: comment Key mdType: 5 Key Value: ugly Key Comment: - Key Name: comment Key mdType: 5 Key Value: comment Key Comment: - Key Name: comment Key mdType: 5 Key Value: but Key Comment: - Key Name: comment Key mdType: 5 Key Value: still Key Comment: - Key Name: comment Key mdType: 5 Key Value: valid Key Comment: - Key Name: title2 Key mdType: 5 Key Value: Good bye world Key Comment: STRING or STR may be used as the string type - Key Name: time Key mdType: 1 Key Value: 1234.568 Key Comment: - Key Name: negatives Key mdType: 6 Bad type: 6 Key Comment: - Key Name: pi Key mdType: 2 Key Value: 3.142 Key Comment: Definition of pi - Key Name: myBool Key mdType: 3 Key Value: 0 Key Comment: F, f, 0, T, t, 1 are also acceptable - Key Name: primes Key mdType: 6 Bad type: 6 Key Comment: These are prime numbers - Key Name: altitude Key mdType: 0 Key Value: 10000 Key Comment: - Key Name: speed Key mdType: 1 Key Value: 55.550 Key Comment: - Key Name: title1 Key mdType: 5 Key Value: Hello world Key Comment: This is a comment for the string value + Key Name: comment Key mdType: 0x0001000a Key Value: Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: This Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: is Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: an Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: ugly Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: comment Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: but Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: still Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: valid Key Comment: + Key Name: title2 Key mdType: 0x00010001 Key Value: Good bye world Key Comment: STRING or STR may be used as the string type + Key Name: time Key mdType: 0x00000404 Key Value: 1234.568 Key Comment: + Key Name: negatives Key mdType: 0x00010002 Key Value: [-1,-2,-3,...] Key Comment: + Key Name: pi Key mdType: 0x00000408 Key Value: 3.142 Key Comment: Definition of pi + Key Name: myBool Key mdType: 0x00001301 Key Value: 0 Key Comment: F, f, 0, T, t, 1 are also acceptable + Key Name: primes Key mdType: 0x00010002 Key Value: [2,3,5,7,...] Key Comment: These are prime numbers + Key Name: altitude Key mdType: 0x00000104 Key Value: 10000 Key Comment: + Key Name: speed Key mdType: 0x00000404 Key Value: 55.550 Key Comment: + Key Name: title1 Key mdType: 0x00010001 Key Value: Hello world Key Comment: This is a comment for the string value ---> TESTPOINT PASSED (psMetadata{Test B - Read config file with overwrite set false} | tst_psMetadataIO.c) @@ -101,41 +101,41 @@ Failed lines: 6 Expected: 6 Contents of metadata list: - Key Name: pi Key mdType: 2 Key Value: 3.142 Key Comment: Definition of pi - Key Name: altitude Key mdType: 0 Key Value: 10000 Key Comment: - Key Name: time Key mdType: 1 Key Value: 1234.568 Key Comment: - Key Name: myBool Key mdType: 3 Key Value: 0 Key Comment: F, f, 0, T, t, 1 are also acceptable - Key Name: title1 Key mdType: 5 Key Value: Hello world Key Comment: This is a comment for the string value - Key Name: title2 Key mdType: 5 Key Value: Good bye world Key Comment: STRING or STR may be used as the string type - Key Name: primes Key mdType: 6 Bad type: 6 Key Comment: These are prime numbers - Key Name: negatives Key mdType: 6 Bad type: 6 Key Comment: - Key Name: comment Key mdType: 5 Key Value: This Key Comment: - Key Name: comment Key mdType: 5 Key Value: is Key Comment: - Key Name: comment Key mdType: 5 Key Value: an Key Comment: - Key Name: comment Key mdType: 5 Key Value: ugly Key Comment: - Key Name: comment Key mdType: 5 Key Value: comment Key Comment: - Key Name: comment Key mdType: 5 Key Value: but Key Comment: - Key Name: comment Key mdType: 5 Key Value: still Key Comment: - Key Name: comment Key mdType: 5 Key Value: valid Key Comment: - Key Name: speed Key mdType: 1 Key Value: 66.660 Key Comment: + Key Name: pi Key mdType: 0x00000408 Key Value: 3.142 Key Comment: Definition of pi + Key Name: altitude Key mdType: 0x00000104 Key Value: 10000 Key Comment: + Key Name: time Key mdType: 0x00000404 Key Value: 1234.568 Key Comment: + Key Name: myBool Key mdType: 0x00001301 Key Value: 0 Key Comment: F, f, 0, T, t, 1 are also acceptable + Key Name: title1 Key mdType: 0x00010001 Key Value: Hello world Key Comment: This is a comment for the string value + Key Name: title2 Key mdType: 0x00010001 Key Value: Good bye world Key Comment: STRING or STR may be used as the string type + Key Name: primes Key mdType: 0x00010002 Key Value: [2,3,5,7,...] Key Comment: These are prime numbers + Key Name: negatives Key mdType: 0x00010002 Key Value: [-1,-2,-3,...] Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: This Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: is Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: an Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: ugly Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: comment Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: but Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: still Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: valid Key Comment: + Key Name: speed Key mdType: 0x00000404 Key Value: 66.660 Key Comment: Contents of metadata table: - Key Name: comment Key mdType: 14 Key Value: Key Comment: - Key Name: comment Key mdType: 5 Key Value: This Key Comment: - Key Name: comment Key mdType: 5 Key Value: is Key Comment: - Key Name: comment Key mdType: 5 Key Value: an Key Comment: - Key Name: comment Key mdType: 5 Key Value: ugly Key Comment: - Key Name: comment Key mdType: 5 Key Value: comment Key Comment: - Key Name: comment Key mdType: 5 Key Value: but Key Comment: - Key Name: comment Key mdType: 5 Key Value: still Key Comment: - Key Name: comment Key mdType: 5 Key Value: valid Key Comment: - Key Name: title2 Key mdType: 5 Key Value: Good bye world Key Comment: STRING or STR may be used as the string type - Key Name: time Key mdType: 1 Key Value: 1234.568 Key Comment: - Key Name: negatives Key mdType: 6 Bad type: 6 Key Comment: - Key Name: pi Key mdType: 2 Key Value: 3.142 Key Comment: Definition of pi - Key Name: myBool Key mdType: 3 Key Value: 0 Key Comment: F, f, 0, T, t, 1 are also acceptable - Key Name: primes Key mdType: 6 Bad type: 6 Key Comment: These are prime numbers - Key Name: altitude Key mdType: 0 Key Value: 10000 Key Comment: - Key Name: speed Key mdType: 1 Key Value: 66.660 Key Comment: - Key Name: title1 Key mdType: 5 Key Value: Hello world Key Comment: This is a comment for the string value + Key Name: comment Key mdType: 0x0001000a Key Value: Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: This Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: is Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: an Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: ugly Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: comment Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: but Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: still Key Comment: + Key Name: comment Key mdType: 0x00010001 Key Value: valid Key Comment: + Key Name: title2 Key mdType: 0x00010001 Key Value: Good bye world Key Comment: STRING or STR may be used as the string type + Key Name: time Key mdType: 0x00000404 Key Value: 1234.568 Key Comment: + Key Name: negatives Key mdType: 0x00010002 Key Value: [-1,-2,-3,...] Key Comment: + Key Name: pi Key mdType: 0x00000408 Key Value: 3.142 Key Comment: Definition of pi + Key Name: myBool Key mdType: 0x00001301 Key Value: 0 Key Comment: F, f, 0, T, t, 1 are also acceptable + Key Name: primes Key mdType: 0x00010002 Key Value: [2,3,5,7,...] Key Comment: These are prime numbers + Key Name: altitude Key mdType: 0x00000104 Key Value: 10000 Key Comment: + Key Name: speed Key mdType: 0x00000404 Key Value: 66.660 Key Comment: + Key Name: title1 Key mdType: 0x00010001 Key Value: Hello world Key Comment: This is a comment for the string value ---> TESTPOINT PASSED (psMetadata{Test C - Read config file without auto-allocation of metadata} | tst_psMetadataIO.c) Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout =================================================================== --- /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout (revision 3406) +++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout (revision 3407) @@ -6,17 +6,18 @@ Contents of metadata list: - Key Name: SIMPLE Key mdType: 3 Key Value: 1 Key Comment: file does conform to FITS standard - Key Name: BITPIX Key mdType: 0 Key Value: 8 Key Comment: number of bits per data pixel - Key Name: NAXIS Key mdType: 0 Key Value: 0 Key Comment: number of data axes - Key Name: HISTORY Key mdType: 5 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: SIMPLE Key mdType: 0x00001301 Key Value: 1 Key Comment: file does conform to FITS standard + Key Name: BITPIX Key mdType: 0x00000104 Key Value: 8 Key Comment: number of bits per data pixel + Key Name: NAXIS Key mdType: 0x00000104 Key Value: 0 Key Comment: number of data axes + Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T Contents of metadata table: - Key Name: NAXIS Key mdType: 0 Key Value: 0 Key Comment: number of data axes - Key Name: SIMPLE Key mdType: 3 Key Value: 1 Key Comment: file does conform to FITS standard - Key Name: BITPIX Key mdType: 0 Key Value: 8 Key Comment: number of bits per data pixel - Key Name: HISTORY Key mdType: 5 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: NAXIS Key mdType: 0x00000104 Key Value: 0 Key Comment: number of data axes + Key Name: SIMPLE Key mdType: 0x00001301 Key Value: 1 Key Comment: file does conform to FITS standard + Key Name: BITPIX Key mdType: 0x00000104 Key Value: 8 Key Comment: number of bits per data pixel + Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T ---> TESTPOINT PASSED (psMetadata{Test A - Read 1st hdr from simple FITS file} | tst_psMetadata_01.c) +ID=34 /***************************** TESTPOINT ******************************************\ * TestFile: tst_psMetadata_01.c * @@ -26,35 +27,36 @@ Contents of metadata list: - Key Name: XTENSION Key mdType: 5 Key Value: 'IMAGE ' Key Comment: IMAGE extension - Key Name: BITPIX Key mdType: 0 Key Value: -64 Key Comment: number of bits per data pixel - Key Name: NAXIS Key mdType: 0 Key Value: 1 Key Comment: number of data axes - Key Name: NAXIS1 Key mdType: 0 Key Value: 64 Key Comment: length of data axis 1 - Key Name: PCOUNT Key mdType: 0 Key Value: 0 Key Comment: required keyword; must = 0 - Key Name: GCOUNT Key mdType: 0 Key Value: 1 Key Comment: required keyword; must = 1 - Key Name: BITPIX Key mdType: 0 Key Value: -64 Key Comment: number of bits per data pixel - Key Name: EXTNAME Key mdType: 5 Key Value: 'MY_DATA_1' Key Comment: - Key Name: HISTORY Key mdType: 5 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 5 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 5 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 5 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: XTENSION Key mdType: 0x00010001 Key Value: 'IMAGE ' Key Comment: IMAGE extension + Key Name: BITPIX Key mdType: 0x00000104 Key Value: -64 Key Comment: number of bits per data pixel + Key Name: NAXIS Key mdType: 0x00000104 Key Value: 1 Key Comment: number of data axes + Key Name: NAXIS1 Key mdType: 0x00000104 Key Value: 64 Key Comment: length of data axis 1 + Key Name: PCOUNT Key mdType: 0x00000104 Key Value: 0 Key Comment: required keyword; must = 0 + Key Name: GCOUNT Key mdType: 0x00000104 Key Value: 1 Key Comment: required keyword; must = 1 + Key Name: BITPIX Key mdType: 0x00000104 Key Value: -64 Key Comment: number of bits per data pixel + Key Name: EXTNAME Key mdType: 0x00010001 Key Value: 'MY_DATA_1' Key Comment: + Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T Contents of metadata table: - Key Name: NAXIS Key mdType: 0 Key Value: 1 Key Comment: number of data axes - Key Name: NAXIS1 Key mdType: 0 Key Value: 64 Key Comment: length of data axis 1 - Key Name: PCOUNT Key mdType: 0 Key Value: 0 Key Comment: required keyword; must = 0 - Key Name: XTENSION Key mdType: 5 Key Value: 'IMAGE ' Key Comment: IMAGE extension - Key Name: BITPIX Key mdType: 14 Key Value: Key Comment: - Key Name: BITPIX Key mdType: 0 Key Value: -64 Key Comment: number of bits per data pixel - Key Name: BITPIX Key mdType: 0 Key Value: -64 Key Comment: number of bits per data pixel - Key Name: GCOUNT Key mdType: 0 Key Value: 1 Key Comment: required keyword; must = 1 - Key Name: HISTORY Key mdType: 14 Key Value: Key Comment: - Key Name: HISTORY Key mdType: 5 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 5 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 5 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 5 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: EXTNAME Key mdType: 5 Key Value: 'MY_DATA_1' Key Comment: + Key Name: NAXIS Key mdType: 0x00000104 Key Value: 1 Key Comment: number of data axes + Key Name: NAXIS1 Key mdType: 0x00000104 Key Value: 64 Key Comment: length of data axis 1 + Key Name: PCOUNT Key mdType: 0x00000104 Key Value: 0 Key Comment: required keyword; must = 0 + Key Name: XTENSION Key mdType: 0x00010001 Key Value: 'IMAGE ' Key Comment: IMAGE extension + Key Name: BITPIX Key mdType: 0x0001000a Key Value: Key Comment: + Key Name: BITPIX Key mdType: 0x00000104 Key Value: -64 Key Comment: number of bits per data pixel + Key Name: BITPIX Key mdType: 0x00000104 Key Value: -64 Key Comment: number of bits per data pixel + Key Name: GCOUNT Key mdType: 0x00000104 Key Value: 1 Key Comment: required keyword; must = 1 + Key Name: HISTORY Key mdType: 0x0001000a Key Value: Key Comment: + Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: EXTNAME Key mdType: 0x00010001 Key Value: 'MY_DATA_1' Key Comment: ---> TESTPOINT PASSED (psMetadata{Test B - Read 2nd hdr from complex FITS file} | tst_psMetadata_01.c) +ID=138 /***************************** TESTPOINT ******************************************\ * TestFile: tst_psMetadata_01.c * @@ -64,25 +66,25 @@ Contents of metadata list: - Key Name: XTENSION Key mdType: 5 Key Value: 'IMAGE ' Key Comment: IMAGE extension - Key Name: BITPIX Key mdType: 0 Key Value: -64 Key Comment: number of bits per data pixel - Key Name: NAXIS Key mdType: 0 Key Value: 1 Key Comment: number of data axes - Key Name: NAXIS1 Key mdType: 0 Key Value: 64 Key Comment: length of data axis 1 - Key Name: PCOUNT Key mdType: 0 Key Value: 0 Key Comment: required keyword; must = 0 - Key Name: GCOUNT Key mdType: 0 Key Value: 1 Key Comment: required keyword; must = 1 - Key Name: EXTNAME Key mdType: 5 Key Value: 'MY_DATA_2' Key Comment: - Key Name: HISTORY Key mdType: 5 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 5 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: XTENSION Key mdType: 0x00010001 Key Value: 'IMAGE ' Key Comment: IMAGE extension + Key Name: BITPIX Key mdType: 0x00000104 Key Value: -64 Key Comment: number of bits per data pixel + Key Name: NAXIS Key mdType: 0x00000104 Key Value: 1 Key Comment: number of data axes + Key Name: NAXIS1 Key mdType: 0x00000104 Key Value: 64 Key Comment: length of data axis 1 + Key Name: PCOUNT Key mdType: 0x00000104 Key Value: 0 Key Comment: required keyword; must = 0 + Key Name: GCOUNT Key mdType: 0x00000104 Key Value: 1 Key Comment: required keyword; must = 1 + Key Name: EXTNAME Key mdType: 0x00010001 Key Value: 'MY_DATA_2' Key Comment: + Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T Contents of metadata table: - Key Name: NAXIS Key mdType: 0 Key Value: 1 Key Comment: number of data axes - Key Name: NAXIS1 Key mdType: 0 Key Value: 64 Key Comment: length of data axis 1 - Key Name: PCOUNT Key mdType: 0 Key Value: 0 Key Comment: required keyword; must = 0 - Key Name: XTENSION Key mdType: 5 Key Value: 'IMAGE ' Key Comment: IMAGE extension - Key Name: GCOUNT Key mdType: 0 Key Value: 1 Key Comment: required keyword; must = 1 - Key Name: BITPIX Key mdType: 0 Key Value: -64 Key Comment: number of bits per data pixel - Key Name: HISTORY Key mdType: 14 Key Value: Key Comment: - Key Name: HISTORY Key mdType: 5 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 5 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: EXTNAME Key mdType: 5 Key Value: 'MY_DATA_2' Key Comment: + Key Name: NAXIS Key mdType: 0x00000104 Key Value: 1 Key Comment: number of data axes + Key Name: NAXIS1 Key mdType: 0x00000104 Key Value: 64 Key Comment: length of data axis 1 + Key Name: PCOUNT Key mdType: 0x00000104 Key Value: 0 Key Comment: required keyword; must = 0 + Key Name: XTENSION Key mdType: 0x00010001 Key Value: 'IMAGE ' Key Comment: IMAGE extension + Key Name: GCOUNT Key mdType: 0x00000104 Key Value: 1 Key Comment: required keyword; must = 1 + Key Name: BITPIX Key mdType: 0x00000104 Key Value: -64 Key Comment: number of bits per data pixel + Key Name: HISTORY Key mdType: 0x0001000a Key Value: Key Comment: + Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: EXTNAME Key mdType: 0x00010001 Key Value: 'MY_DATA_2' Key Comment: ---> TESTPOINT PASSED (psMetadata{Test C - Read named hdr from complex FITS file} | tst_psMetadata_01.c) @@ -97,20 +99,20 @@ Contents of metadata list: - Key Name: XTENSION Key mdType: 5 Key Value: 'IMAGE ' Key Comment: IMAGE extension - Key Name: BITPIX Key mdType: 0 Key Value: -64 Key Comment: number of bits per data pixel - Key Name: NAXIS Key mdType: 0 Key Value: 1 Key Comment: number of data axes - Key Name: NAXIS1 Key mdType: 0 Key Value: 64 Key Comment: length of data axis 1 - Key Name: PCOUNT Key mdType: 0 Key Value: 0 Key Comment: required keyword; must = 0 - Key Name: GCOUNT Key mdType: 0 Key Value: 1 Key Comment: required keyword; must = 1 - Key Name: EXTNAME Key mdType: 5 Key Value: 'MY_DATA_2' Key Comment: + Key Name: XTENSION Key mdType: 0x00010001 Key Value: 'IMAGE ' Key Comment: IMAGE extension + Key Name: BITPIX Key mdType: 0x00000104 Key Value: -64 Key Comment: number of bits per data pixel + Key Name: NAXIS Key mdType: 0x00000104 Key Value: 1 Key Comment: number of data axes + Key Name: NAXIS1 Key mdType: 0x00000104 Key Value: 64 Key Comment: length of data axis 1 + Key Name: PCOUNT Key mdType: 0x00000104 Key Value: 0 Key Comment: required keyword; must = 0 + Key Name: GCOUNT Key mdType: 0x00000104 Key Value: 1 Key Comment: required keyword; must = 1 + Key Name: EXTNAME Key mdType: 0x00010001 Key Value: 'MY_DATA_2' Key Comment: Contents of metadata table: - Key Name: NAXIS Key mdType: 0 Key Value: 1 Key Comment: number of data axes - Key Name: NAXIS1 Key mdType: 0 Key Value: 64 Key Comment: length of data axis 1 - Key Name: PCOUNT Key mdType: 0 Key Value: 0 Key Comment: required keyword; must = 0 - Key Name: XTENSION Key mdType: 5 Key Value: 'IMAGE ' Key Comment: IMAGE extension - Key Name: GCOUNT Key mdType: 0 Key Value: 1 Key Comment: required keyword; must = 1 - Key Name: BITPIX Key mdType: 0 Key Value: -64 Key Comment: number of bits per data pixel - Key Name: EXTNAME Key mdType: 5 Key Value: 'MY_DATA_2' Key Comment: + Key Name: NAXIS Key mdType: 0x00000104 Key Value: 1 Key Comment: number of data axes + Key Name: NAXIS1 Key mdType: 0x00000104 Key Value: 64 Key Comment: length of data axis 1 + Key Name: PCOUNT Key mdType: 0x00000104 Key Value: 0 Key Comment: required keyword; must = 0 + Key Name: XTENSION Key mdType: 0x00010001 Key Value: 'IMAGE ' Key Comment: IMAGE extension + Key Name: GCOUNT Key mdType: 0x00000104 Key Value: 1 Key Comment: required keyword; must = 1 + Key Name: BITPIX Key mdType: 0x00000104 Key Value: -64 Key Comment: number of bits per data pixel + Key Name: EXTNAME Key mdType: 0x00010001 Key Value: 'MY_DATA_2' Key Comment: ---> TESTPOINT PASSED (psMetadata{Test D - Remove items with same name from all metadata} | tst_psMetadata_01.c) Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr =================================================================== --- /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr (revision 3406) +++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr (revision 3407) @@ -4,5 +4,5 @@ Unallowable operation: name is NULL.