Commit in gdml2/CPPGDML on MAIN | |||
ac.sh | +2 | -1 | 1.2 -> 1.3 |
aclocal.m4 | +5 | -6 | 1.1.1.1 -> 1.2 |
config.guess | +680 | -506 | 1.1.1.1 -> 1.2 |
config.sub | +426 | -103 | 1.1.1.1 -> 1.2 |
configure | +2694 | -4457 | 1.1.1.1 -> 1.2 |
configure.in | +30 | -31 | 1.1.1.1 -> 1.2 |
Examples/setup.csh | +2 | -2 | 1.2 -> 1.3 |
Examples/SimpleExtension/DetectorConstruction.cpp | +1 | -3 | 1.1.1.1 -> 1.2 |
/GNUmakefile | +1 | -1 | 1.1.1.1 -> 1.2 |
/volumeExtendedSubscriber.cpp | +4 | -4 | 1.1.1.1 -> 1.2 |
Examples/g4N02gdml/ExN02PhysicsList.cpp | +7 | -5 | 1.1.1.1 -> 1.2 |
/GNUmakefile | +1 | -1 | 1.1.1.1 -> 1.2 |
Examples/g4gogdml/GNUmakefile | +1 | -1 | 1.1.1.1 -> 1.2 |
/gogdmlDetectorConstruction.cpp | +1 | -3 | 1.1.1.1 -> 1.2 |
G4Binding/G4Evaluator/GNUmakefile | +1 | -1 | 1.1.1.1 -> 1.2 |
G4Binding/G4Processor/GNUmakefile | +1 | -1 | 1.1.1.1 -> 1.2 |
G4Binding/G4Subscribers/GNUmakefile | +1 | -1 | 1.1.1.1 -> 1.2 |
G4Binding/G4Writer/GNUmakefile | +1 | -1 | 1.1.1.1 -> 1.2 |
config/autoconf/geant4.m4 | +30 | -30 | 1.1.1.1 -> 1.2 |
config/make/local_settings.gmk.in | +5 | -5 | 1.1.1.1 -> 1.2 |
config/make/ext/geant4.gmk | +5 | -2 | 1.1.1.1 -> 1.2 |
/geant4_global_libs.gmk | +31 | -18 | 1.1.1.1 -> 1.2 |
+3930 | -5183 |
update GDML to use Geant4 with internal CLHEP library; fix compile errors in examples; use Geant4 global libs instead of granular
diff -u -r1.2 -r1.3 --- ac.sh 9 Apr 2013 00:22:44 -0000 1.2 +++ ac.sh 9 Apr 2013 21:21:43 -0000 1.3 @@ -1,6 +1,7 @@
rm -rf autom4te.cache &> /dev/null #autoconf -f -v -o configure configure.in
-autoconf --warnings=all -d -f -v -o configure configure.in
+#autoconf --warnings=all -d -f -v -o configure configure.in
+autoconf -o configure configure.in
# # Fix up silly error where Autoconf uses functions before they are defined.
diff -u -r1.1.1.1 -r1.2 --- aclocal.m4 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ aclocal.m4 9 Apr 2013 21:21:43 -0000 1.2 @@ -1,6 +1,5 @@
-# include GDML m4 macros -builtin(include, config/autoconf/util.m4) -builtin(include, config/autoconf/gdml.m4) -builtin(include, config/autoconf/geant4.m4) -builtin(include, config/autoconf/clhep.m4) -builtin(include, config/autoconf/xerces.m4)
+builtin([include], [config/autoconf/util.m4]) +builtin([include], [config/autoconf/gdml.m4]) +builtin([include], [config/autoconf/geant4.m4]) +dnl builtin([include], [config/autoconf/clhep.m4]) +builtin([include], [config/autoconf/xerces.m4])
diff -u -r1.1.1.1 -r1.2 --- config.guess 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ config.guess 9 Apr 2013 21:21:43 -0000 1.2 @@ -1,9 +1,10 @@
#! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2002-09-03'
+timestamp='2012-09-25'
# This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by
@@ -16,24 +17,24 @@
# General Public License for more details. # # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner <[log in to unmask]>. -# Please send patches to <[log in to unmask]>. Submit a context -# diff and a properly formatted ChangeLog entry.
+ +# Originally written by Per Bothner. Please send patches (context +# diff format) to <[log in to unmask]> and include a ChangeLog +# entry.
# # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. #
-# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type.
+# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -53,7 +54,8 @@
GNU config.guess ($timestamp) 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO
@@ -66,11 +68,11 @@
while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing shift; break ;; - ) # Use stdin as input.
@@ -98,30 +100,32 @@
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated.
-# This shell variable is my proudest work .. or something. --bje
+# Portable tmp directory creation inspired by the Autoconf team.
-set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; -(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) - || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; -dummy=$tmpdir/dummy ; -files="$dummy.c $dummy.o $dummy.rel $dummy" ; -trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
+set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$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 ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > $dummy.c ; for c in cc gcc c89 c99 ; do
- if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then
+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ; fi ; done ;
- rm -f $files ;
if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ; -unset files'
+esac ; set_cc_for_build= ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe. # ([log in to unmask] 1994-08-24)
@@ -139,7 +143,7 @@
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward
@@ -156,6 +160,7 @@
arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched
@@ -164,7 +169,7 @@
arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
+ | grep -q __ELF__
then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX?
@@ -174,148 +179,139 @@
fi ;; *)
- os=netbsd
+ os=netbsd
;; esac # The OS release
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}"
- exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;;
+ exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;;
*:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;;
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;;
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 <<EOF >$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 $dummy.s -o $dummy 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 - rm -f $dummy.s $dummy && rmdir $tmpdir - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;;
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;;
Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix
- exit 0 ;;
+ exit ;;
21064:Windows_NT:50:3) echo alpha-dec-winnt3.5
- exit 0 ;;
+ exit ;;
Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4
- exit 0;;
+ exit ;;
*:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
+ exit ;;
*:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos
- exit 0 ;;
+ exit ;;
*:OS/390:*:*) echo i370-ibm-openedition
- exit 0 ;;
+ exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
+ exit ;; + arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp
- exit 0;;
+ exit ;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # [log in to unmask] (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -323,29 +319,51 @@
else echo pyramid-pyramid-bsd fi
- exit 0 ;;
+ exit ;;
NILE*:*:*:dcosx) echo pyramid-pyramid-svr4
- exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*)
+ exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7 && exit 0 ;;
+ sparc) echo sparc-icl-nx7; exit ;;
esac ;;
+ s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;;
sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;;
+ exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;;
sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*)
@@ -354,10 +372,10 @@
esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit 0 ;;
+ exit ;;
sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -369,10 +387,10 @@
echo sparc-sun-sunos${UNAME_RELEASE} ;; esac
- exit 0 ;;
+ exit ;;
aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
# The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor
@@ -382,38 +400,41 @@
# MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;;
+ echo m68k-atari-mint${UNAME_RELEASE} + exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;;
+ echo m68k-atari-mint${UNAME_RELEASE} + exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;;
+ echo m68k-milan-mint${UNAME_RELEASE} + exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;;
+ echo m68k-hades-mint${UNAME_RELEASE} + exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;;
+ echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;;
powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3
- exit 0 ;;
+ exit ;;
RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c
@@ -437,36 +458,36 @@
exit (-1); } EOF
- $CC_FOR_BUILD $dummy.c -o $dummy \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir
+ $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; }
echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax
- exit 0 ;;
+ exit ;;
Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax
- exit 0 ;; - Night_Hawk:*:*:PowerMAX_OS)
+ exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix
- exit 0 ;;
+ exit ;;
m88k:CX/UX:7*:*) echo m88k-harris-cxux7
- exit 0 ;;
+ exit ;;
m88k:*:4*:R4*) echo m88k-motorola-sysv4
- exit 0 ;;
+ exit ;;
m88k:*:3*:R3*) echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p`
+ # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p`
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -479,29 +500,29 @@
else echo i586-dg-dgux${UNAME_RELEASE} fi
- exit 0 ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3
- exit 0 ;;
+ exit ;;
M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3
- exit 0 ;;
+ exit ;;
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd
- exit 0 ;;
+ exit ;;
*:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit 0 ;;
+ exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
i*86:AIX:*:*) echo i386-ibm-aix
- exit 0 ;;
+ exit ;;
ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel`
@@ -509,7 +530,7 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build
@@ -524,16 +545,19 @@
exit(0); } EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir - echo rs6000-ibm-aix3.2.5
+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi
- exit 0 ;; - *:AIX:*:[45])
+ exit ;; + *:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000
@@ -546,28 +570,28 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:*:*) echo rs6000-ibm-aix
- exit 0 ;;
+ exit ;;
ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4
- exit 0 ;;
+ exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit 0 ;; # report: romp-ibm BSD 4.3
+ exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*) echo rs6000-bull-bosx
- exit 0 ;;
+ exit ;;
DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3
- exit 0 ;;
+ exit ;;
9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd
- exit 0 ;;
+ exit ;;
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4
- exit 0 ;;
+ exit ;;
9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in
@@ -576,64 +600,84 @@
9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;;
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;; - esac
+ esac ;; + esac
fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ sed 's/^ //' << EOF >$dummy.c
- #define _HPUX_SOURCE - #include <stdlib.h> - #include <unistd.h> - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - }
+ #define _HPUX_SOURCE + #include <stdlib.h> + #include <unistd.h> + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + }
EOF
- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy && rmdir $tmpdir
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;; esac
+ if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c
@@ -661,186 +705,269 @@
exit (0); } EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir
+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
- exit 0 ;;
+ exit ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd
- exit 0 ;;
+ exit ;;
9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd
- exit 0 ;;
+ exit ;;
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix
- exit 0 ;;
+ exit ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf
- exit 0 ;;
+ exit ;;
hp8??:OSF1:*:*) echo hppa1.0-hp-osf
- exit 0 ;;
+ exit ;;
i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi
- exit 0 ;;
+ exit ;;
parisc*:Lites*:*:*) echo hppa1.1-hp-lites
- exit 0 ;;
+ exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi
- exit 0 ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;;
+ exit ;;
CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;;
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 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 ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:FreeBSD:*:*)
- # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <features.h> - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;;
+ UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;;
i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin
- exit 0 ;; - i*:MINGW*:*)
+ exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; + *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
- exit 0 ;;
+ exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;;
i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32
- exit 0 ;; - x86:Interix*:3*) - echo i386-pc-interix3[truncated at 1000 lines; 780 more skipped]
diff -u -r1.1.1.1 -r1.2 --- config.sub 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ config.sub 9 Apr 2013 21:21:43 -0000 1.2 @@ -1,9 +1,10 @@
#! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2002-09-05'
+timestamp='2012-12-06'
# This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software
@@ -20,23 +21,25 @@
# GNU General Public License for more details. # # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. -
+# along with this program; if not, see <http://www.gnu.org/licenses/>. +#
# As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program.
+
# Please send patches to <[log in to unmask]>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
# # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed.
+# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +
# This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software.
@@ -70,7 +73,8 @@
version="\ 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO
@@ -83,11 +87,11 @@
while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing shift; break ;; - ) # Use stdin as input.
@@ -99,7 +103,7 @@
*local*) # First pass through any local machine types. echo $1
- exit 0;;
+ exit ;;
* ) break ;;
@@ -118,10 +122,18 @@
# Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in
- nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;;
+ android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;;
*) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ]
@@ -144,10 +156,13 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis)
+ -apple | -axis | -knuth | -cray | -microblaze*)
os= basic_machine=$1 ;;
+ -bluegene*) + os=-cnk + ;;
-sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1
@@ -162,13 +177,17 @@
os=-chorusos basic_machine=$1 ;;
- -chorusrdb) - os=-chorusrdb
+ -chorusrdb) + os=-chorusrdb
basic_machine=$1
- ;;
+ ;;
-hiux*) os=-hiuxwe2 ;;
+ -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;;
-sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -185,6 +204,10 @@
# Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;;
+ -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;;
-sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -202,6 +225,12 @@
-isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;;
+ -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;;
-lynx*) os=-lynxos ;;
@@ -226,53 +255,105 @@
# Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | clipper \
+ | am33_2.0 \ + | arc \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ + | bfin \ + | c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | epiphany \ + | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
| i370 | i860 | i960 | ia64 \
- | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \
+ | ip2k | iq2000 \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \
- | mips64vr | mips64vrel \
+ | mips64octeon | mips64octeonel \
| mips64orion | mips64orionel \
+ | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \
| mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \
+ | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 \
| ns16k | ns32k \
- | openrisc | or32 \
+ | open8 \ + | or32 \
| pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
- | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic80 | tron \ - | v850 | v850e \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
- | x86 | xscale | xstormy16 | xtensa \ - | z8k)
+ | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80)
basic_machine=$basic_machine-unknown ;;
- m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12.
+ c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown os=-none ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;;
+ ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;;
# We use `pc' rather than `unknown' # because (1) that's what they normally are, and
@@ -288,54 +369,81 @@
# Recognize the basic CPU types with company name. 580-* \ | a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \ - | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ - | clipper-* | cydra-* \
+ | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \ | elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* \ - | m32r-* \
+ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \
- | mips64vr-* | mips64vrel-* \
+ | mips64octeon-* | mips64octeonel-* \
| mips64orion-* | mips64orionel-* \
+ | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \
| mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \
+ | mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipstx39 | mipstx39el \
+ | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
| orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+ | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | 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-* \ - | v850-* | v850e-* | vax-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \
| ymp-* \
- | z8k-*)
+ | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown
;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS.
@@ -353,6 +461,9 @@
basic_machine=a29k-amd os=-udi ;;
+ abacus) + basic_machine=abacus-unknown + ;;
adobe68k) basic_machine=m68010-adobe os=-scout
@@ -367,6 +478,12 @@
basic_machine=a29k-none os=-bsd ;;
+ amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;;
amdahl) basic_machine=580-amdahl os=-sysv
@@ -390,6 +507,10 @@
basic_machine=m68k-apollo os=-bsd ;;
+ aros) + basic_machine=i386-pc + os=-aros + ;;
aux) basic_machine=m68k-apple os=-aux
@@ -398,10 +519,35 @@
basic_machine=ns32k-sequent os=-dynix ;;
+ blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;;
c90) basic_machine=c90-cray os=-unicos ;;
+ cegcc) + basic_machine=arm-unknown + os=-cegcc + ;;
convex-c1) basic_machine=c1-convex os=-bsd
@@ -426,12 +572,27 @@
basic_machine=j90-cray os=-unicos ;;
+ craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;;
crds | unos) basic_machine=m68k-crds ;;
+ crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;;
cris | cris-* | etrax*) basic_machine=cris-axis ;;
+ crx) + basic_machine=crx-unknown + os=-elf + ;;
da30 | da30-*) basic_machine=m68k-da30 ;;
@@ -454,6 +615,14 @@
basic_machine=m88k-motorola os=-sysv3 ;;
+ dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;;
dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx
@@ -565,7 +734,6 @@
i370-ibm* | ibm*) basic_machine=i370-ibm ;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32
@@ -604,6 +772,14 @@
basic_machine=m68k-isi os=-sysv ;;
+ m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;;
m88k-omron*) basic_machine=m88k-omron ;;
@@ -615,10 +791,21 @@
basic_machine=ns32k-utek os=-sysv ;;
+ microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;;
mingw32) basic_machine=i386-pc os=-mingw32 ;;
+ mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;;
miniframe) basic_machine=m68000-convergent ;;
@@ -632,10 +819,6 @@
mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;;
- mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;;
monitor) basic_machine=m68k-rom68k os=-coff
@@ -648,10 +831,21 @@
basic_machine=i386-pc os=-msdos ;;
+ ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i386-pc + os=-msys + ;;
mvs) basic_machine=i370-ibm os=-mvs ;;
+ nacl) + basic_machine=le32-unknown + os=-nacl + ;;
ncr3000) basic_machine=i486-ncr os=-sysv4
@@ -716,6 +910,12 @@
np1) basic_machine=np1-gould ;;
+ neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;;
nsr-tandem) basic_machine=nsr-tandem ;;
@@ -723,9 +923,12 @@
basic_machine=hppa1.1-oki os=-proelf ;;
- or32 | or32-*)
+ openrisc | openrisc-*)
basic_machine=or32-unknown
- os=-coff
+ ;; + os400) + basic_machine=powerpc-ibm + os=-os400
;; OSE68000 | ose68000) basic_machine=m68000-ericsson
@@ -743,6 +946,14 @@
basic_machine=i860-intel os=-osf ;;
+ parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;;
pbd) basic_machine=sparc-tti ;;
@@ -752,32 +963,45 @@
pc532 | pc532-*) basic_machine=ns32k-pc532 ;;
+ pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;;
pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; pentiumpro | p6 | 6x86 | athlon | athlon_*) 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-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) 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) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;;
- ppc) basic_machine=powerpc-unknown
+ ppc | ppcbe) basic_machine=powerpc-unknown
;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown
@@ -802,6 +1026,14 @@
basic_machine=i586-unknown os=-pw32 ;;
+ rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;;
rom68k) basic_machine=m68k-rom68k os=-coff
@@ -828,6 +1060,14 @@
sb1el) basic_machine=mipsisa64sb1el-unknown ;;
+ sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;;
sequent) basic_machine=i386-sequent ;;
@@ -835,6 +1075,12 @@
basic_machine=sh-hitachi os=-hms ;;
+ sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;;
sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks
@@ -853,6 +1099,9 @@
basic_machine=i860-stratus os=-sysv4 ;;
+ strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;;
sun2) basic_machine=m68000-sun ;;
@@ -901,10 +1150,6 @@
basic_machine=i386-sequent os=-dynix ;;
- t3d) - basic_machine=alpha-cray - os=-unicos - ;;
t3e) basic_machine=alphaev5-cray os=-unicos
@@ -913,13 +1158,9 @@
basic_machine=t90-cray os=-unicos ;;
- tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff
+ tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu
;; tx39) basic_machine=mipstx39-unknown
@@ -934,6 +1175,10 @@
tower | tower-32) basic_machine=m68k-ncr ;;
+ tpf) + basic_machine=s390x-ibm + os=-tpf + ;;
udi29k) basic_machine=a29k-amd os=-udi
@@ -977,13 +1222,16 @@
basic_machine=hppa1.1-winbond os=-proelf ;;
- windows32) - basic_machine=i386-pc - os=-windows32-msvcrt
+ xbox) + basic_machine=i686-pc + os=-mingw32
;; xps | xps100) basic_machine=xps100-honeywell ;;
+ xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;;
ymp) basic_machine=ymp-cray os=-unicos
@@ -992,6 +1240,10 @@
basic_machine=z8k-unknown os=-sim ;;
+ z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;;
none) basic_machine=none-none os=-none
@@ -1011,6 +1263,9 @@
romp) basic_machine=romp-ibm ;;
+ mmix) + basic_machine=mmix-knuth + ;;
rs6000) basic_machine=rs6000-ibm ;;
@@ -1027,13 +1282,10 @@
we32k) basic_machine=we32k-att ;;
- sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown ;;
- sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun ;; cydra)
@@ -1077,9 +1329,12 @@
if [ x"$os" != x"" ] then case $os in
- # First match some system type aliases - # that might get confused with valid system types.
+ # First match some system type aliases + # that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
+ -auroraux) + os=-auroraux + ;;
-solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;;
@@ -1100,24 +1355,31 @@
# Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* \
+ | -aos* | -aros* \
| -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* \ + | -bitrig* | -openbsd* | -solidbsd* \ + | -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* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+ | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
# Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*)
@@ -1129,16 +1391,21 @@
;; esac ;;
+ -nto-qnx*) + ;;
-nto*)
- os=-nto-qnx
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;;
+ -linux-dietlibc) + os=-linux-dietlibc + ;;
-linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;;
@@ -1151,6 +1418,9 @@
-opened*) os=-openedition ;;
+ -os400*) + os=-os400 + ;;
-wince*) os=-wince ;;
@@ -1172,6 +1442,9 @@
-atheos*) os=-atheos ;;
+ -syllable*) + os=-syllable + ;;
-386bsd) os=-bsd ;;
@@ -1194,6 +1467,9 @@
-sinix*) os=-sysv4 ;;
+ -tpf*) + os=-tpf + ;;
-triton*) os=-sysv3 ;;
@@ -1224,6 +1500,20 @@
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;;
+ -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;;
-none) ;; *)
@@ -1246,6 +1536,12 @@
# system, and we'll never get to this point. case $basic_machine in
+ score-*) + os=-elf + ;; + spu-*) + os=-elf + ;;
*-acorn) os=-riscix1.2 ;;
@@ -1255,6 +1551,21 @@
arm*-semi) os=-aout ;;
+ c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;;
# This must come before the *-dec entry. pdp10-*) os=-tops20
@@ -1273,13 +1584,13 @@
;; m68000-sun) os=-sunos3
- # This also exists in the configure program, but was not the - # default. - # os=-sunos4
;; m68*-cisco) os=-aout ;;
+ mep-*) + os=-elf + ;;[truncated at 1000 lines; 53 more skipped]
diff -u -r1.1.1.1 -r1.2 --- configure 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ configure 9 Apr 2013 21:21:43 -0000 1.2 @@ -1,230 +1,472 @@
-#! /bin/sh
+#!/bin/sh + +as_fn_set_status () +{ + return +} + +as_fn_exit () +{ + set +e + as_fn_set_status + exit +}
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for CPPGDML 2.9.0.
+# Generated by GNU Autoconf 2.69 for CPPGDML 2.9.0.
# # Report bugs to <[log in to unmask]>. #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# +#
# This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ## -## M4sh Initialization. ## -## --------------------- ##
+## -------------------- ## +## M4sh Initialization. ## +## -------------------- ##
-# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi -DUALCASE=1; export DUALCASE # for MKS sh - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset
+ setopt NO_GLOB_SUBST
else
- as_unset=false
+ case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac
fi
-# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var
+as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n'
else
- $as_unset $as_var
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo'
fi
-done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false
+ export as_echo_body + as_echo='sh -c $as_echo_body as_echo'
fi
- -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits -
# The user is always right. if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh
+ PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + }
fi
- as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+ as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
+PS1='$ ' +PS2='> ' +PS4='+ '
- ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do - case $as_dir in
+ as_found=: + case $as_dir in #(
/*)
- if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac
+ for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +fi
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit
+ if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell [log in to unmask] and +$0: [log in to unmask] about your system, including +$0: any error possibly output before this message. Then +$0: install a modern shell, or manually run the script +$0: under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;}
}
+as_unset=as_fn_unset
+# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac
+ case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr
+ +} # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }'
else
- as_expr=false -fi
+ as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac
rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else
+if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then
as_ln_s='ln -s'
+ # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR'
fi
-elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else test -d ./-p && rmdir ./-p as_mkdir_p=false fi
-as_executable_p="test -f"
+as_test_x='test -x' +as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -233,38 +475,25 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH -
+test -n "$DJDIR" || exec 7<&0 </dev/null +exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
# so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-exec 6>&1 -
# # Initializations. # ac_default_prefix=/usr/local
+ac_clean_files=
ac_config_libobj_dir=.
+LIBOBJS=
cross_compiling=no subdirs= MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh} - -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38}
# Identity of this package. PACKAGE_NAME='CPPGDML'
@@ -272,51 +501,133 @@
PACKAGE_VERSION='2.9.0' PACKAGE_STRING='CPPGDML 2.9.0' [log in to unmask]
+PACKAGE_URL=''
ac_unique_file="G4Binding/G4Writer/src/G4GDMLWriter.cpp"
-# Factoring default headers for most tests. -ac_includes_default="\ -#include <stdio.h> -#if HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#if HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif -#if STDC_HEADERS -# include <stdlib.h> -# include <stddef.h> -#else -# if HAVE_STDLIB_H -# include <stdlib.h> -# endif -#endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H -# include <memory.h> -# endif -# include <string.h> -#endif -#if HAVE_STRINGS_H -# include <strings.h> -#endif -#if HAVE_INTTYPES_H -# include <inttypes.h> -#else -# if HAVE_STDINT_H -# include <stdint.h> -# endif -#endif -#if HAVE_UNISTD_H -# include <unistd.h> -#endif" - -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC COMPILER COMPILER_GMK_FILE COMPILE_VERBOSE_USE PLATFORM PLATFORM_GMK_FILE GDML_USE_SHARED_LIB GDML_USE_STATIC_LIB GDML_USE_SINGLE_LIB GDML_USE_GRANULAR_LIB TARGET_LIB_PREFIX BUILD_STEPWRT FLAT_INCLUDE GDML_BUILD_EXAMPLES XERCESC_LIBNAME XERCESC_PREFIX XERCESC_INCLUDE XERCESC_LIBDIR CLHEP_LIBNAME CLHEP_PREFIX CLHEP_INCLUDE CLHEP_LIBDIR GEANT4_FULL_VERSION GEANT4_MAJOR_VERSION GEANT4_MINOR_VERSION GEANT4_PATCH_VERSION G4SYSTEM GEANT4_USE_GRANULAR GEANT4_USE_GLOBAL GEANT4_PREFIX GEANT4_INCLUDE GEAN T4_LIBDIR C[...]
+ac_subst_vars='LTLIBOBJS +LIBOBJS +PWD +GEANT4_LIBDIR +GEANT4_INCLUDE +GEANT4_PREFIX +GEANT4_USE_GLOBAL +GEANT4_USE_GRANULAR +G4SYSTEM +GEANT4_PATCH_VERSION +GEANT4_MINOR_VERSION +GEANT4_MAJOR_VERSION +GEANT4_FULL_VERSION +XERCESC_LIBDIR +XERCESC_INCLUDE +XERCESC_PREFIX +XERCESC_LIBNAME +GDML_BUILD_EXAMPLES +FLAT_INCLUDE +BUILD_STEPWRT +TARGET_LIB_PREFIX +GDML_USE_GRANULAR_LIB +GDML_USE_SINGLE_LIB +GDML_USE_STATIC_LIB +GDML_USE_SHARED_LIB +PLATFORM_GMK_FILE +PLATFORM +COMPILE_VERBOSE_USE +COMPILER_GMK_FILE +COMPILER +OBJEXT +EXEEXT +ac_ct_CXX +CPPFLAGS +LDFLAGS +CXXFLAGS +CXX +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL'
ac_subst_files=''
+ac_user_opts=' +enable_option_checking +enable_compile_verbose +with_platform +enable_shared +enable_static +enable_single +enable_granular +with_libname_prefix +enable_gdml_verbose +enable_build_stepwrt +enable_flat_include +enable_examples +with_xercesc +with_xercesc_include +with_xercesc_libdir +with_xercesc_libname +with_geant4 +with_geant4_system +with_geant4_include +with_geant4_libdir +enable_geant4_granular_libs +enable_nist +' + ac_precious_vars='build_alias +host_alias +target_alias +CXX +CXXFLAGS +LDFLAGS +LIBS +CPPFLAGS +CCC' +
# Initialize some variables set by options. ac_init_help= ac_init_version=false
+ac_unrecognized_opts= +ac_unrecognized_sep=
# The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null
@@ -339,34 +650,49 @@
# and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
includedir='${prefix}/include' oldincludedir='/usr/include'
-infodir='${prefix}/info' -mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man'
ac_prev=
+ac_dashdash=
for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then
- eval "$ac_prev=\$ac_option"
+ eval $ac_prev=\$ac_option
ac_prev= continue fi
- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+ case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac
# Accept the important Cygnus configure options, so we can diagnose typos.
- case $ac_option in
+ case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;;
-bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;;
@@ -388,33 +714,59 @@
--config-cache | -C) cache_file=config.cache ;;
- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ -datadir | --datadir | --datadi | --datad)
ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*)
+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
datadir=$ac_optarg ;;
+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; +
-disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;;
-enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';;
esac
- eval "enable_$ac_feature='$ac_optarg'" ;;
+ eval enable_$ac_useropt=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \[Note: Some over-long lines of diff output only partialy shown] [truncated at 1000 lines; 7919 more skipped]
diff -u -r1.1.1.1 -r1.2 --- configure.in 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ configure.in 9 Apr 2013 21:21:43 -0000 1.2 @@ -1,56 +1,55 @@
-# $Header: /cvs/lcd/gdml2/CPPGDML/configure.in,v 1.1.1.1 2010/07/13 15:18:49 jeremy Exp $
+# $Header: /cvs/lcd/gdml2/CPPGDML/configure.in,v 1.2 2013/04/09 21:21:43 jeremy Exp $
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.57) -AC_INIT(CPPGDML, 2.9.0, [log in to unmask])
+AC_INIT([CPPGDML],[2.9.0],[[log in to unmask]]) + +AC_CANONICAL_HOST +AC_SUBST([host]) +AC_SUBST([host_alias]) +AC_SUBST([host_cpu]) +AC_SUBST([host_vendor]) +AC_SUBST([host_os])
# don't take defaults from this
-CXXFLAGS=""
+#CXXFLAGS=""
AC_CONFIG_SRCDIR([G4Binding/G4Writer/src/G4GDMLWriter.cpp])
-AC_CANONICAL_HOST -AC_SUBST(host) -AC_SUBST(host_alias) -AC_SUBST(host_cpu) -AC_SUBST(host_vendor) -AC_SUBST(host_os) -
# Checks for programs. AC_PROG_CXX
-AC_PROG_CC
+dnl AC_PROG_CC
+
+# checks for typedefs, structures, and compiler characteristics
+dnl AC_HEADER_STDBOOL
+dnl AC_C_CONST
+dnl AC_C_INLINE
+dnl AC_TYPE_SIZE_T
+
+# checks for library functions
+dnl AC_FUNC_ERROR_AT_LINE
+dnl AC_CHECK_FUNCS([sqrt])
# initialize GDML setup
-GDML_INIT
+GDML_INIT()
# setup GDML
-GDML_SETUP_GDML
+GDML_SETUP_GDML()
# setup Xerces
-GDML_SETUP_XERCESC
+GDML_SETUP_XERCESC()
# setup CLHEP
-GDML_SETUP_CLHEP
+dnl GDML_SETUP_CLHEP
# setup Geant4
-GDML_SETUP_GEANT4 - -# checks for typedefs, structures, and compiler characteristics -AC_HEADER_STDBOOL -AC_C_CONST -AC_C_INLINE -AC_TYPE_SIZE_T - -# checks for library functions -AC_FUNC_ERROR_AT_LINE -AC_CHECK_FUNCS([sqrt])
+GDML_SETUP_GEANT4()
# basic substitutions
-AC_SUBST(CXXFLAGS) -AC_SUBST(CPPFLAGS) -AC_SUBST(DEFS)
+AC_SUBST([CXXFLAGS]) +AC_SUBST([CPPFLAGS]) +AC_SUBST([DEFS])
#
-AC_SUBST(PWD)
+AC_SUBST([PWD])
# All settings from Autoconf are put into this include file. AC_CONFIG_FILES([config/make/local_settings.gmk])
diff -u -r1.2 -r1.3 --- setup.csh 23 Jul 2010 21:06:23 -0000 1.2 +++ setup.csh 9 Apr 2013 21:21:43 -0000 1.3 @@ -1,6 +1,6 @@
#!/bin/csh #
-setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:/cygdrive/c/work/repo/cvs/SimDist/SimDist_cygwin/packages/xerces/v3r1p1/lib:/cygdrive/c/work/repo/cvs/SimDist/SimDist_cygwin/packages/clhep/v2r0p4_7/lib:/cygdrive/c/work/repo/cvs/SimDist/SimDist_cygwin/packages/geant4/v9r3p01/lib/WIN32-g++:/cygdrive/c/work/repo/cvs/SimDist/SimDist_cygwin/packages/gdml/HEAD/CPPGDML/build/WIN32-g++/lib
+setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:/u/ey/jeremym/eclipse_workspace/SimDist/packages/xerces/v3r1p1/lib:@CLHEP_LIBDIR@:/u/ey/jeremym/eclipse_workspace/SimDist/packages/geant4/v9r6p01/lib64:/u/ey/jeremym/eclipse_workspace/SimDist/packages/gdml/HEAD/CPPGDML/build/Linux-g++/lib
-setenv PATH ${PATH}:/cygdrive/c/work/repo/cvs/SimDist/SimDist_cygwin/packages/gdml/HEAD/CPPGDML/build/WIN32-g++/bin
+setenv PATH ${PATH}:/u/ey/jeremym/eclipse_workspace/SimDist/packages/gdml/HEAD/CPPGDML/build/Linux-g++/bin
diff -u -r1.1.1.1 -r1.2 --- DetectorConstruction.cpp 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ DetectorConstruction.cpp 9 Apr 2013 21:21:43 -0000 1.2 @@ -24,9 +24,7 @@
sxp.Run(); fWorld = (G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume(); if (fWorld == 0) {
- G4Exception( - "World volume not set properly check your setup selection criteria or GDML input!" - );
+ G4Exception("", "", FatalException, "GDML failed to setup the world volume.");
} return fWorld; }
diff -u -r1.1.1.1 -r1.2 --- GNUmakefile 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ GNUmakefile 9 Apr 2013 21:21:43 -0000 1.2 @@ -10,7 +10,7 @@
# Define external dependencies REQUIRE_XERCESC := any
-REQUIRE_CLHEP := any
+#REQUIRE_CLHEP := any
REQUIRE_GEANT4 := any all: $(APP_NAME)_target
diff -u -r1.1.1.1 -r1.2 --- volumeExtendedSubscriber.cpp 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ volumeExtendedSubscriber.cpp 9 Apr 2013 21:21:43 -0000 1.2 @@ -1,4 +1,4 @@
-// $Id: volumeExtendedSubscriber.cpp,v 1.1.1.1 2010/07/13 15:18:49 jeremy Exp $
+// $Id: volumeExtendedSubscriber.cpp,v 1.2 2013/04/09 21:21:43 jeremy Exp $
#include "Saxana/SAXSubscriber.h" #include "Saxana/SAXComponentFactory.h" #include "G4Processor/GDMLProcessor.h"
@@ -80,17 +80,17 @@
} else { std::cerr << "FATAL ERROR: color element not found - " << colorref->get_ref() << std::endl;
- G4Exception("vis element not found.");
+ G4Exception("", "", FatalException, "vis element not found.");
} } } } else {
- G4Exception("Failed cast to G4LogicalVolume!");
+ G4Exception("", "", FatalException, "Failed cast to LogicalVolume.");
} } else {
- G4Exception("Failed cast to volume!");
+ G4Exception("", "", FatalException, "Failed cast to volume!");
} } }
diff -u -r1.1.1.1 -r1.2 --- ExN02PhysicsList.cpp 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ ExN02PhysicsList.cpp 9 Apr 2013 21:21:43 -0000 1.2 @@ -110,7 +110,9 @@
#include "G4GammaConversion.hh" #include "G4PhotoElectricEffect.hh"
-#include "G4MultipleScattering.hh"
+#include "G4eMultipleScattering.hh"
+#include "G4hMultipleScattering.hh"
+#include "G4MuMultipleScattering.hh"
#include "G4eIonisation.hh" #include "G4eBremsstrahlung.hh"
@@ -142,13 +144,13 @@
} else if (particleName == "e-") { //electron
- pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
+ pmanager->AddProcess(new G4eMultipleScattering,-1, 1,1);
pmanager->AddProcess(new G4eIonisation, -1, 2,2); pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); } else if (particleName == "e+") { //positron
- pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
+ pmanager->AddProcess(new G4eMultipleScattering,-1, 1,1);
pmanager->AddProcess(new G4eIonisation, -1, 2,2); pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); pmanager->AddProcess(new G4eplusAnnihilation, 0,-1,4);
@@ -156,7 +158,7 @@
} else if( particleName == "mu+" || particleName == "mu-" ) { //muon
- pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
+ pmanager->AddProcess(new G4MuMultipleScattering,-1, 1,1);
pmanager->AddProcess(new G4MuIonisation, -1, 2,2); pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3,3); pmanager->AddProcess(new G4MuPairProduction, -1, 4,4);
@@ -165,7 +167,7 @@
(particle->GetPDGCharge() != 0.0) && (particle->GetParticleName() != "chargedgeantino")) { //all others charged particles except geantino
- pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
+ pmanager->AddProcess(new G4hMultipleScattering,-1, 1,1);
pmanager->AddProcess(new G4hIonisation, -1, 2,2); ///pmanager->AddProcess(new G4UserSpecialCuts, -1,-1,3); }
diff -u -r1.1.1.1 -r1.2 --- GNUmakefile 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ GNUmakefile 9 Apr 2013 21:21:43 -0000 1.2 @@ -2,7 +2,7 @@
# Define external dependencies REQUIRE_XERCESC := any
-REQUIRE_CLHEP := any
+#REQUIRE_CLHEP := any
REQUIRE_GEANT4 := any # Define package dependencies inside project
diff -u -r1.1.1.1 -r1.2 --- GNUmakefile 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ GNUmakefile 9 Apr 2013 21:21:44 -0000 1.2 @@ -10,7 +10,7 @@
# Define external dependencies REQUIRE_XERCESC := any
-REQUIRE_CLHEP := any
+#REQUIRE_CLHEP := any
REQUIRE_GEANT4 := any all: $(APP_NAME)_target
diff -u -r1.1.1.1 -r1.2 --- gogdmlDetectorConstruction.cpp 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ gogdmlDetectorConstruction.cpp 9 Apr 2013 21:21:44 -0000 1.2 @@ -40,9 +40,7 @@
// fWorld->GetLogicalVolume()->SetVisAttributes (G4VisAttributes::Invisible); if( fWorld == 0 ) {
- G4Exception( - "World volume not set properly check your setup selection criteria or GDML input!" - );
+ G4Exception("", "", FatalException, "GDML failed to setup the world volume.");
} return fWorld; }
diff -u -r1.1.1.1 -r1.2 --- GNUmakefile 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ GNUmakefile 9 Apr 2013 21:21:44 -0000 1.2 @@ -2,7 +2,7 @@
# G4Processor # Define external dependencies
-REQUIRE_CLHEP := any
+#REQUIRE_CLHEP := any
REQUIRE_GEANT4 := any REQUIRE_XERCESC := any
diff -u -r1.1.1.1 -r1.2 --- GNUmakefile 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ GNUmakefile 9 Apr 2013 21:21:44 -0000 1.2 @@ -2,7 +2,7 @@
# G4Processor # Define external dependencies
-REQUIRE_CLHEP := any
+#REQUIRE_CLHEP := any
REQUIRE_GEANT4 := any REQUIRE_XERCESC := any
diff -u -r1.1.1.1 -r1.2 --- GNUmakefile 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ GNUmakefile 9 Apr 2013 21:21:44 -0000 1.2 @@ -2,7 +2,7 @@
# G4Subscribers # Define external dependencies
-REQUIRE_CLHEP := any
+#REQUIRE_CLHEP := any
REQUIRE_GEANT4 := any # Define package dependencies inside project
diff -u -r1.1.1.1 -r1.2 --- GNUmakefile 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ GNUmakefile 9 Apr 2013 21:21:44 -0000 1.2 @@ -2,7 +2,7 @@
# G4Processor # Define external dependencies
-REQUIRE_CLHEP := any
+#REQUIRE_CLHEP := any
REQUIRE_GEANT4 := any # Define package dependencies inside project
diff -u -r1.1.1.1 -r1.2 --- geant4.m4 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ geant4.m4 9 Apr 2013 21:21:44 -0000 1.2 @@ -3,10 +3,10 @@
dnl # call all the Geant4 macros
-AC_DEFUN( GDML_SETUP_GEANT4, [
+AC_DEFUN([GDML_SETUP_GEANT4], [
GDML_WITH_GEANT4
-AC_GEANT4_VERSION
+GDML_GEANT4_VERSION
GDML_WITH_G4SYSTEM GDML_WITH_GEANT4_INCLUDE GDML_WITH_GEANT4_LIBDIR
@@ -16,19 +16,19 @@
GDML_CHECK_NIST GDML_ENABLE_NIST
-AC_HAVE_G4TESSELLATED -AC_HAVE_G4TET -AC_HAVE_G4TWISTEDBOX -AC_HAVE_G4TWISTEDTRD -AC_HAVE_G4TWISTEDTRAP -AC_HAVE_G4TWISTEDTUBS -AC_HAVE_G4ELLIPSOID -AC_HAVE_G4EXTRUDEDSOLID
+GDML_HAVEG4TESSELLATED +GDML_HAVEG4TET +GDML_HAVEG4TWISTEDBOX +GDML_HAVEG4TWISTEDTRD +GDML_HAVEG4TWISTEDTRAP +GDML_HAVEG4TWISTEDTUBS +GDML_HAVEG4ELLIPSOID +GDML_HAVEG4EXTRUDEDSOLID
]) # macro to set GEANT4 base dir (G4INSTALL)
-AC_DEFUN( GDML_WITH_GEANT4, [
+AC_DEFUN([GDML_WITH_GEANT4], [
AC_MSG_CHECKING(for GEANT4 installation setting)
@@ -44,7 +44,7 @@
]) # macro to set G4SYSTEM
-AC_DEFUN( GDML_WITH_G4SYSTEM, [
+AC_DEFUN([GDML_WITH_G4SYSTEM], [
AC_MSG_CHECKING(for G4SYSTEM setting)
@@ -63,14 +63,14 @@
]) # macro to set GEANT4 include dir
-AC_DEFUN( GDML_WITH_GEANT4_INCLUDE, [
+AC_DEFUN([GDML_WITH_GEANT4_INCLUDE], [
AC_MSG_CHECKING([for Geant4 include dir setting]) AC_ARG_WITH([geant4-include], AC_HELP_STRING([--with-geant4-include=<path>],[Geant4 alternate headers dir]), [GEANT4_INCLUDE=$with_geant4_include],
- [GEANT4_INCLUDE=$GEANT4_PREFIX/include])
+ [GEANT4_INCLUDE=$GEANT4_PREFIX/include/Geant4])
AC_MSG_RESULT([$GEANT4_INCLUDE])
@@ -79,17 +79,17 @@
[G4RunManager.hh]) ])
-AC_MSG_RESULT(yes)
+AC_MSG_RESULT([yes])
# macro to set GEANT4 lib dir
-AC_DEFUN( GDML_WITH_GEANT4_LIBDIR, [
+AC_DEFUN([GDML_WITH_GEANT4_LIBDIR], [
AC_MSG_CHECKING([for Geant4 lib dir]) AC_ARG_WITH([geant4-libdir], AC_HELP_STRING([--with-geant4-libdir=<path>], [Geant4 alternate library dir]), [GEANT4_LIBDIR=$with_geant4_libdir],
- [GEANT4_LIBDIR=$GEANT4_PREFIX/lib/$G4SYSTEM])
+ [GEANT4_LIBDIR=$GEANT4_PREFIX/lib64])
AC_MSG_RESULT([$GEANT4_LIBDIR])
@@ -98,7 +98,7 @@
]) # macro to substitute GEANT4 vars to output
-AC_DEFUN( GDML_SUBST_GEANT4, [
+AC_DEFUN([GDML_SUBST_GEANT4], [
AC_SUBST(GEANT4_PREFIX) AC_SUBST(GEANT4_INCLUDE)
@@ -107,7 +107,7 @@
]) # macro to select granular libs
-AC_DEFUN( GDML_ENABLE_GEANT4_GRANULAR_LIBS, [
+AC_DEFUN([GDML_ENABLE_GEANT4_GRANULAR_LIBS], [
AC_MSG_CHECKING(whether to use Geant4 granular libs)
@@ -137,7 +137,7 @@
]) # macro to check whether NIST is supported by the current Geant4 version
-AC_DEFUN(GDML_CHECK_NIST, [
+AC_DEFUN([GDML_CHECK_NIST], [
HAVE_NIST=no
@@ -151,7 +151,7 @@
]) # macro to enable/disable NIST support
-AC_DEFUN(GDML_ENABLE_NIST, [
+AC_DEFUN([GDML_ENABLE_NIST], [
dnl Removed because this is somehow getting put in front of GEANT4_PREFIX setting, which breaks NIST config. dnl AC_REQUIRE([GDML_CHECK_NIST])
@@ -184,7 +184,7 @@
]) dnl Macro to extract the Geant4 version from G4Version.hh or G4RunManagerKernel.hh, if the former file does not exist.
-AC_DEFUN(AC_GEANT4_VERSION, [
+AC_DEFUN([GDML_GEANT4_VERSION], [
AC_MSG_CHECKING(for Geant4 full version)
@@ -249,7 +249,7 @@
]) # Macro to set HAVE_G4TESSELLATED if G4TessellatedSolid.hh exists.
-AC_DEFUN(AC_HAVE_G4TESSELLATED, [
+AC_DEFUN([GDML_HAVEG4TESSELLATED], [
AC_MSG_CHECKING(whether to enable G4TessellatedSolid)
@@ -263,7 +263,7 @@
]) # Macro to set HAVE_G4TET if G4Tet.hh exists.
-AC_DEFUN(AC_HAVE_G4TET, [
+AC_DEFUN([GDML_HAVEG4TET], [
AC_MSG_CHECKING(whether to enable G4Tet)
@@ -277,7 +277,7 @@
]) # Macro to set HAVE_G4TWISTEDBOX if G4TwistedBox.hh exists.
-AC_DEFUN(AC_HAVE_G4TWISTEDBOX, [
+AC_DEFUN([GDML_HAVEG4TWISTEDBOX], [
AC_MSG_CHECKING(whether to enable G4TwistedBox)
@@ -291,7 +291,7 @@
]) # Macro to set HAVE_G4TWISTEDTRD if G4TwistedTrd.hh exists.
-AC_DEFUN(AC_HAVE_G4TWISTEDTRD, [
+AC_DEFUN([GDML_HAVEG4TWISTEDTRD], [
AC_MSG_CHECKING(whether to enable G4TwistedTrd)
@@ -305,7 +305,7 @@
]) # Macro to set HAVE_G4TWISTEDTRAP if G4TwistedTrap.hh exists.
-AC_DEFUN(AC_HAVE_G4TWISTEDTRAP, [
+AC_DEFUN([GDML_HAVEG4TWISTEDTRAP], [
AC_MSG_CHECKING(whether to enable G4TwistedTrap)
@@ -319,7 +319,7 @@
]) # Macro to set HAVE_G4TWISTEDTUBS if G4TwistedTubs.hh exists.
-AC_DEFUN(AC_HAVE_G4TWISTEDTUBS, [
+AC_DEFUN([GDML_HAVEG4TWISTEDTUBS], [
AC_MSG_CHECKING(whether to enable G4TwistedTubs)
@@ -333,7 +333,7 @@
]) # Macro to set HAVE_G4ELLIPSOID if G4Ellipsoid.hh exists.
-AC_DEFUN(AC_HAVE_G4ELLIPSOID, [
+AC_DEFUN([GDML_HAVEG4ELLIPSOID], [
AC_MSG_CHECKING(whether to enable G4Ellipsoid)
@@ -347,7 +347,7 @@
]) # Macro to set HAVE_G4EXTRUDEDSOLID if G4ExtrudedSolid.hh exists.
-AC_DEFUN(AC_HAVE_G4EXTRUDEDSOLID, [
+AC_DEFUN([GDML_HAVEG4EXTRUDEDSOLID], [
AC_MSG_CHECKING(whether to enable G4ExtrudedSolid)
diff -u -r1.1.1.1 -r1.2 --- local_settings.gmk.in 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ local_settings.gmk.in 9 Apr 2013 21:21:44 -0000 1.2 @@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/gdml2/CPPGDML/config/make/local_settings.gmk.in,v 1.1.1.1 2010/07/13 15:18:49 jeremy Exp $
+# $Header: /cvs/lcd/gdml2/CPPGDML/config/make/local_settings.gmk.in,v 1.2 2013/04/09 21:21:44 jeremy Exp $
# # All the local settings for GDML build # defined by Autoconf configure script.
@@ -90,12 +90,12 @@
XERCESC_LIBNAME := @XERCESC_LIBNAME@ # CLHEP
-CLHEP_BASE := @CLHEP_PREFIX@ -CLHEP_INCLUDE := @CLHEP_INCLUDE@ -CLHEP_LIBDIR := @CLHEP_LIBDIR@
+#CLHEP_BASE := @CLHEP_PREFIX@ +#CLHEP_INCLUDE := @CLHEP_INCLUDE@ +#CLHEP_LIBDIR := @CLHEP_LIBDIR@
# name of CLHEP library without prefix or extension
-CLHEP_LIBNAME := @CLHEP_LIBNAME@
+#CLHEP_LIBNAME := @CLHEP_LIBNAME@
# Geant4 GEANT4_BASE := @GEANT4_PREFIX@
diff -u -r1.1.1.1 -r1.2 --- geant4.gmk 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ geant4.gmk 9 Apr 2013 21:21:44 -0000 1.2 @@ -13,11 +13,11 @@
endif ifndef GEANT4_INCLUDE
- GEANT4_INCLUDE := $(GEANT4_BASE)/include
+ GEANT4_INCLUDE := $(GEANT4_BASE)/include/Geant4
endif ifndef GEANT4_LIBDIR
- GEANT4_LIBDIR := $(GEANT4_BASE)/lib
+ GEANT4_LIBDIR := $(GEANT4_BASE)/lib64
endif GEANT4_SET := 1
@@ -25,6 +25,9 @@
# Update preprocessor & compiler flags PROJECT_INCLUDES += -I$(GEANT4_INCLUDE)
+# Include CLHEP headers +PROJECT_INCLUDES += -I$(GEANT4_BASE)/source/externals/clhep/include +
# Geant4 config dir GEANT4_CONFIG := $(PROJECT_TOP)/config/make/ext
diff -u -r1.1.1.1 -r1.2 --- geant4_global_libs.gmk 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ geant4_global_libs.gmk 9 Apr 2013 21:21:44 -0000 1.2 @@ -1,18 +1,31 @@
-GEANT4_LIBLIST += \ - -lG4readout \ - -lG4run \ - -lG4event \ - -lG4tracking \ - -lG4processes \ - -lG4digits_hits \ - -lG4track \ - -lG4particles \ - -lG4geometry \ - -lG4materials \ - -lG4graphics_reps \ - -lG4intercoms \ - -lG4global -# -lG4parmodels \ - -# -lG4interfaces \ -# -lG4persistency \
+GEANT4_LIBLIST += -lG4FR \ + -lG4GMocren \ + -lG4RayTracer \ + -lG4Tree \ + -lG4VRML \ + -lG4analysis \ + -lG4clhep \ + -lG4digits_hits \ + -lG4error_propagation \ + -lG4event \ + -lG4expat \ + -lG4geometry \ + -lG4global \ + -lG4graphics_reps \ + -lG4intercoms \ + -lG4interfaces \ + -lG4materials \ + -lG4modeling \ + -lG4parmodels \ + -lG4particles \ + -lG4persistency \ + -lG4physicslists \ + -lG4processes \ + -lG4readout \ + -lG4run \ + -lG4track \ + -lG4tracking \ + -lG4visHepRep \ + -lG4visXXX \ + -lG4vis_management \ + -lG4zlib
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1