diff -Nru netpanzer-0.8.2/autogen.sh netpanzer-0.8.4.debian.1/autogen.sh --- netpanzer-0.8.2/autogen.sh 2007-05-26 06:57:02.000000000 +0000 +++ netpanzer-0.8.4.debian.1/autogen.sh 2009-12-29 12:47:15.000000000 +0000 @@ -1,21 +1,10 @@ -#! /bin/sh - -# Correct working directory? -if test ! -f configure.ac ; then - echo "*** Please invoke this script from directory containing configure.ac." - exit 1 -fi - -MACRODIR=mk/autoconf -aclocal -I $MACRODIR - -# generate a Jamconfig.in -autoconf --trace=AC_SUBST \ - | sed -e 's/configure.ac:[0-9]*:AC_SUBST:\([^:]*\).*/\1 ?= "@\1@" ;/g' \ - > Jamconfig.in -# seems autoconf --trace misses some things :-/ -echo 'INSTALL ?= "@INSTALL@" ;' >> Jamconfig.in -echo 'JAMCONFIG_READ = yes ;' >> Jamconfig.in - -autoheader -autoconf +#!/bin/sh +#Netpanzer (netpanzer.org) autogen script +echo "\nNetPanzer"; +echo "===============================\n"; +echo "After revision 1129 netpanzer uses scons script for compile.\n" +echo "To get scons visit; http://www.scons.org,\nor if You use linux fedora or ubuntu get it typing in consol;\n" +echo "\tsudo apt-get install scons -for ubuntu distro\n"; +echo "\tyum install scons -for fedora distro\n"; +echo "When You get scons then just type comand \"scons\" in consol.\n"; +echo "===============================\n"; diff -Nru netpanzer-0.8.2/BUGS netpanzer-0.8.4.debian.1/BUGS --- netpanzer-0.8.2/BUGS 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/BUGS 2009-01-20 16:17:03.000000000 +0000 @@ -0,0 +1,9 @@ +- cursor scroll is always same speed, should use scrollrate +- when a client connect to a server, it will save the configuration that + the server sent to him when exit netpanzer. +- sometimes 2 players spawn at the same place - hard to fix, low priority +- Astar sometimes calculates strange paths. Very obvious if you try to capture + and outpost from the left side: Your panzers will drive around it before + entering it. (it is not a complete Astar, needs to rewrite) +- The no allies flag in the server config has no effect +- The Abort button when connecting doesn't really aborts the operation, just hide the window Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/cache/colorfilters/2080.tbl and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/cache/colorfilters/2080.tbl differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/cache/colorfilters/4060.tbl and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/cache/colorfilters/4060.tbl differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/cache/colorfilters/6040.tbl and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/cache/colorfilters/6040.tbl differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/cache/colorfilters/8020.tbl and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/cache/colorfilters/8020.tbl differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/cache/colorfilters/Brighten.tbl and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/cache/colorfilters/Brighten.tbl differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/cache/colorfilters/DarkenALittle.tbl and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/cache/colorfilters/DarkenALittle.tbl differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/cache/colorfilters/DarkenALot.tbl and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/cache/colorfilters/DarkenALot.tbl differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/cache/colorfilters/LightDark.tbl and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/cache/colorfilters/LightDark.tbl differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/cache/colorfilters/netp/4060.tbl and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/cache/colorfilters/netp/4060.tbl differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/cache/colorfilters/netp/DarkenALot.tbl and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/cache/colorfilters/netp/DarkenALot.tbl differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/cache/colorfilters/netpmenu/DarkenALot.tbl and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/cache/colorfilters/netpmenu/DarkenALot.tbl differ diff -Nru netpanzer-0.8.2/cache/Jamfile netpanzer-0.8.4.debian.1/cache/Jamfile --- netpanzer-0.8.2/cache/Jamfile 2007-05-26 06:56:51.000000000 +0000 +++ netpanzer-0.8.4.debian.1/cache/Jamfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -SubDir TOP cache ; - -PATHS = colorfilters/netp - colorfilters/netpmenu -; - -for p in $(PATHS) { - InstallData [ Wildcard $(p) : *.tbl ] : cache $(p) ; -} - diff -Nru netpanzer-0.8.2/ChangeLog netpanzer-0.8.4.debian.1/ChangeLog --- netpanzer-0.8.2/ChangeLog 2007-05-26 06:57:02.000000000 +0000 +++ netpanzer-0.8.4.debian.1/ChangeLog 2010-02-12 12:44:23.000000000 +0000 @@ -1,3 +1,47 @@ +NOTE: I stopped writting this long ago, use the svn log to see the changes, this is double work. + +04-May-2008 by Aaron Perez +- Deleted AbstractButton +- Deleted the classes for each unit type, only use Vehicle now. +- Removed LoadUnitSurfaces functions (2 in 2 different places) +- fix bug in Surface::getRect() +- fix #include in FileSystem.cpp +- GameConfig will load the spawnconfig as list +- Added some fields to UnitProfile: image, bodysprite, bodyshadow, turretsprite, turretshadow, soundselected, firesound, weapon, boundbox +- UnitProfileInterface, PlayerUnitConfig and ParticleInterface uses a vector instead of static array +- UnitProfileInterface new functions getProfileByName and getNumUnitTypes, it will also load the unit sprites when loading the profile +- MissleWeapon has new parameter for missile size, 0 for small 1 for medium +- Player POINTS for killing tanks are NOT counted any more. +- Removed some of the cButton types in View and added to Button or in some case in a dedicated Button class +- VehicleSelectionView creates the buttons (custom button) and order the buttons in the order the unit profiles are loaded. May order them by strength in future. +- FlagSelectionView uses a custom button +- Updated unit profiles with new configuration + +01-May-2008 by Aaron Perez +- Deleted GetSessionHostView.* it was not used. + +27-Apr-2008 by Aaron Perez +- removed unused line in MenuTemplateView +- removed classes LobbyView, ProgressView and ConsoleLoadingView functionality + is done by LoadingView +- View uses a list for components now. +- removed cLabel from View and created a Label component + +16-Sep-2007 by Aaron Perez +- added a timer to the right click function to unselect units only if some + time passed. (100 miliseconds) +- units are selected while moving the mouse on real time +- double-click will select all units in screen of the same type + +15-Sep-2007 by Aaron Perez +- fixed problem when starting a game with more than 255 initial units. +- when using int config variables, use minimum value if requested was less than + minimum, and max value if it was more than maximum. +- fixed stopping the tank idle sound when a player host a non dedicated game + and resigns +- new sound options window (the base code was already done before), able to + enable/disable and change volumes + ... ChangeLog is not up to date... 21-Feb-2005 by Matthias Braun diff -Nru netpanzer-0.8.2/CodeBlock.txt netpanzer-0.8.4.debian.1/CodeBlock.txt --- netpanzer-0.8.2/CodeBlock.txt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/CodeBlock.txt 2011-09-15 11:43:06.000000000 +0000 @@ -0,0 +1,41 @@ +Create & Compile on Linux +************************* +Download & install codeblocks +Needed SDL-1.2.14 & SDL_mixer-1.2.11 + +Create new SDL project +Add Files recursively /src/Lib +Add Files recursively /src/NetPanzer +Add compiler #define + PHYSFS_SUPPORTS_ZIP=1 + Z_PREFIX=1 + PHYSFS_NO_CDROM_SUPPORT=1 +Add Link libraries + SDL + SDL_mixer +Add Search directories + ../src/Lib + ../src/NetPanzer + ../src/Lib/physfs + +Create & Compile on Windows +*************************** +Download & install codeblocks-10.05mingw-setup.exe +Needed SDL-1.2.14 & SDL_mixer-1.2.11 + +Create new SDL project +Add Files recursively /src/Lib +Add Files recursively /src/NetPanzer +Add Files recursively /SDL_mixer-1.2.11 +Add compiler #define + socklen_t=int +Add Link libraries + libws2_32.a + mingw32 + SDLMain + SDL +Add Search directories + ../src/Lib + ../src/NetPanzer + ../src/SDL_mixer-1.2.11 + ../src/Lib/physfs diff -Nru netpanzer-0.8.2/config.h.in netpanzer-0.8.4.debian.1/config.h.in --- netpanzer-0.8.2/config.h.in 2007-05-26 07:04:45.000000000 +0000 +++ netpanzer-0.8.4.debian.1/config.h.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - - -/* Disable gcc specific __attribute__ keyword on other compilers */ -#ifndef __GNUC__ -#define __attribute__(x) -#endif - - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define if winsock should be used */ -#undef USE_WINSOCK - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN - -/* define socklen_t if sys headers don't do that */ -#undef socklen_t diff -Nru netpanzer-0.8.2/configure netpanzer-0.8.4.debian.1/configure --- netpanzer-0.8.2/configure 2007-07-08 14:04:20.000000000 +0000 +++ netpanzer-0.8.4.debian.1/configure 1970-01-01 00:00:00.000000000 +0000 @@ -1,6139 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for netpanzer 0.8.2. -# -# Report bugs to . -# -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 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. ## -## --------------------- ## - -# 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 - # 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 - - - - -# PATH needs CR -# 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 -fi - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# 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.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -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 -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 - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -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 - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; 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 -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'` - -# CDPATH. -$as_unset CDPATH - - -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - case $as_dir in - /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -done -IFS=$as_save_IFS - - - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -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 - # 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 - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -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 - # 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_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message -} - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # 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 after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, 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 - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\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 sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -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 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -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 -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -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=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# 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'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - -exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# 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} - -# Identity of this package. -PACKAGE_NAME='netpanzer' -PACKAGE_TARNAME='netpanzer' -PACKAGE_VERSION='0.8.2' -PACKAGE_STRING='netpanzer 0.8.2' -PACKAGE_BUGREPORT='netpanzer-devel@lists.berlios.org' - -ac_unique_file="mk/jam/build.jam" -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS -# include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif -# include -#endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_INTTYPES_H -# include -#endif -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#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 -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -target -target_cpu -target_vendor -target_os -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -CPP -GREP -EGREP -VARIANT -CXX -CXXFLAGS -ac_ct_CXX -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -DOXYGEN -SDL_CONFIG -SDL_CFLAGS -SDL_LIBS -SDLMIXER_AVAILABLE -SDLMIXER_CFLAGS -SDLMIXER_LIBS -PHYSFS_AVAILABLE -PHYSFS_CFLAGS -PHYSFS_LIBS -INSTALL -LIBOBJS -LTLIBOBJS' -ac_subst_files='' - ac_precious_vars='build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -LIBS -CPPFLAGS -CPP -CXX -CXXFLAGS -CCC' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# 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' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -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 - ac_prev= - continue - fi - - case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -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-\(.*\)'` - # 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 ;; - - -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-\([^=]*\)'` - # 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=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } -fi - -# Be sure to have absolute directory names. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures netpanzer 0.8.2 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/netpanzer] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] - --target=TARGET configure for building compilers for TARGET [HOST] -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of netpanzer 0.8.2:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-optimize build with optimizations enabled (default YES) - --enable-debug build with debugging information (default NO) - --enable-profile build with profiling information (default NO) - --disable-sdltest Do not try to compile and run a test SDL program - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-sdl-prefix=PFX Prefix where SDL is installed (optional) - --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional) - --with-libSDL_mixer=dir specify location of libSDL_mixer if not detected - automatically; uses dir, dir/include and dir/lib - --with-libphysfs=dir specify location of libphysfs if not detected - automatically; uses dir, dir/include and dir/lib - -Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CPP C preprocessor - CXX C++ compiler command - CXXFLAGS C++ compiler flags - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -Report bugs to . -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -netpanzer configure 0.8.2 -generated by GNU Autoconf 2.61 - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by netpanzer $as_me 0.8.2, which was -generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" -elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" -else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" -fi -shift -for ac_site_file -do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - - - - - - - - - - - - - - - - - - - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -ac_aux_dir= -for ac_dir in mk/autoconf "$srcdir"/mk/autoconf; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in mk/autoconf \"$srcdir\"/mk/autoconf" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in mk/autoconf \"$srcdir\"/mk/autoconf" >&2;} - { (exit 1); exit 1; }; } -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - -{ echo "$as_me:$LINENO: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6; } -if test "${ac_cv_target+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host -else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6; } -case $ac_cv_target in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -echo "$as_me: error: invalid value of canonical target" >&2;} - { (exit 1); exit 1; }; };; -esac -target=$ac_cv_target -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_target -shift -target_cpu=$1 -target_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -target_os=$* -IFS=$ac_save_IFS -case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac - - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -test -n "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- - -#---------------------------------------------------------------------------- -# Configuration header -#---------------------------------------------------------------------------- -ac_config_headers="$ac_config_headers config.h" - - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { (ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else - ac_file='' -fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi - -ac_exeext=$ac_cv_exeext - -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -rm -f a.out a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } - -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; - xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -esac - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_GREP_found && break 3 - done -done - -done -IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - -else - ac_cv_path_GREP=$GREP -fi - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_EGREP_found && break 3 - done -done - -done -IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - -else - ac_cv_path_EGREP=$EGREP -fi - - - fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # See if sys/param.h defines the BYTE_ORDER macro. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include - -int -main () -{ -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ - && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) - bogus endian macros -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - # It does; now see whether it defined to BIG_ENDIAN or not. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include - -int -main () -{ -#if BYTE_ORDER != BIG_ENDIAN - not big endian -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_c_bigendian=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_bigendian=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # It does not; compile a test program. -if test "$cross_compiling" = yes; then - # try to guess the endianness by grepping values into an object file - ac_cv_c_bigendian=unknown - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } -short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } -int -main () -{ - _ascii (); _ebcdic (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then - ac_cv_c_bigendian=yes -fi -if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ - - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long int l; - char c[sizeof (long int)]; - } u; - u.l = 1; - return u.c[sizeof (long int) - 1] == 1; - - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_bigendian=no -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_c_bigendian=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } -case $ac_cv_c_bigendian in - yes) - -cat >>confdefs.h <<\_ACEOF -#define WORDS_BIGENDIAN 1 -_ACEOF - ;; - no) - ;; - *) - { { echo "$as_me:$LINENO: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -echo "$as_me: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} - { (exit 1); exit 1; }; } ;; -esac - - -# stupid autoconf is adding default -g -O2 flags when we don't want this :-/ -test ".$CXXFLAGS" = "." && CXXFLAGS=" " - -#---------------------------------------------------------------------------- -# Check for build variant (debug, profile, optimize) -#---------------------------------------------------------------------------- -VARIANT=optimize -# Check whether --enable-optimize was given. -if test "${enable_optimize+set}" = set; then - enableval=$enable_optimize; test "$enableval" = "yes" && VARIANT=optimize -fi - - -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then - enableval=$enable_debug; test "$enableval" = "yes" && VARIANT=debug -fi - - -# Check whether --enable-profile was given. -if test "${enable_profile+set}" = set; then - enableval=$enable_profile; test "$enableval" = "yes" && VARIANT=profile -fi - - - -#---------------------------------------------------------------------------- -# find applications -#---------------------------------------------------------------------------- -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } -GXX=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done -IFS=$as_save_IFS - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -# check if our c++ compiler is gcc3.2 or newer -{ echo "$as_me:$LINENO: checking whether g++ is new enough" >&5 -echo $ECHO_N "checking whether g++ is new enough... $ECHO_C" >&6; } - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - -#ifndef __GNUC__ -#error no gcc compiler found (__GNUC__ not defined) -#endif -#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 2) -#error gcc compiler too old. Need at least version 3.2.0 -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: -Error: You gcc version is too old. netpanzer needs at least gcc 3.2.0. -" >&5 -echo "$as_me: error: -Error: You gcc version is too old. netpanzer needs at least gcc 3.2.0. -" >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -for ac_prog in doxygen -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DOXYGEN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$DOXYGEN"; then - ac_cv_prog_DOXYGEN="$DOXYGEN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DOXYGEN="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -DOXYGEN=$ac_cv_prog_DOXYGEN -if test -n "$DOXYGEN"; then - { echo "$as_me:$LINENO: result: $DOXYGEN" >&5 -echo "${ECHO_T}$DOXYGEN" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$DOXYGEN" && break -done - - -#---------------------------------------------------------------------------- -# Check for operating system -#---------------------------------------------------------------------------- -{ echo "$as_me:$LINENO: checking for target host" >&5 -echo $ECHO_N "checking for target host... $ECHO_C" >&6; } -case $host_os in - mingw*|cygwin*) - { echo "$as_me:$LINENO: result: WIN32" >&5 -echo "${ECHO_T}WIN32" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define USE_WINSOCK -_ACEOF - - LIBS="$LIBS -lwsock32" - ;; - *) - { echo "$as_me:$LINENO: result: assume posix" >&5 -echo "${ECHO_T}assume posix" >&6; } - ;; -esac - -#---------------------------------------------------------------------------- -# find libraries -#---------------------------------------------------------------------------- -{ echo "$as_me:$LINENO: checking for socklen_t" >&5 -echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; } -if test "${ac_cv_type_socklen_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - #include -int -main () -{ -socklen_t len = 42; return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_socklen_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_socklen_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5 -echo "${ECHO_T}$ac_cv_type_socklen_t" >&6; } - if test $ac_cv_type_socklen_t != yes; then - -cat >>confdefs.h <<\_ACEOF -#define socklen_t int -_ACEOF - - fi - - - -# Check whether --with-sdl-prefix was given. -if test "${with_sdl_prefix+set}" = set; then - withval=$with_sdl_prefix; sdl_prefix="$withval" -else - sdl_prefix="" -fi - - -# Check whether --with-sdl-exec-prefix was given. -if test "${with_sdl_exec_prefix+set}" = set; then - withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval" -else - sdl_exec_prefix="" -fi - -# Check whether --enable-sdltest was given. -if test "${enable_sdltest+set}" = set; then - enableval=$enable_sdltest; -else - enable_sdltest=yes -fi - - - if test x$sdl_exec_prefix != x ; then - sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config - fi - fi - if test x$sdl_prefix != x ; then - sdl_args="$sdl_args --prefix=$sdl_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_prefix/bin/sdl-config - fi - fi - - - PATH="$prefix/bin:$prefix/usr/bin:$PATH" - # Extract the first word of "sdl-config", so it can be a program name with args. -set dummy sdl-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_SDL_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $SDL_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no" - ;; -esac -fi -SDL_CONFIG=$ac_cv_path_SDL_CONFIG -if test -n "$SDL_CONFIG"; then - { echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5 -echo "${ECHO_T}$SDL_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - min_sdl_version=1.2.5 - { echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5 -echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6; } - no_sdl="" - if test "$SDL_CONFIG" = "no" ; then - no_sdl=yes - else - SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` - SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` - - sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_sdltest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - rm -f conf.sdltest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include -#include -#include "SDL.h" - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main (int argc, char *argv[]) -{ - int major, minor, micro; - char *tmp_version; - - /* This hangs on some systems (?) - system ("touch conf.sdltest"); - */ - { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_sdl_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_sdl_version"); - exit(1); - } - - if (($sdl_major_version > major) || - (($sdl_major_version == major) && ($sdl_minor_version > minor)) || - (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); - printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); - printf("*** to point to the correct copy of sdl-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - - -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -no_sdl=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_sdl" = x ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - if test "$SDL_CONFIG" = "no" ; then - echo "*** The sdl-config script installed by SDL could not be found" - echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the SDL_CONFIG environment variable to the" - echo "*** full path to sdl-config." - else - if test -f conf.sdltest ; then - : - else - echo "*** Could not run SDL test program, checking why..." - CFLAGS="$CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include "SDL.h" - -int main(int argc, char *argv[]) -{ return 0; } -#undef main -#define main K_and_R_C_main - -int -main () -{ - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding SDL or finding the wrong" - echo "*** version of SDL. If it is not finding SDL, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means SDL was incorrectly installed" - echo "*** or that you have moved SDL since it was installed. In the latter case, you" - echo "*** may want to edit the sdl-config script: $SDL_CONFIG" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - SDL_CFLAGS="" - SDL_LIBS="" - { { echo "$as_me:$LINENO: error: Please install libsdl >= 1.2." >&5 -echo "$as_me: error: Please install libsdl >= 1.2." >&2;} - { (exit 1); exit 1; }; } - fi - - - rm -f conf.sdltest - - - - -# Check whether --with-libSDL_mixer was given. -if test "${with_libSDL_mixer+set}" = set; then - withval=$with_libSDL_mixer; -fi - - - save_CFLAGS="$CFLAGS" - save_CPPFLAGS="$CPPFLAGS" - save_LIBS="$LIBS" - - RESCFLAGS="" - RESLIBS="-lSDL_mixer" - CFLAGS="$CFLAGS $SDL_CFLAGS" - CPPFLAGS="$CPPFLAGS $SDL_CFLAGS" - LIBS="$LIBS -lSDL_mixer $SDL_LIBS" - - if test -n "$with_libSDL_mixer"; then - - CFLAGS="-I$with_libSDL_mixer/include $CFLAGS" - CPPFLAGS="-I$with_libSDL_mixer/include $CPPFLAGS" - LIBS="-L$with_libSDL_mixer/lib $LIBS" - RESCFLAGS="-I$with_libSDL_mixer/include $RESCFLAGS" - RESLIBS="-L$with_libSDL_mixer/lib $RESLIBS" - -fi - - - { echo "$as_me:$LINENO: checking for SDL_mixer >= 1.2" >&5 -echo $ECHO_N "checking for SDL_mixer >= 1.2... $ECHO_C" >&6; } - - cat >conftest.$ac_ext <<_ACEOF -#include -#if MIX_MAJOR_VERSION < 1 -# error SDLMix too old -#else -# if MIX_MAJOR_VERSION == 1 -# if MIX_MINOR_VERSION < 2 -# error SDLMix too old -# endif -# endif -#endif -int -main(int argc, char** argv) -{ -Mix_OpenAudio(0, 0, 0, 0); - ; - return 0; -} - -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - buildok=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - buildok=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - - LIBS=$save_LIBS - CPPFLAGS=$save_CPPFLAGS - CFLAGS=$save_CFLAGS - - if test $buildok = yes; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } - SDLMIXER_AVAILABLE=yes - SDLMIXER_CFLAGS="$RESCFLAGS" - SDLMIXER_LIBS="$RESLIBS" -else - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - SDLMIXER_AVAILABLE=no - SDLMIXER_CFLAGS="" - SDLMIXER_LIBS="" -fi - - - - - - - if test $buildok = yes; then - : -else - { { echo "$as_me:$LINENO: error: Please install SDLMixer >=1.2.2" >&5 -echo "$as_me: error: Please install SDLMixer >=1.2.2" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - - - -# Check whether --with-libphysfs was given. -if test "${with_libphysfs+set}" = set; then - withval=$with_libphysfs; -fi - - - save_CFLAGS="$CFLAGS" - save_CPPFLAGS="$CPPFLAGS" - save_LIBS="$LIBS" - - RESCFLAGS="" - RESLIBS="-lphysfs" - CFLAGS="$CFLAGS " - CPPFLAGS="$CPPFLAGS " - LIBS="$LIBS -lphysfs " - - if test -n "$with_libphysfs"; then - - CFLAGS="-I$with_libphysfs/include $CFLAGS" - CPPFLAGS="-I$with_libphysfs/include $CPPFLAGS" - LIBS="-L$with_libphysfs/lib $LIBS" - RESCFLAGS="-I$with_libphysfs/include $RESCFLAGS" - RESLIBS="-L$with_libphysfs/lib $RESLIBS" - -fi - - - { echo "$as_me:$LINENO: checking for physfs >= 0.1.9" >&5 -echo $ECHO_N "checking for physfs >= 0.1.9... $ECHO_C" >&6; } - - cat >conftest.$ac_ext <<_ACEOF - -#include -#include -#if PHYSFS_VER_MAJOR < 1 -#if PHYSFS_VER_MINOR < 1 -# error PHYSFS is too old -#else -# if PHYSFS_VER_MINOR == 1 -# if PHYSFS_VER_PATCH < 9 -# error PHYSFS is too old -# endif -# endif -#endif -#endif -int -main(int argc, char** argv) -{ - - ; - return 0; -} - -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - buildok=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - buildok=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - - LIBS=$save_LIBS - CPPFLAGS=$save_CPPFLAGS - CFLAGS=$save_CFLAGS - - if test $buildok = yes; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } - PHYSFS_AVAILABLE=yes - PHYSFS_CFLAGS="$RESCFLAGS" - PHYSFS_LIBS="$RESLIBS" -else - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - PHYSFS_AVAILABLE=no - PHYSFS_CFLAGS="" - PHYSFS_LIBS="" -fi - - - - - - - if test $buildok = yes; then - : -else - { { echo "$as_me:$LINENO: error: Please install physfs >= 0.1.9" >&5 -echo "$as_me: error: Please install physfs >= 0.1.9" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - ac_config_commands="$ac_config_commands Jamfile" - - -# Handle the case when no prefix is given. And the special case when a path -# contains more than 2 slashes, these paths seem to be correct but jam fails -# on them. -if test $prefix = NONE; then - prefix="$ac_default_prefix" -else - prefix=`echo "$prefix" | sed -e 's:///*:/:g'` -fi - -if test $exec_prefix = NONE; then - exec_prefix="\$(prefix)" -else - exec_prefix=`echo "$exec_prefix" | sed -e 's:///*:/:g'` -fi - - -prefix=`echo "$prefix" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -exec_prefix=`echo "$exec_prefix" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -bindir=`echo "$bindir" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -sbindir=`echo "$sbindir" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -libexecdir=`echo "$libexecdir" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -datarootdir=`echo "$datarootdir" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -datadir=`echo "$datadir" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -sysconfdir=`echo "$sysconfdir" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -sharedstatedir=`echo "$sharedstatedir" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -localstatedir=`echo "$localstatedir" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -libdir=`echo "$libdir" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -includedir=`echo "$includedir" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -oldincludedir=`echo "$oldincludedir" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -infodir=`echo "$infodir" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -mandir=`echo "$mandir" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` - -#hack to get the order right :-/ (autoconf --trace reports wrong order...) - - - - - - - - - - - - - - - - - -INSTALL=`echo "$INSTALL" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -INSTALL_PROGRAM=`echo "$INSTALL_PROGRAM" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -INSTALL_SCRIPT=`echo "$INSTALL_SCRIPT" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` -INSTALL_DATA=`echo "$INSTALL_DATA" | sed -e 's/\${\([a-zA-Z_][a-zA-Z_]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'` - -# fix for order... - - - - - -ac_config_files="$ac_config_files Jamconfig" - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -DEFS=-DHAVE_CONFIG_H - -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - - -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# 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 - # 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 - - - - -# PATH needs CR -# 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 -fi - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# 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.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -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 -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 - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -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 - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; 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 -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'` - -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # 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 after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, 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 - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\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 sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -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 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -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 -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -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=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# 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'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 - -# Save the log message, to keep $[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by netpanzer $as_me 0.8.2, which was -generated by GNU Autoconf 2.61. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -# Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Configuration commands: -$config_commands - -Report bugs to ." - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -ac_cs_version="\\ -netpanzer config.status 0.8.2 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - -Copyright (C) 2006 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -INSTALL='$INSTALL' -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header - { echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" - ac_need_defaults=false ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL - export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - echo "$ac_log" -} >&5 - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "Jamfile") CONFIG_COMMANDS="$CONFIG_COMMANDS Jamfile" ;; - "Jamconfig") CONFIG_FILES="$CONFIG_FILES Jamconfig" ;; - - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= - trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "$CONFIG_FILES"; then - -_ACEOF - - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -build!$build$ac_delim -build_cpu!$build_cpu$ac_delim -build_vendor!$build_vendor$ac_delim -build_os!$build_os$ac_delim -host!$host$ac_delim -host_cpu!$host_cpu$ac_delim -host_vendor!$host_vendor$ac_delim -host_os!$host_os$ac_delim -target!$target$ac_delim -target_cpu!$target_cpu$ac_delim -target_vendor!$target_vendor$ac_delim -target_os!$target_os$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -CPP!$CPP$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -VARIANT!$VARIANT$ac_delim -CXX!$CXX$ac_delim -CXXFLAGS!$CXXFLAGS$ac_delim -ac_ct_CXX!$ac_ct_CXX$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -DOXYGEN!$DOXYGEN$ac_delim -SDL_CONFIG!$SDL_CONFIG$ac_delim -SDL_CFLAGS!$SDL_CFLAGS$ac_delim -SDL_LIBS!$SDL_LIBS$ac_delim -SDLMIXER_AVAILABLE!$SDLMIXER_AVAILABLE$ac_delim -SDLMIXER_CFLAGS!$SDLMIXER_CFLAGS$ac_delim -SDLMIXER_LIBS!$SDLMIXER_LIBS$ac_delim -PHYSFS_AVAILABLE!$PHYSFS_AVAILABLE$ac_delim -PHYSFS_CFLAGS!$PHYSFS_CFLAGS$ac_delim -PHYSFS_LIBS!$PHYSFS_LIBS$ac_delim -INSTALL!$INSTALL$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof -_ACEOF - - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ -s/:*$// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF -fi # test -n "$CONFIG_FILES" - - -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac - ac_file_inputs="$ac_file_inputs $ac_f" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - fi - - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`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 || -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" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= - -case `sed -n '/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p -' $ac_file_inputs` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -$ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} - - rm -f "$tmp/stdin" - case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac - ;; - :H) - # - # CONFIG_HEADER - # -_ACEOF - -# Transform confdefs.h into a sed script `conftest.defines', that -# substitutes the proper values into config.h.in to produce config.h. -rm -f conftest.defines conftest.tail -# First, append a space to every undef/define line, to ease matching. -echo 's/$/ /' >conftest.defines -# Then, protect against being on the right side of a sed subst, or in -# an unquoted here document, in config.status. If some macros were -# called several times there might be several #defines for the same -# symbol, which is useless. But do not sort them, since the last -# AC_DEFINE must be honored. -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -# NAME is the cpp macro being defined, VALUE is the value it is being given. -# PARAMS is the parameter list in the macro definition--in most cases, it's -# just an empty string. -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -ac_dB='\\)[ (].*,\\1define\\2' -ac_dC=' ' -ac_dD=' ,' - -uniq confdefs.h | - sed -n ' - t rset - :rset - s/^[ ]*#[ ]*define[ ][ ]*// - t ok - d - :ok - s/[\\&,]/\\&/g - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p - ' >>conftest.defines - -# Remove the space that was appended to ease matching. -# Then replace #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -# (The regexp can be short, since the line contains either #define or #undef.) -echo 's/ $// -s,^[ #]*u.*,/* & */,' >>conftest.defines - -# Break up conftest.defines: -ac_max_sed_lines=50 - -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -# et cetera. -ac_in='$ac_file_inputs' -ac_out='"$tmp/out1"' -ac_nxt='"$tmp/out2"' - -while : -do - # Write a here document: - cat >>$CONFIG_STATUS <<_ACEOF - # First, check the format of the line: - cat >"\$tmp/defines.sed" <<\\CEOF -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -b -:def -_ACEOF - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail - grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines conftest.tail - -echo "ac_result=$ac_in" >>$CONFIG_STATUS -cat >>$CONFIG_STATUS <<\_ACEOF - if test x"$ac_file" != x-; then - echo "/* $configure_input */" >"$tmp/config.h" - cat "$ac_result" >>"$tmp/config.h" - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f $ac_file - mv "$tmp/config.h" $ac_file - fi - else - echo "/* $configure_input */" - cat "$ac_result" - fi - rm -f "$tmp/out12" - ;; - - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -echo "$as_me: executing $ac_file commands" >&6;} - ;; - esac - - - case $ac_file$ac_mode in - "Jamfile":C) if test ! -f "${ac_top_builddir}Jamfile"; then - echo Installing Jamfile wrapper. - echo "# This file was automatically create by config.status" > Jamfile - echo "TOP ?= $ac_top_srcdir ;" >> Jamfile - echo "top_builddir ?= . ;" >> Jamfile - echo "include \$(TOP)/Jamfile ;" >> Jamfile -fi - ;; - - esac -done # for ac_tag - - -{ (exit 0); exit 0; } -_ACEOF -chmod +x $CONFIG_STATUS -ac_clean_files=$ac_clean_files_save - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi - - -{ echo "$as_me:$LINENO: - -Notice: This project uses jam (and not make) as build tool. -" >&5 -echo "$as_me: - -Notice: This project uses jam (and not make) as build tool. -" >&6;} diff -Nru netpanzer-0.8.2/configure.ac netpanzer-0.8.4.debian.1/configure.ac --- netpanzer-0.8.2/configure.ac 2007-07-08 14:04:10.000000000 +0000 +++ netpanzer-0.8.4.debian.1/configure.ac 1970-01-01 00:00:00.000000000 +0000 @@ -1,152 +0,0 @@ -#---------------------------------------------------------------------------- -# Autoconf input script. Start the ./autgen.sh script for producing a -# configure script. -#---------------------------------------------------------------------------- -AC_PREREQ([2.54]) - -AC_INIT([netpanzer], [0.8.2], [netpanzer-devel@lists.berlios.org]) -AC_CONFIG_SRCDIR([mk/jam/build.jam]) -AC_CONFIG_AUX_DIR([mk/autoconf]) - -AC_CANONICAL_BUILD -AC_CANONICAL_HOST -AC_CANONICAL_TARGET - -#---------------------------------------------------------------------------- -# Configuration header -#---------------------------------------------------------------------------- -AC_CONFIG_HEADERS(config.h) -AH_TOP([ -/* Disable gcc specific __attribute__ keyword on other compilers */ -#ifndef __GNUC__ -#define __attribute__(x) -#endif -]) - -AC_C_BIGENDIAN() - -# stupid autoconf is adding default -g -O2 flags when we don't want this :-/ -test ".$CXXFLAGS" = "." && CXXFLAGS=" " - -#---------------------------------------------------------------------------- -# Check for build variant (debug, profile, optimize) -#---------------------------------------------------------------------------- -VARIANT=optimize -AC_ARG_ENABLE([optimize], [AC_HELP_STRING([--enable-optimize], - [build with optimizations enabled (default YES)])], - [test "$enableval" = "yes" && VARIANT=optimize]) - -AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug], - [build with debugging information (default NO)])], - [test "$enableval" = "yes" && VARIANT=debug]) - -AC_ARG_ENABLE([profile], [AC_HELP_STRING([--enable-profile], - [build with profiling information (default NO)])], - [test "$enableval" = "yes" && VARIANT=profile]) -AC_SUBST([VARIANT]) - -#---------------------------------------------------------------------------- -# find applications -#---------------------------------------------------------------------------- -AC_PROG_CXX -AC_PROG_INSTALL - -# check if our c++ compiler is gcc3.2 or newer -AC_MSG_CHECKING([whether g++ is new enough]) -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -AC_TRY_COMPILE([], [ -#ifndef __GNUC__ -#error no gcc compiler found (__GNUC__ not defined) -#endif -#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 2) -#error gcc compiler too old. Need at least version 3.2.0 -#endif -], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([ -Error: You gcc version is too old. netpanzer needs at least gcc 3.2.0. -])]) -AC_LANG_RESTORE -AC_CHECK_PROGS(DOXYGEN, [doxygen]) - -#---------------------------------------------------------------------------- -# Check for operating system -#---------------------------------------------------------------------------- -AC_MSG_CHECKING([for target host]) -case $host_os in - mingw*|cygwin*) - AC_MSG_RESULT([WIN32]) - AC_DEFINE([USE_WINSOCK], [], [Define if winsock should be used]) - LIBS="$LIBS -lwsock32" - ;; - *) - AC_MSG_RESULT([assume posix]) - ;; -esac - -#---------------------------------------------------------------------------- -# find libraries -#---------------------------------------------------------------------------- -AX_TYPE_SOCKLEN_T - -AM_PATH_SDL([1.2.5], , AC_MSG_ERROR([Please install libsdl >= 1.2.])) - -NP_FINDLIB([SDLMIXER], [SDL_mixer], [SDL_mixer >= 1.2], - NP_LANG_PROGRAM([#include -#if MIX_MAJOR_VERSION < 1 -# error SDLMix too old -#else -# if MIX_MAJOR_VERSION == 1 -# if MIX_MINOR_VERSION < 2 -# error SDLMix too old -# endif -# endif -#endif], [Mix_OpenAudio(0, 0, 0, 0);]), - [], [-lSDL_mixer], - [], - [AC_MSG_ERROR([Please install SDLMixer >=1.2.2])], - [$SDL_CFLAGS], [$SDL_LIBS]) - -dnl SDL_image disabled for now, when use in future reenable it. -dnl NP_FINDLIB([SDLIMAGE], [SDL_image], [SDL_image >= 1.2], -dnl NP_LANG_PROGRAM([#include ], [IMG_Load("");]), -dnl [], [-lSDL_image], -dnl [], -dnl [AC_MSG_ERROR([Please install SDLImage >= 1.2.1])], -dnl [$SDL_CFLAGS], [$SDL_LIBS]) - -dnl disabled for now, reenable if you work further on the UI -dnl NP_FINDLIB([SDLTTF], [SDL_ttf], [SDL_ttf >= 2.0.0], -dnl NP_LANG_PROGRAM([#include ], [if(!TTF_WasInit()) TTF_Init();]), -dnl [], [-lSDL_ttf], -dnl [], -dnl [AC_MSG_ERROR([Please install SDL_ttf >= 2.0.0])], -dnl [$SDL_CFLAGS], [$SDL_LIBS]) - -NP_FINDLIB([PHYSFS], [physfs], [physfs >= 0.1.9], - NP_LANG_PROGRAM([ -#include -#include -#if PHYSFS_VER_MAJOR < 1 -#if PHYSFS_VER_MINOR < 1 -# error PHYSFS is too old -#else -# if PHYSFS_VER_MINOR == 1 -# if PHYSFS_VER_PATCH < 9 -# error PHYSFS is too old -# endif -# endif -#endif -#endif]), - [], [-lphysfs], - [], - [AC_MSG_ERROR([Please install physfs >= 0.1.9])]) - -AC_INIT_JAM -AC_CONFIG_FILES([Jamconfig]) -AC_OUTPUT - -AC_MSG_NOTICE([ - -Notice: This project uses jam (and not make) as build tool. -]) diff -Nru netpanzer-0.8.2/.cvsignore netpanzer-0.8.4.debian.1/.cvsignore --- netpanzer-0.8.2/.cvsignore 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/.cvsignore 2009-10-25 13:39:31.000000000 +0000 @@ -0,0 +1,5 @@ +Makefile +Makefile.in +.deps +netpanzer + diff -Nru netpanzer-0.8.2/debian/changelog netpanzer-0.8.4.debian.1/debian/changelog --- netpanzer-0.8.2/debian/changelog 2012-02-05 10:12:59.000000000 +0000 +++ netpanzer-0.8.4.debian.1/debian/changelog 2012-02-05 10:13:06.000000000 +0000 @@ -1,10 +1,40 @@ +netpanzer (0.8.4.debian.1-1) unstable; urgency=low + + [ Eddy PetriÈ™or ] + * fix Vcs-Svn URL to point to svn, not the incomplete ssh location + + [ Ansgar Burchardt + * Fix Watchfile + + [ Alexander Reichle-Schmehl ] + * Add myself as uploader + * New upstream release (Closes: #595024) + * Add get-orig-source to debian/rules + * The package uses now scons as build system; adapt build depends and + debian/rules accordingly + * Also adapt build-depends for embedded libs, which we would not like + to use + * Add ${misc:Depends} to all Package dependencies + * Move netpanzer-dbg into section debug + * Add recommended targets build-arch and build-indep to debian/rules + * Add debian/README.source + * Update debian/copyright + * Bump standards to 3.9.2 (no further changes needed) + * Fix Vcs-Browser URL after alioth move + + [ Paul Wise ] + * Add debian/pathces/use-system-libs.patch to use system libraries + instead of embedded ones + + -- Alexander Reichle-Schmehl Fri, 20 Jan 2012 13:27:17 +0100 + netpanzer (0.8.2-2) unstable; urgency=low [ Barry deFreese ] * Add watch file * Add Homepage and VCS fields to control * Add myself to uploaders - * Bump Standards Version to 3.7.3 + * Bump Standards Version to 3.7.3 (no changes needed) [ Gonéri Le Bouder ] * dpkg-buildpackage -B doesn't create arch all package anymore diff -Nru netpanzer-0.8.2/debian/control netpanzer-0.8.4.debian.1/debian/control --- netpanzer-0.8.2/debian/control 2012-02-05 10:12:59.000000000 +0000 +++ netpanzer-0.8.4.debian.1/debian/control 2012-02-05 10:13:06.000000000 +0000 @@ -2,16 +2,16 @@ Section: games Priority: optional Maintainer: Debian Games Team -Uploaders: Gonéri Le Bouder , Barry deFreese -Build-Depends: debhelper (>= 5.0.0), jam, pkg-config (>= 0.15.0), libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev, libphysfs-dev, quilt, autotools-dev -Standards-Version: 3.7.3 +Uploaders: Barry deFreese , Alexander Reichle-Schmehl +Build-Depends: debhelper (>= 5.0.0), scons, pkg-config (>= 0.15.0), libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev, libphysfs-dev, quilt, zlib1g-dev, liblua5.1-0-dev, libpng12-dev +Standards-Version: 3.9.2 Homepage: http://netpanzer.berlios.de -Vcs-Svn: ssh://svn.debian.org/svn/pkg-games/packages/trunk/netpanzer/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/netpanzer/?op=log +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/netpanzer/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/netpanzer/ Package: netpanzer Architecture: any -Depends: ${shlibs:Depends}, netpanzer-data (= ${source:Version}) +Depends: ${shlibs:Depends}, netpanzer-data (= ${source:Version}), ${misc:Depends} Suggests: xqf Description: online multiplayer tactical warfare game netPanzer is an isometric view real-time tactical game designed for @@ -31,8 +31,9 @@ Package: netpanzer-dbg Architecture: any +Section: debug Priority: extra -Depends: netpanzer (= ${binary:Version}) +Depends: netpanzer (= ${binary:Version}), ${misc:Depends} Description: debugging symbols for netpanzer netPanzer is an isometric view real-time tactical game designed for play across the Internet and over LAN systems. One on one games are @@ -45,6 +46,7 @@ Package: netpanzer-data Architecture: all +Depends: ${misc:Depends} Recommends: netpanzer Description: data files for the netPanzer game netPanzer is an online multiplayer tactical warfare game designed for diff -Nru netpanzer-0.8.2/debian/copyright netpanzer-0.8.4.debian.1/debian/copyright --- netpanzer-0.8.2/debian/copyright 2012-02-05 10:12:59.000000000 +0000 +++ netpanzer-0.8.4.debian.1/debian/copyright 2012-02-05 10:13:06.000000000 +0000 @@ -4,7 +4,14 @@ The actual maintainer is the Debian Games Team: http://wiki.debian.org/Games/Development -It was downloaded from http://netpanzer.berlios.de/download.html +It was downloaded from svn://svn.berlios.de/netpanzer/tags/netpanzer/ (as +http://www.netpanzer.org/download/ only offers binary packages). + +The orig tarball shiped by us is created and modified as follows: +* Running svn export for the desired version +* Removing unneeded libraries lua and physfs from src/Lib as we use the + system wide libraries +* taring and gziping the directory Upstream Authors: Matthias Braun Ivo Danihelka @@ -18,7 +25,7 @@ Copyright 2003-2005 Matthias Braun and others Copyright 2007 Aaron Perez -License: +License for everything but the exceptions bellow: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -28,3 +35,22 @@ On Debian systems, the complete text of the GNU General Public License can be found in the file `/usr/share/common-licenses/GPL'. + +The sources shipped in src/Lib/optionmm are: + +Copyright: + +Copyright 2002 Christian Holm Christensen + +License: +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public License +as published by the Free Software Foundation; either version 2.1 +of the License, or (at your option) any later version. +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +On Debian systems, the complete text of GNU Lesser General Public License +can be found in the file `/usr/share/common-licenses/LGPL'. diff -Nru netpanzer-0.8.2/debian/netpanzer-data.install netpanzer-0.8.4.debian.1/debian/netpanzer-data.install --- netpanzer-0.8.2/debian/netpanzer-data.install 2012-02-05 10:12:59.000000000 +0000 +++ netpanzer-0.8.4.debian.1/debian/netpanzer-data.install 2012-02-05 10:13:06.000000000 +0000 @@ -1 +1,8 @@ -/usr/share/games/netpanzer +cache/ /usr/share/games/netpanzer +maps/ /usr/share/games/netpanzer +pics/ /usr/share/games/netpanzer +powerups/ /usr/share/games/netpanzer +scripts/ /usr/share/games/netpanzer +sound/ /usr/share/games/netpanzer +units/ /usr/share/games/netpanzer +wads/ /usr/share/games/netpanzer diff -Nru netpanzer-0.8.2/debian/netpanzer.install netpanzer-0.8.4.debian.1/debian/netpanzer.install --- netpanzer-0.8.2/debian/netpanzer.install 2012-02-05 10:12:59.000000000 +0000 +++ netpanzer-0.8.4.debian.1/debian/netpanzer.install 2012-02-05 10:13:06.000000000 +0000 @@ -1,2 +1,4 @@ -/usr/games -/usr/share/pixmaps +netpanzer /usr/games +netpanzer.desktop /usr/share/applications +netpanzer.png /usr/share/pixmaps/ +netpanzer.xpm /usr/share/pixmaps/ diff -Nru netpanzer-0.8.2/debian/patches/series netpanzer-0.8.4.debian.1/debian/patches/series --- netpanzer-0.8.2/debian/patches/series 2012-02-05 10:12:59.000000000 +0000 +++ netpanzer-0.8.4.debian.1/debian/patches/series 2012-02-05 10:13:06.000000000 +0000 @@ -1,2 +1,3 @@ -gcc-4.3.diff -desktop.diff +#gcc-4.3.diff +#desktop.diff +use-system-libs.patch diff -Nru netpanzer-0.8.2/debian/patches/use-system-libs.patch netpanzer-0.8.4.debian.1/debian/patches/use-system-libs.patch --- netpanzer-0.8.2/debian/patches/use-system-libs.patch 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/debian/patches/use-system-libs.patch 2012-02-05 10:13:06.000000000 +0000 @@ -0,0 +1,97 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -154,16 +154,10 @@ env.BuildDir(env['FINALBUILDDIR'],'.',du + crossmingwenv.BuildDir(crossmingwenv['FINALBUILDDIR'],'.',duplicate=0) + crosslinuxenv.BuildDir(crosslinuxenv['FINALBUILDDIR'],'.',duplicate=0) + +-luaenv = env.Clone() +-physfsenv = env.Clone() + networkenv = env.Clone() + +-crossmingwluaenv = crossmingwenv.Clone() +-crossmingwphysfsenv = crossmingwenv.Clone() + crossmingwnetworkenv = crossmingwenv.Clone() + +-crosslinuxluaenv = crosslinuxenv.Clone() +-crosslinuxphysfsenv = crosslinuxenv.Clone() + crosslinuxnetworkenv = crosslinuxenv.Clone() + + ################################################################ +@@ -205,9 +199,9 @@ print 'Building version ' + NPVERSION + + # Configure Environments + ################################################################ + +-env.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] ) +-crossmingwenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] ) +-crosslinuxenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] ) ++env.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/lua'] ) ++crossmingwenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/lua'] ) ++crosslinuxenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/lua'] ) + + # for this platform + if thisplatform == 'darwin': +@@ -216,14 +210,10 @@ if thisplatform == 'darwin': + + if env['universal'] != 'false': + env.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) +- luaenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) +- physfsenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) + networkenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) + env.Append( LINKFLAGS = [ '-mmacosx-version-min=10.4', '-arch', 'ppc', '-arch', 'i386' ] ) + else: + env.Append( CCFLAGS = [ '-arch', 'i386' ] ) +- luaenv.Append( CCFLAGS = [ '-arch', 'i386' ] ) +- physfsenv.Append( CCFLAGS = [ '-arch', 'i386' ] ) + networkenv.Append( CCFLAGS = [ '-arch', 'i386' ] ) + env.Append( LINKFLAGS = [ '-arch', 'i386' ] ) + +@@ -265,36 +255,12 @@ MakeStaticLib( networkenv, 'npn + MakeStaticLib(crossmingwnetworkenv, 'npnetwork', 'Network', '*.cpp') + MakeStaticLib(crosslinuxnetworkenv, 'npnetwork', 'Network', '*.cpp') + +-# BUILDS LUA +-luaenv.Append( CPPPATH = [ 'src/Lib/lua'] ) +-crossmingwluaenv.Append( CPPPATH = [ 'src/Lib/lua'] ) +-crosslinuxluaenv.Append( CPPPATH = [ 'src/Lib/lua'] ) +-MakeStaticLib( luaenv, 'nplua', 'lua', '*.c') +-MakeStaticLib(crossmingwluaenv, 'nplua', 'lua', '*.c') +-MakeStaticLib(crosslinuxluaenv, 'nplua', 'lua', '*.c') +- +-# BUILDS PHYSFS +-physfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] ) +-physfsenv.Append( CPPPATH = [ 'src/Lib/physfs', 'src/Lib/physfs/zlib123' ] ) +-MakeStaticLib(physfsenv, 'npphysfs', 'physfs physfs/platform physfs/archivers physfs/zlib123', '*.c') +- +-crossmingwphysfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] ) +-crossmingwphysfsenv.Append( CPPPATH = [ 'src/Lib/physfs', 'src/Lib/physfs/zlib123' ] ) +-MakeStaticLib(crossmingwphysfsenv, 'npphysfs', 'physfs physfs/platform physfs/archivers physfs/zlib123', '*.c') +- +-crosslinuxphysfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] ) +-crosslinuxphysfsenv.Append( CPPPATH = [ 'src/Lib/physfs', 'src/Lib/physfs/zlib123' ] ) +-MakeStaticLib(crosslinuxphysfsenv, 'npphysfs', 'physfs physfs/platform physfs/archivers physfs/zlib123', '*.c') +- + # BUILDS 2D + env.Append( CFLAGS = [ '-DZ_PREFIX=1' ] ) +-env.Append( CPPPATH = 'src/Lib/physfs/zlib123' ) + MakeStaticLib(env, 'np2d', '2D 2D/libpng', '*.c*') + crossmingwenv.Append( CFLAGS = [ '-DZ_PREFIX=1' ] ) +-crossmingwenv.Append( CPPPATH = 'src/Lib/physfs/zlib123' ) + MakeStaticLib(crossmingwenv, 'np2d', '2D 2D/libpng', '*.c*') + crosslinuxenv.Append( CFLAGS = [ '-DZ_PREFIX=1' ] ) +-crosslinuxenv.Append( CPPPATH = 'src/Lib/physfs/zlib123' ) + MakeStaticLib(crosslinuxenv, 'np2d', '2D 2D/libpng', '*.c*') + + # BUILDS REST OF LIBRARIES +@@ -323,9 +289,9 @@ if crossmingwenv.has_key('WINICON'): + + crosslinuxenv.Append( NPSOURCES = globSources(crosslinuxenv, 'src/NetPanzer', npdirs, "*.cpp") ) + +-env.Append( NPLIBS = ['nplua','np2d','npnetwork','nplibs','npphysfs'] ) +-crossmingwenv.Append( NPLIBS = ['nplua','np2d','npnetwork','nplibs','npphysfs'] ) +-crosslinuxenv.Append( NPLIBS = ['nplua','np2d','npnetwork','nplibs','npphysfs'] ) ++env.Append( NPLIBS = ['lua5.1','np2d','npnetwork','nplibs','physfs'] ) ++crossmingwenv.Append( NPLIBS = ['lua5.1','np2d','npnetwork','nplibs','physfs'] ) ++crosslinuxenv.Append( NPLIBS = ['lua5.1','np2d','npnetwork','nplibs','physfs'] ) + + if env.has_key('LIBS'): + env.Append( NPLIBS = env['LIBS'] ) diff -Nru netpanzer-0.8.2/debian/README.source netpanzer-0.8.4.debian.1/debian/README.source --- netpanzer-0.8.2/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/debian/README.source 2012-02-05 10:13:06.000000000 +0000 @@ -0,0 +1,15 @@ +This package uses quilt as patch management. Please see +/usr/share/doc/quilt/README.source for some explanation on how that works. + +Upstream doesn't offer a source tarball for download, there for the tarball +is created by + +* Running svn export for the desired version on + svn://svn.berlios.de/netpanzer/tags/netpanzer/ +* Removing unneeded libraries lua and physfs from src/Lib as we use the + system wide libraries +* taring and gziping the directory + +debian/rules get-orig-source should create such a tarball for you. + + diff -Nru netpanzer-0.8.2/debian/rules netpanzer-0.8.4.debian.1/debian/rules --- netpanzer-0.8.2/debian/rules 2012-02-05 10:12:59.000000000 +0000 +++ netpanzer-0.8.4.debian.1/debian/rules 2012-02-05 10:13:06.000000000 +0000 @@ -9,6 +9,9 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p') +UPP_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p'| sed -e 's/\.debian\.[0-9]*//') + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -20,22 +23,16 @@ INSTALL_PROGRAM += -s endif -config.status: configure +config.status: dh_testdir QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub mk/autoconf/config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess mk/autoconf/config.guess -endif - CFLAGS="$(CFLAGS)" ./configure --without-wx-config --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --bindir=\$${prefix}/games --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --datadir=\$${prefix}/share/games - -build: build-stamp +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp build-stamp: config.status dh_testdir - jam -q + scons datadir=/usr/share/games/netpanzer touch build-stamp @@ -44,7 +41,7 @@ dh_testroot rm -f build-stamp config.log - if test -f $(CURDIR)/Jamconfig; then jam distclean; fi + [ -f SConstruct ] || scons --clean QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 rm -rf .pc dh_clean @@ -55,11 +52,7 @@ dh_clean -k dh_installdirs - jam -sprefix=$(CURDIR)/debian/tmp/usr \ - -sapplicationsdir=$(CURDIR)/debian/netpanzer/usr/share/applications install - rm -Rf debian/tmp/usr/share/games/doc - [ ! -d debian/tmp/usr/share/games/pixmaps ] || mv debian/tmp/usr/share/games/pixmaps debian/tmp/usr/share/pixmaps - dh_install --fail-missing --sourcedir=debian/tmp + dh_install --sourcedir=. binary-indep: build install dh_testdir -i @@ -90,5 +83,14 @@ dh_md5sums -a dh_builddeb -a +get-orig-source: + rm -rf get-orig-source netpanzer_$(SRC_VERSION).orig.tar.gz + mkdir get-orig-source + svn export svn://svn.berlios.de/netpanzer/tags/netpanzer/$(UPP_VERSION) get-orig-source/netpanzer-$(SRC_VERSION) + rm -rf get-orig-source/netpanzer-$(SRC_VERSION)/src/Libs/{lua,physfs} + GZIP='--best --no-name' tar czf netpanzer_$(SRC_VERSION).orig.tar.gz -C get-orig-source netpanzer-$(SRC_VERSION) + rm -rf get-orig-source + echo " "netpanzer_$(SRC_VERSION).orig.tar.gz" created; move it to the right destination to build the package" + binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff -Nru netpanzer-0.8.2/debian/watch netpanzer-0.8.4.debian.1/debian/watch --- netpanzer-0.8.2/debian/watch 2012-02-05 10:12:59.000000000 +0000 +++ netpanzer-0.8.4.debian.1/debian/watch 2012-02-05 10:13:06.000000000 +0000 @@ -1,3 +1,6 @@ version=3 -http://developer.berlios.de/project/showfiles.php?group_id=1250&release_id=4745 .*/netpanzer/netpanzer-([\d.]+)\.tar\.bz2 +# won't download the version, but at least report it (for now) +opts="dversionmangle=s/\.debian\.\d+$//,downloadurlmangle=s/.*//" \ + http://www.netpanzer.org/download/np/index.php?dir=Binaries/NetPanzer/Releases/ .*/Releases/([0-9][\w.]*).* + diff -Nru netpanzer-0.8.2/docs/code-notes.txt netpanzer-0.8.4.debian.1/docs/code-notes.txt --- netpanzer-0.8.2/docs/code-notes.txt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/docs/code-notes.txt 2009-11-08 11:57:31.000000000 +0000 @@ -0,0 +1,364 @@ +Notes about NetPanzer code. + +1. Initialization + +Code starts in src/NetPanzer/Core/main.cpp netpanzer_main. + +ScriptManager is initialized (creates a lua state), and registers the Palette +bindings. + +global_engine_state is created at this point. + +Ignore signals on non windows systems if DEBUG is not defined. + +Initializes SDL: + * timers only. + * no parachute. + * enables unicode support. + +Initializes PhysFS: + * sets write directory to the "user dir"/."netpanzer", "user dir" is $HOME + on non windows, C:\Documents And Settings\ on Windows. + * creates the write directory if needed. + * will EXIT if can't create or use the ".netpanzer" directory. + * search path: + - write dir. + - base dir (`pwd`). + - adds any zip file that is found at the current search path. + - NP_DATADIR if defined. + - in Mac OS X adds the Resource dir of the bundle. + - on non Windows, handles the attached "datadir=" at end of binary. + +Open log files, named "server" or "netpanzer" depends if user used -d option. + +On Windows if dedicated server, allocate a console. + +Random number generator inialized here, use time as seed. + +Creates the PID file if requested. + +Creates the BaseGameManager, depends on "-d" option used: + * PlayerGameManager + - sets all its poiters to null + * DedicatedGameManager + - sets all its pointers to null + - create mutex + - initialize Console + +Initialize the game manager + * creates "config" directory (note: on the define write dir) + * create the game config, uses the passed parameter as config file, if used, + gameconfig can be acceses from this point. + * creates the sound manager (handled in each concrete BaseGameManager) + * initializes video, only PlayerGameManager creates a SDLVideo and sets the + video mode (GameManager::setVideoMode). + * creates global_game_state. + * creates UnitProfileInterface and loads profiles. Need to move. + * ResourceManager loads default flags (sets all flags to black). Can move? + * calculates some values for Physics. + * loads images for weapons. Need to move. + * loads images for powerups. Need to move. + * initializes the game console (the messages that player or game prints on + screen). Need to move. + * initialies ServerConnectDaemon with the max plauers configuration. Need to + move. + * sets the NetworkState status to "server" state. + * resets all network stats. + * initializes input devices: + - PlayerGameManager initializes mouse: + # loads images in "pics/cursors". + # sets default cursor ("default.png"). + # sets the clicktimer to 150ms. + - DedicagtedGameManager sets ConsoleInterface::setStdoutPipe to true. + +Handles a quick connect (-c command line parameter), it sets +gameconfig->serverConnect to the host and gameconfig->quickConnect to true. + +If the option for masterserver was passed, updates the +gameconfig->masterservers (overrides config file). + +If the port option was used (server port default is 3030) updates +gameconfig->serverport (overrides config file). + +At this point sets global_engine_state->game_manager to the just created and +initialized game manager, if some error happened on initialization, will never +get to this point. + +Launch the game, two completely different paths here, in concrete classes: + * PlayerGameManager: + - creates all Views. + - sets the "MainView" as visible (shows main menu). + * DedicatedGameManager: + - initializes MessageRouter. + - NetworkServer clears the client list and creates the listening socket. + *will fail* if can't create socket, nobody would be able to connect. + - GameControlRulesDaemon is set as dedicated server, state to loading + map. + - gameconfig->hostorjoin is host. + - disable creation of particles. + - if the server is public and there are configured masterservers, + creates the infosocket and the heartbeat. + - creates a ServerConsole (is a different thread), which will receive + the server admin commands. + +Initialization is finish, do the main loop while it returns true. + +1.1 Game configuration initialization (done in GameConfig constructor) + +Similar game settings are grouped on standard containers. The constructor +initializes ALL the configuration variables with default values. The player name +is always initialized as as "Player". + +The settings variable pointers is added to the containers, then loads the +configuration from the config file (might be passed as command line parameter). + +2. Game Main Loop + +DedicatedGameManager: + * run heartbeat. + * do default main loop. + +PlayerGameManager: + * if first run, and is quick connect, joins game. + * check heartbeat. + * handles SDL events (quits if received quit message). + * do default main loop. + +default main loop (BaseGameManager): + * initializes frame timer + * checks game inputs: + - DedicatedGameManager: + # checks commands input in console. + - PlayerGameManager: + # handle key presses. + # handle mouse multi-click timer. + # handle mouse events. + # manage scroll of view. + * draw graphics (only PlayerGameManager): + - lock screen. + - draw all visible views. + - draw mouse. + - unlock scren. + - flip screen. + * run logic (called simLoop): + - deleted disconnected players on server, should move to server only + code. + - handle network events, always neede, should move out of logic to loop. + - runs GameControlRulesDaemon, right know it handles client connection + map loading and check for map rules in server. + - if we are server, run ServerConnectDaemon (manages connecting clients + on server). + - updates network statistics. + - run units simulation (tank movement, shoots, etc). + - run projectiles (flying weapons) simulation. + - run objective simulation (capture of outposts). + - run powerups simulation (generate powerup, check if player get one). + - run path generation. + - run physics simulation (calculates displacement by wind). + - run particles simulation (2 kinds?). + - sends unsent network data in client and server. + - run bot simulation + +3. Subsystems + +3.1 Graphics + +To better understand the current graphics state is better to know the original +game graphics approach. This doesn't include views or sprites. + +3.1.1 Original Graphics Approach + +The graphics code was located on: + * src/NetPanzer/System/SDLVideo.* + * src/Netpanzer/Classes/ScreenSurface.* + * src/Lib/2D/*.* + +All the graphics was handled in 256 colors, paletted mode. + +Palettes was loaded from "act" files, an easy file format, made by an array red, +green and blue colors for each of the 256 colors of the palette. + +There was 2 different palettes, the "menu" palette, used on the main menu views, +and the game palette used in the game. The palettes was called "netpmenu" and +"netp". + +To optain specific colors for drawing, there was a class to store the final +colors "Color", it had named variables for colors. Each color stored the 8 bit +index of the palette with the desired color. + +Each time the palette was loaded, the colors was initialized with the palette +color that was more similar to the wanted rgb one. + +To simulate transparency and lighting effects, some tables was pregenerated +to obtain the new color after applying of the effect. For example, if we wanted to +brighten a color, by some value, we would do a table lookup with the old color +and the brighten value, obtaining the new color. The same method was used for +transparency effects. + +The all the image data was handled in 2 classes, Surface and PackedSurface. + +Each Surface contained one or more frames. The image data was stored as a big +chunk of memory. Image blitting was done by copy the memory in blocks to the new +location. Surfaces can be rotated and scaled. If transparency was used on this +kind, it was a pixel by pixel copy, if the color 0 was used, the pixel was +skipped, hence doing full transparency of the pixel. + +PackedSurface was similar to normal Surfaces, as it had frames and similar +method names. It had 2 chunks of memory, one with the pixel data, other with the +pixel indexes. It is a form of RLE encoded data. The pointer of the first table +tells how many bytes of memory to skip, and how many bytes to copy to the +screen, bytes of memory being pixels in thescreen, as it was a 8 bit paletted +mode. + +There was a dedicated BMP loading function on Surface, and a PAK loading +function for the PackedSurfaces. + +Text drawing on surfaces was done by loading a file with the font data. A value +of 0 would skip the pixel, any other value would set the color that was passed +to the string blitting method. + +SDLVideo had all the methods needed to work with the SDL_Surface of the video +device (as returned by SDL_SetVideoMode, or the background surface if double +buffer was not enabled in the SDL_Surface). + +ScreenSurface was a facade to allow the normal Surface and PacketSurface +blitting functions to blit directly on the video surface. Because it was 8 color +paletted mode the relationship was 1 on 1, after video surface was locked, +normal memcpy would work the same as Surface blitting on the video surface. + +Blitting to the video: + * lock the back (hidden) surface, it could be the same as video surface, but + in practice, used to be a dedicated surface for doing double buffering. + The locking operation made the raw pixel data addresable. + * draw/copy pixels to video memory (--> the backbuffer). + * unlock the back surface (pixel might not be addresable now). + * copy to the video surface and update the visual. + +3.1.2 Current Graphics approach. + +Surface has a container for SDL_Surface, a container is needed to hold +different frames. The SDL_Surfaces are created as 32 bit surface. + +PackedSurface does not exists any more, full transparency of pixels uses +SDL_RLEACCEL and SDL_SRCCOLORKEY. Transparency of the full image is handled by +SDL_SRCALPHA (no tables lookup). + +The palette is not loaded from files anymore, is stored in the code, there is +only one palette (netp). Colors are initialized using a Lua script. + +The font is integrated in the code (BuiltinFont.cpp). + +All the blitting operations uses SDL for its blitting. The images has to be +prepared beforehand to blit in the way it was intended, like setting the alpha +and/or the color key. + +The images are loaded from PNG files. The code to load PNG was taken from +SDL_image library (IMG_png.c). The libpng library is added to the source code. +It is possible to load multiframed images, has to add the size parameters when +loading the image, the loaded will autodetect the frames. The PAK files has been +converted to PNG files. + +The shadows are created as a mask of the images. Blitting shadows has to enable +the SDL_SRCALPHA flag to do transparency. + +The current approach is slower than the previous, try to show 100 tanks on +screen and see the framerate to drop to slugish values. It needs optimization. + +Other possibility would be to use OpenGL for drawing. + +3.2 Views system + +Let the mess begin. All views related stuff is in src/NetPanzer/Views: + * Components: Some components for use in views, View and Desktop here. + * Game: Views used in game. + * MainMenu: don't need to explain. + +Desktop is the container for all the other views, is like the "Desktop" of the +operating systems. + +View is a internal window, it can have "Component"s. + +Views are added to the desktop and never "deleted". Views has a name and are +searched by name. Views can be hidden or shown. + +Views are activated when added to the Desktop or when the mouse enters the view. +If the mouse leaves the View, they are deactivated. This causes that one of the +components (cInputField) lose its focus when the mouse exits its view, so when +players are typing their player name, or the address of some server, the mouse +must stay inside the view. + +The old View system had a Surface created each time it wanted to draw, using the +original memory of the destination Surface, clipped to the View size. It drew +directly on the pixel memory of the destination Surface, in fact, the +ScreenSurface. + +The modified View system, doesn't create any surface, it draws (blits mostly) +on the ScreenSurface always, no new Surfaces are created for this drawing. + +It is difficult to follow the Views, some of them works as a multi view, and +holds a string with the name of the real view. + +Views with focus will receive mouse events (only), and they must take care of +read the keyboard events if they need them. The interesting case here is the +GameView, it calls WorldInputCmdProcessor to handle the mouse/keyboard events. +Input will be explained later. + +3.2.1 View Components + +There was 2 kind of Components, one handled in each View internally other +handled as real "Components". When I took the code, it seems that there was some +changes going on to convert from the internal View components to external +Components, the developers found the mess and decided to rewrite the view +system, called it Panels or something like that, but was really never used. I +deleted that code and did more work to convert the components to Components. + +The current components can use some kind of pre-rendering, if nothing changes +just blit the pre-rendered image. All the components has a name and may have a +custom code. + +The current components are: + * Button: can have a text label, 1 to 3 images and border. The text can have + 3 different colors for each state (normal, hover, pressed) and so does + the border. Border colors split between top left and bottom right + colors. + Buttons doesn't have a callback function, but you can create your own + Button subclass and override actionPerformed. + When the Button is crated, its component name is set to + "Button.". + * CheckBox: can have a label, the text color is always white. + CheckBoxes can have a StateChangedCallback object, will be called if + state changes. + * Choice: this is a ComboBox known in other languages. It has a list of + items that will be shown. + Choices can have a StateChangedCallback too. The colors are fixed. + * InfoBar: used in game (top bar) to show game information. + * Label: can have some text to show, foreground, background color and + shadow. + Labels has a component name "Label.". + Labels uses the prerendering way. + * MiniMap: used in game to draw the minimap. + * cInputField: Uses old component method, allows to enter a line of text. + +The current in-game views are: + * GameView: Draws everything game related, also call the in-game key/mouse + handler. + * AreYouSureExitView, AreYouSureResignView, DisconnectedView: those are very + simple views, its name says what they do. + * CodeStatsView: Used for in-game developer information, shows things like + network stats (packets sent/received), pathfinding stats, unit stats... + * GameTemplateView: Base class for some other game related views, not for + GameView and it is not a c++ template. + * HelpScrollView: Shows the help. + * LibView: some some in-game developer information, allows to change some + of the engine configuration (mainly for tests). + * LoadingView: the window that is seen when the game is connecting to a + server and loading the resources as map, etc... + * MiniMapView: has a MiniMap component. + * RankView: shows the current player ranking. + * VehicleSelectionView: is the window to select which tank to create in the + outposts. + +----- Thats it for now ----- + + + diff -Nru netpanzer-0.8.2/docs/coding.txt netpanzer-0.8.4.debian.1/docs/coding.txt --- netpanzer-0.8.2/docs/coding.txt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/docs/coding.txt 2004-02-21 22:44:11.000000000 +0000 @@ -0,0 +1,35 @@ + +Some words on the used coding standards: + +Formating: +-Indentation is done with 4 spaces, tabs are not allowed +-braces are used like this: + +class SomeClass +{ +public: + void someFunction() + { + if(foo) { + // ... + } else { + // ... + } + + while(bar) { + // ... + } + } +}; +-classnames are written LikeThis and This +-member and attributenames are written likeThis and this +-documentating comments are written in doxygen format +-A single .hpp and .cpp only contains declarations/implementations for 1 class, + the filename is the same as the classname + +Code: +-We only use libraries that claim to be portable to at least windows, linux and + MacOS/X +-We use modern c++ standards where possible. This includes: + namespaces, RTTI, exceptions, iostreams, STL + diff -Nru netpanzer-0.8.2/docs/docbook/serverhowto.xml netpanzer-0.8.4.debian.1/docs/docbook/serverhowto.xml --- netpanzer-0.8.2/docs/docbook/serverhowto.xml 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/docs/docbook/serverhowto.xml 2005-07-25 20:38:32.000000000 +0000 @@ -0,0 +1,224 @@ + + +
+ + NetPanzer Server Setup HowTo + + Matthias + Braun + + + 2004 + + + + This is a preliminary version of the netpanzer server howto. Feedback and + improvement to the scripts, tips&tricks are appreciated. Please send them + to matze@braunis.de. + + + Installation + +The server comes with the normal netpanzer package, look into the README there +on how to install netpanzer. + + + + Configuration + +You can find the server configuration file in your home directory in +.netpanzer/config/netpanzer-dedicated.ini. If this file doesn't exist yet, start +your server once and quit (by using the quit command) and this file should have +been created. You can find a description of all theconfig commands in the +netpanzer README. + + + Firewalls + +If your server is using a firewall, you have to forward port 3030 TCP+UDP. +You can change this port with the port setting in the config file. + + + + + Startscripts and Tools + + Restart on crash + +Unfortunately the netpanzer server is not as stable yet as it should be. So you +should install a script that restarts the server automatically in case of a +crash. This can be achieved with the following script (called +start-netpanzer-dedicated.sh). + + + +#!/bin/bash + +# insert the directory of the server binary here +DIR=. + +cd $DIR +running=yes +while [ $running = "yes" ]; do + ./netpanzer -d $@ + if [ $? -ge 128 ]; then + echo "`date`: Restarting server after crash" + # wait a bit to not blow cpu and logfiles on constant crashs + sleep 30 + else + #normal exit + running=no + fi +done + + + + + Screen + +Typically you don't always want to monitor your server in a terminal window. +Also in case your monitoring terminal terminates the server is normally stopped +too. To solve these problems there's a handy little tool called +Screen that allows +you to run your applications in a virtual terminal to which you can +attach/detach at any time. + + +So typically you write another script with your startup parameters like this +(also take a look at the Security Warning at the end of this document for the + commented variants). + +#!/bin/bash + +# insert the directory of the start-netpanzer-dedicated.sh here +DIR=. + +cd $DIR + +# starts the server in a screen. Please consider using 1 of the 2 variants below +# for increased security +screen -A -m -d -S netpanzer ./start-netpanzer-dedicated.sh $@ + +# This version switches to a more secure user account +# screen -A -m -d -S netpanzer su - netpserver -c "./start-netpanzer-dedicated.sh $@" + +# This version starts the server in a chroot environment and with a different +# user for even more security +# screen -A -m -d -S netpanzer chroot /home/netpserver su - netpserver -c "./start-netpanzer-dedicated.sh $@" + + + +You can attach to this virtual netpanzer terminal by typing +screen -r netpanzer. You can detach again by pressing +CTRL+A and then CTRL+D. See the Screen documentation for details. + + + + + Integration into the system + +Often you want to further integrate the server into your system so that it is +automatically started on startup and checked on a regular basis. + + + Init Scripts + Most linux and bsd systems come with an init script system that + takes care of starting and stopping services on the system. Creating such + initscripts is distribution specific, so I just present the script for + gentoo here as an example: + +#!/sbin/runscripts + +depend() { + need net +} + +start() { + ebegin "Starting netpanzer server" + start-stop-daemon --start --quiet --pidfile /var/run/netpanzer.pid --exec /usr/local/scripts/netpanzer-screen.sh --pidfile=/var/run/netpanzer.pid + eend $? +} + +stop() { + ebegin "Stopping netpanzer server" + start-stop-daemon --stop --quiet --pidfile /var/run/netpanzer.pid + eedn $? +} + + + + + Cron Jobs + If you can't integrate the server into the initscripts of your + system (if you have only a user account for example) then you can use cron + to make sure your server stays running even after system restarts. You + should write another script that checks for a running server and + eventually restarts it (called + check-netpanzer-server.sh + +#!/bin/sh + +procs=`/bin/ps` +if echo "$procs" | grep netpanzer > /dev/null; then + exit +fi + +# start netpanzer server +cd /usr/local/scripts +./netpanzer-screen.sh + + + +You should start this script regularly in a cronjob. By adding the following +line in your crontab (type crontab -e to edit your crontab). +This will check the server every hour (54 minutes after the full hour) to make +sure it is still running. + +# min hour day month dayofweek command +54 * * * * /bin/sh /usr/local/scripts/check-netpanzer-server.sh + + + + + + Security Warning + +The code of the server hasn't undergone an in-depth review for security holes +yet, so you should expect the possibility that attackers can find buffer +overflows to obtain control over the netpanzer executable and the user account +the server is running. (Experience shows that this also happens with other +servers that claim to be secure...) + + +Therefore it is recommended to run the server in a special user account with +limited rights. On linux/bsd you should also consider using a chroot +environment for increased security. Consult external documentation about +details. The screen startup script shown above also demonstrates in a comment +how to do this with the su and chroot commands. + + + + Additional Tools + + PHP Server Browser + + Tobias Blersch has written a php script which allows you display a list + of running netpanzer servers on your homepage. You can find it at the + download +section of netpanzer in the misc category. + + + + QStat + The netpanzer masterserver protocol is compatible with qstat +(http://www.qstat.org). + You can query for netpanzer server with the command + qstat -gsm,netpanzer 81.169.185.36. There are several + tools and scripts available to display server status on homepages with the + help of qstat. + + + +
+ diff -Nru netpanzer-0.8.2/docs/Doxyfile netpanzer-0.8.4.debian.1/docs/Doxyfile --- netpanzer-0.8.2/docs/Doxyfile 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/docs/Doxyfile 2004-02-01 17:40:16.000000000 +0000 @@ -0,0 +1,205 @@ +# Doxyfile 1.3.4 + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- +PROJECT_NAME = netpanzer +PROJECT_NUMBER = +OUTPUT_DIRECTORY = out/doxygen +OUTPUT_LANGUAGE = English +USE_WINDOWS_ENCODING = NO +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ALWAYS_DETAILED_SEC = NO +INLINE_INHERITED_MEMB = NO +FULL_PATH_NAMES = NO +STRIP_FROM_PATH = $(top_srcdir) +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = NO +DETAILS_AT_TOP = NO +INHERIT_DOCS = YES +DISTRIBUTE_GROUP_DOC = NO +TAB_SIZE = 8 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = NO +OPTIMIZE_OUTPUT_JAVA = NO +SUBGROUPING = YES +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- +EXTRACT_ALL = NO +EXTRACT_PRIVATE = NO +EXTRACT_STATIC = NO +EXTRACT_LOCAL_CLASSES = YES +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = NO +INTERNAL_DOCS = NO +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +SHOW_INCLUDE_FILES = YES +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = YES +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= YES +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = YES +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- +QUIET = YES +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- +INPUT = $(top_srcdir)/src +FILE_PATTERNS = *.cpp *.hpp +RECURSIVE = YES +EXCLUDE = +EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = +EXAMPLE_RECURSIVE = NO +IMAGE_PATH = +INPUT_FILTER = +FILTER_SOURCE_FILES = NO +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- +SOURCE_BROWSER = NO +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = YES +REFERENCES_RELATION = YES +VERBATIM_HEADERS = YES +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- +ALPHABETICAL_INDEX = NO +COLS_IN_ALPHA_INDEX = 5 +IGNORE_PREFIX = +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_ALIGN_MEMBERS = YES +GENERATE_HTMLHELP = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +BINARY_TOC = NO +TOC_EXPAND = NO +DISABLE_INDEX = NO +ENUM_VALUES_PER_LINE = 4 +GENERATE_TREEVIEW = NO +TREEVIEW_WIDTH = 250 +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- +GENERATE_LATEX = YES +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4wide +EXTRA_PACKAGES = +LATEX_HEADER = +PDF_HYPERLINKS = NO +USE_PDFLATEX = NO +LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_LINKS = NO +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- +GENERATE_XML = NO +XML_OUTPUT = xml +XML_SCHEMA = +XML_DTD = +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- +GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = NO +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = YES +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +PREDEFINED = +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = YES +#--------------------------------------------------------------------------- +# Configuration::addtions related to external references +#--------------------------------------------------------------------------- +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +PERL_PATH = /usr/bin/perl +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- +CLASS_DIAGRAMS = YES +HIDE_UNDOC_RELATIONS = YES +HAVE_DOT = NO +CLASS_GRAPH = YES +COLLABORATION_GRAPH = YES +UML_LOOK = NO +TEMPLATE_RELATIONS = NO +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = NO +GRAPHICAL_HIERARCHY = YES +DOT_IMAGE_FORMAT = png +DOT_PATH = +DOTFILE_DIRS = +MAX_DOT_GRAPH_WIDTH = 1024 +MAX_DOT_GRAPH_HEIGHT = 1024 +MAX_DOT_GRAPH_DEPTH = 0 +GENERATE_LEGEND = YES +DOT_CLEANUP = YES +#--------------------------------------------------------------------------- +# Configuration::addtions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO diff -Nru netpanzer-0.8.2/docs/Jamfile netpanzer-0.8.4.debian.1/docs/Jamfile --- netpanzer-0.8.2/docs/Jamfile 2007-05-26 06:36:54.000000000 +0000 +++ netpanzer-0.8.4.debian.1/docs/Jamfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -SubDir TOP docs ; - -InstallMan netpanzer.6 ; - -if $(DOXYGEN) { - actions DoxyGen - { - top_srcdir=$(top_srcdir) $(DOXYGEN) $(DOXGEN_FLAGS) $(>) - } - - SEARCH on Doxyfile = $(SUBDIR) ; - - NotFile doxygen ; - Always doxygen ; - Depends doc : doxygen ; - Depends doxygen : Doxyfile ; - DoxyGen doxygen : Doxyfile ; - - Help doxygen : "Create doxygen documentation of the project" ; -} - -# hack for docbook stuff (TODO need a more robust way to do this) -DBDIR = "/usr/share/sgml/docbook/xsl-stylesheets-1.66.1" ; -actions XsltProc -{ - xsltproc -o $(<) $(DBDIR)/html/docbook.xsl $(>) -} -SEARCH on serverhowto.xml = $(SUBDIR)/docbook ; -LOCATE on serverhowto.html = $(SUBDIR) ; -XsltProc serverhowto.html : serverhowto.xml ; -Depends serverhowto.html : serverhowto.xml ; -Depends docbook : serverhowto.html ; -Help docbook : "Update docbook documentation" ; diff -Nru netpanzer-0.8.2/Jamconfig.in netpanzer-0.8.4.debian.1/Jamconfig.in --- netpanzer-0.8.2/Jamconfig.in 2007-07-08 14:04:20.000000000 +0000 +++ netpanzer-0.8.4.debian.1/Jamconfig.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -SHELL ?= "@SHELL@" ; -PATH_SEPARATOR ?= "@PATH_SEPARATOR@" ; -PACKAGE_NAME ?= "@PACKAGE_NAME@" ; -PACKAGE_TARNAME ?= "@PACKAGE_TARNAME@" ; -PACKAGE_VERSION ?= "@PACKAGE_VERSION@" ; -PACKAGE_STRING ?= "@PACKAGE_STRING@" ; -PACKAGE_BUGREPORT ?= "@PACKAGE_BUGREPORT@" ; -exec_prefix ?= "@exec_prefix@" ; -prefix ?= "@prefix@" ; -program_transform_name ?= "@program_transform_name@" ; -bindir ?= "@bindir@" ; -sbindir ?= "@sbindir@" ; -libexecdir ?= "@libexecdir@" ; -datarootdir ?= "@datarootdir@" ; -datadir ?= "@datadir@" ; -sysconfdir ?= "@sysconfdir@" ; -sharedstatedir ?= "@sharedstatedir@" ; -localstatedir ?= "@localstatedir@" ; -includedir ?= "@includedir@" ; -oldincludedir ?= "@oldincludedir@" ; -docdir ?= "@docdir@" ; -infodir ?= "@infodir@" ; -htmldir ?= "@htmldir@" ; -dvidir ?= "@dvidir@" ; -pdfdir ?= "@pdfdir@" ; -psdir ?= "@psdir@" ; -libdir ?= "@libdir@" ; -localedir ?= "@localedir@" ; -mandir ?= "@mandir@" ; -DEFS ?= "@DEFS@" ; -ECHO_C ?= "@ECHO_C@" ; -ECHO_N ?= "@ECHO_N@" ; -ECHO_T ?= "@ECHO_T@" ; -LIBS ?= "@LIBS@" ; -build_alias ?= "@build_alias@" ; -host_alias ?= "@host_alias@" ; -target_alias ?= "@target_alias@" ; -build ?= "@build@" ; -build_cpu ?= "@build_cpu@" ; -build_vendor ?= "@build_vendor@" ; -build_os ?= "@build_os@" ; -host ?= "@host@" ; -host_cpu ?= "@host_cpu@" ; -host_vendor ?= "@host_vendor@" ; -host_os ?= "@host_os@" ; -target ?= "@target@" ; -target_cpu ?= "@target_cpu@" ; -target_vendor ?= "@target_vendor@" ; -target_os ?= "@target_os@" ; -CC ?= "@CC@" ; -CFLAGS ?= "@CFLAGS@" ; -LDFLAGS ?= "@LDFLAGS@" ; -LIBS ?= "@LIBS@" ; -CPPFLAGS ?= "@CPPFLAGS@" ; -CC ?= "@CC@" ; -CC ?= "@CC@" ; -CC ?= "@CC@" ; -CC ?= "@CC@" ; -ac_ct_CC ?= "@ac_ct_CC@" ; -EXEEXT ?= "@EXEEXT@" ; -OBJEXT ?= "@OBJEXT@" ; -CPP ?= "@CPP@" ; -CPPFLAGS ?= "@CPPFLAGS@" ; -CPP ?= "@CPP@" ; -GREP ?= "@GREP@" ; -GREP ?= "@GREP@" ; -EGREP ?= "@EGREP@" ; -EGREP ?= "@EGREP@" ; -VARIANT ?= "@VARIANT@" ; -CXX ?= "@CXX@" ; -CXXFLAGS ?= "@CXXFLAGS@" ; -LDFLAGS ?= "@LDFLAGS@" ; -LIBS ?= "@LIBS@" ; -CPPFLAGS ?= "@CPPFLAGS@" ; -CXX ?= "@CXX@" ; -ac_ct_CXX ?= "@ac_ct_CXX@" ; -INSTALL_PROGRAM ?= "@INSTALL_PROGRAM@" ; -INSTALL_SCRIPT ?= "@INSTALL_SCRIPT@" ; -INSTALL_DATA ?= "@INSTALL_DATA@" ; -DOXYGEN ?= "@DOXYGEN@" ; -SDL_CONFIG ?= "@SDL_CONFIG@" ; -SDL_CFLAGS ?= "@SDL_CFLAGS@" ; -SDL_LIBS ?= "@SDL_LIBS@" ; -SDLMIXER_AVAILABLE ?= "@SDLMIXER_AVAILABLE@" ; -SDLMIXER_CFLAGS ?= "@SDLMIXER_CFLAGS@" ; -SDLMIXER_LIBS ?= "@SDLMIXER_LIBS@" ; -PHYSFS_AVAILABLE ?= "@PHYSFS_AVAILABLE@" ; -PHYSFS_CFLAGS ?= "@PHYSFS_CFLAGS@" ; -PHYSFS_LIBS ?= "@PHYSFS_LIBS@" ; -prefix ?= "@prefix@" ; -exec_prefix ?= "@exec_prefix@" ; -bindir ?= "@bindir@" ; -sbindir ?= "@sbindir@" ; -libexecdir ?= "@libexecdir@" ; -datadir ?= "@datadir@" ; -sysconfdir ?= "@sysconfdir@" ; -sharedstatedir ?= "@sharedstatedir@" ; -localstatedir ?= "@localstatedir@" ; -libdir ?= "@libdir@" ; -includedir ?= "@includedir@" ; -oldincludedir ?= "@oldincludedir@" ; -infodir ?= "@infodir@" ; -mandir ?= "@mandir@" ; -INSTALL ?= "@INSTALL@" ; -INSTALL_PROGRAM ?= "@INSTALL_PROGRAM@" ; -INSTALL_SCRIPT ?= "@INSTALL_SCRIPT@" ; -INSTALL_DATA ?= "@INSTALL_DATA@" ; -LIBOBJS ?= "@LIBOBJS@" ; -LTLIBOBJS ?= "@LTLIBOBJS@" ; -INSTALL ?= "@INSTALL@" ; -JAMCONFIG_READ = yes ; diff -Nru netpanzer-0.8.2/Jamfile netpanzer-0.8.4.debian.1/Jamfile --- netpanzer-0.8.2/Jamfile 2007-07-08 14:04:30.000000000 +0000 +++ netpanzer-0.8.4.debian.1/Jamfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -SubDir TOP ; - -# Decend into subdirs -if ! $(NO_SRC) -{ - SubInclude TOP src ; - SubInclude TOP docs ; -} -if ! $(NO_DATA) -{ - SubInclude TOP pics ; - SubInclude TOP maps ; - SubInclude TOP sound ; - SubInclude TOP powerups ; - SubInclude TOP units ; - SubInclude TOP wads ; -# SubInclude TOP fonts ; - SubInclude TOP cache ; -} - -UseAutoconf ; - -if ! $(NO_SRC) { - InstallPixmap netpanzer.png netpanzer.xpm ; - InstallDesktop netpanzer.desktop ; - InstallDoc ChangeLog README TODO RELNOTES docs/tipofday.txt docs/serverhowto.html ; -} diff -Nru netpanzer-0.8.2/Jamrules netpanzer-0.8.4.debian.1/Jamrules --- netpanzer-0.8.2/Jamrules 2007-06-01 15:28:37.000000000 +0000 +++ netpanzer-0.8.4.debian.1/Jamrules 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -if ! $(top_builddir) -{ - top_builddir = $(TOP) ; -} -top_srcdir = $(TOP) ; - -JAMCONFIG ?= $(top_builddir)/Jamconfig ; -include $(JAMCONFIG) ; -if ! $(JAMCONFIG_READ) -{ - EXIT "Couldn't find config. Please run 'configure' first." ; -} - -if $(USE_STLPORT_DEBUG) -{ - CPPFLAGS += -I/usr/include/stlport ; - CPPFLAGS += -D_STLP_DEBUG=1 -D_STLP_DEBUG_UNINITIALIZED=1 ; - CPPFLAGS += -D_STLP_SHRED_BYTE=0xA3 ; - LIBS += -lstlport_gcc_debug ; -} - -COMPILER_CFLAGS += -Wall -W ; -COMPILER_CFLAGS_optimize += -O3 -g3 ; -COMPILER_C++FLAGS_optimize += -O3 -g3 ; -COMPILER_LFLAGS_optimize += -O3 -g3 ; -COMPILER_CFLAGS_debug += -DDEBUG -Werror -g3 ; -COMPILER_CXXFLAGS_debug += -DDEBUG -Werror -g3 ; -COMPILER_LFLAGS_debug += -g3 ; -COMPILER_CFLAGS_profile += -O2 -g3 -pg ; -COMPILER_CXXFLAGS_profile += -O2 -g3 -pg ; -COMPILER_LFLAGS_profile += -g3 -pg ; - -LINK = $(CXX) ; - -# Include build rules -include $(TOP)/mk/jam/build.jam ; - -# Include Dirs -IncludeDir $(top_builddir) ; # for config.h diff -Nru netpanzer-0.8.2/LICENSE-physfs.txt netpanzer-0.8.4.debian.1/LICENSE-physfs.txt --- netpanzer-0.8.2/LICENSE-physfs.txt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/LICENSE-physfs.txt 2011-09-15 11:43:06.000000000 +0000 @@ -0,0 +1,44 @@ + + Copyright (c) 2001-2011 Ryan C. Gordon and others. + + This software is provided 'as-is', without any express or implied warranty. + In no event will the authors be held liable for any damages arising from + the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software in a + product, an acknowledgment in the product documentation would be + appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. + + Ryan C. Gordon + + + + +Notes, separate from the license. This is not legal advice. + +Versions of PhysicsFS prior to 0.1.9 are licensed under the GNU Lesser General + Public License, which restricts you significantly more. For your own safety, + please make sure you've got 0.1.9 or later if you plan to use physfs in a + commercial or closed-source project. + +Optional pieces of PhysicsFS may fall under other licenses, please consult +your lawyer for legal advice, which this is not... + + zlib: if you enable ZIP archive support, PhysicsFS uses zlib. Its license + requirements are identical to PhysicsFS. + Please see zlib123/README for details. + + lzma: if you enable LZMA (7zip) support, PhysicsFS uses the lzma sdk. + It uses the LGPL license, with exceptions for closed-source programs. + Please see lzma/lzma.txt for details. + diff -Nru netpanzer-0.8.2/makerelease.sh netpanzer-0.8.4.debian.1/makerelease.sh --- netpanzer-0.8.2/makerelease.sh 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/makerelease.sh 2005-01-26 22:54:59.000000000 +0000 @@ -0,0 +1,74 @@ +#!/bin/sh +# a little script for making a netpanzer release + +VERSION=`autoconf -t AC_INIT | sed -e 's/[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\):.*/\1/g'` + +echo "Creating release netpanzer-$VERSION" + +SOURCERELEASE=release/netpanzer-$VERSION +DATARELEASE=release/netpanzer-data-$VERSION + +# first clean the directories up +echo "*** Cleaning up" +#if test ! -f configure; then + ./autogen.sh +#fi +#if test ! -f Jamconfig; then + ./configure +#fi +rm -rf out +rm -rf release +jam docbook +jam distclean + +echo "*** Scanning for files" +AUTOFILES="autogen.sh configure.ac configure config.h.in `find mk/autoconf/ -name "*.m4" -o -name "config.*"` mk/autoconf/install-sh" +JAMFILES="Jamrules Jamconfig.in `find mk/jam -name "*.jam"`" +ICONS="*.png *.xpm" +DESKTOPFILES="netpanzer.desktop" +TEXTS="COPYING README TODO RELNOTES ChangeLog" +SOURCES="`find src -name "*.cpp" -o -name "*.hpp" -o -name "Jamfile"`" +DOCS="docs/*.[1-9] docs/serverhowto.html docs/tipofday.txt docs/Jamfile" + +echo "*** Creating Sourcepackage" +mkdir -p $SOURCERELEASE +# Create a new Jamfile +echo "NO_DATA = 1 ;" > $SOURCERELEASE/Jamfile +cat Jamfile >> $SOURCERELEASE/Jamfile + +cp -p --parents $AUTOFILES $SOURCERELEASE +cp -p --parents $JAMFILES $SOURCERELEASE +cp -p --parents $TEXTS $SOURCERELEASE +cp -p --parents $SOURCES $SOURCERELEASE +cp -p --parents $ICONS $SOURCERELEASE +cp -p --parents $DESKTOPFILES $SOURCERELEASE +cp -p --parents $DOCS $SOURCERELEASE + +echo "*** Packing source" +cd release +tar -c --bzip2 -f netpanzer-$VERSION.tar.bz2 netpanzer-$VERSION +cd - + +echo "*** Creating data release" +mkdir -p $DATARELEASE +# Create a new Jamfile +echo "NO_SRC = 1 ;" > $DATARELEASE/Jamfile +cat Jamfile >> $DATARELEASE/Jamfile + +find pics \( -name "*.bmp" -o -name "*.raw" -o -name "*.til" -o -name "*.pak" -o -name "Jamfile" \) -exec cp -p --parents {} $DATARELEASE ';' +find wads \( -name "*.act" -o -name "*.tls" -o -name "Jamfile" \) -exec cp -p --parents {} $DATARELEASE ';' +find powerups \( -name "*.pak" -o -name "Jamfile" \) -exec cp -p --parents {} $DATARELEASE ';' +find units \( -name "*.pfl" -o -name "*.pak" -o -name "Jamfile" \) -exec cp -p --parents {} $DATARELEASE ';' +find sound \( -name "*.wav" -o -name "Jamfile" \) -exec cp -p --parents {} $DATARELEASE ';' +find maps \( -name "*.npm" -o -name "*.opt" -o -name "*.spn" -o -name "Jamfile" \) -exec cp -p --parents {} $DATARELEASE ';' +find cache \( -name "*.tbl" -o -name "Jamfile" \) -exec cp -p --parents {} $DATARELEASE ';' +# find fonts \( -name "*.pcf" \) -exec cp -p --parents {} $DATARELEASE ';' +cp -p --parents $AUTOFILES $DATARELEASE +cp -p --parents $JAMFILES $DATARELEASE +cp -p --parents $TEXTS $DATARELEASE + +echo "*** Packing Data" +cd release +tar -c --bzip2 -f netpanzer-data-$VERSION.tar.bz2 netpanzer-data-$VERSION +cd - + Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/Bullet Hole.npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/Bullet Hole.npm differ diff -Nru netpanzer-0.8.2/maps/Bullet Hole.opt netpanzer-0.8.4.debian.1/maps/Bullet Hole.opt --- netpanzer-0.8.2/maps/Bullet Hole.opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Bullet Hole.opt 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,20 @@ +ObjectiveCount: 6 + +Name: Muffdorf +Location: 43 20 + +Name: Sniper +Location: 158 28 + +Name: Pott +Location: 72 109 + +Name: Crow +Location: 129 102 + +Name: Valor +Location: 152 180 + +Name: Wax +Location: 38 189 + diff -Nru netpanzer-0.8.2/maps/Bullet Hole.spn netpanzer-0.8.4.debian.1/maps/Bullet Hole.spn --- netpanzer-0.8.2/maps/Bullet Hole.spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Bullet Hole.spn 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,5 @@ +SpawnCount: 4 +Location: 56 63 +Location: 152 132 +Location: 50 141 +Location: 145 65 Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/Crop Circles.npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/Crop Circles.npm differ diff -Nru netpanzer-0.8.2/maps/Crop Circles.opt netpanzer-0.8.4.debian.1/maps/Crop Circles.opt --- netpanzer-0.8.2/maps/Crop Circles.opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Crop Circles.opt 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,58 @@ +ObjectiveCount: 14 + + +Name: Riyadh +Location: 252 271 + + +Name: Dhahran +Location: 101 271 + + +Name: Jeddah +Location: 175 214 + + +Name: Jubail +Location: 251 176 + + +Name: Unaizah +Location: 41 328 + + +Name: Najran +Location: 178 138 + + +Name: Taif +Location: 253 73 + + +Name: Jizan +Location: 102 73 + + +Name: Madinah +Location: 103 176 + + +Name: Khobar +Location: 313 328 + + +Name: Yanbu +Location: 41 12 + + +Name: Tabouk +Location: 313 12 + + +Name: Eretria +Location: 37 184 + + +Name: Jouf +Location: 317 184 + diff -Nru netpanzer-0.8.2/maps/Crop Circles.spn netpanzer-0.8.4.debian.1/maps/Crop Circles.spn --- netpanzer-0.8.2/maps/Crop Circles.spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Crop Circles.spn 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,14 @@ +SpawnCount: 13 +Location: 173 94 +Location: 177 270 +Location: 245 338 +Location: 94 338 +Location: 177 183 +Location: 105 223 +Location: 251 221 +Location: 336 257 +Location: 14 257 +Location: 44 96 +Location: 306 96 +Location: 227 35 +Location: 117 36 Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/Heroes.npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/Heroes.npm differ diff -Nru netpanzer-0.8.2/maps/Heroes.opt netpanzer-0.8.4.debian.1/maps/Heroes.opt --- netpanzer-0.8.2/maps/Heroes.opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Heroes.opt 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,13 @@ +ObjectiveCount: 6 +Name: Looser#1 +Location: 32 15 +Name: Heores +Location: 186 6 +Name: Looser#3 +Location: 175 128 +Name: Looser#4 +Location: 30 170 +Name: Looser#5 +Location: 28 99 +Name: Looser#6 +Location: 108 172 diff -Nru netpanzer-0.8.2/maps/Heroes.spn netpanzer-0.8.4.debian.1/maps/Heroes.spn --- netpanzer-0.8.2/maps/Heroes.spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Heroes.spn 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1 @@ +SpawnCount: 6 Location: 145 19 Location: 64 31 Location: 58 116 Location: 12 195 Location: 138 195 Location: 191 155 \ No newline at end of file Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/Hill 221 (mod).npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/Hill 221 (mod).npm differ diff -Nru netpanzer-0.8.2/maps/Hill 221 (mod).opt netpanzer-0.8.4.debian.1/maps/Hill 221 (mod).opt --- netpanzer-0.8.2/maps/Hill 221 (mod).opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Hill 221 (mod).opt 2010-01-25 13:44:51.000000000 +0000 @@ -0,0 +1,43 @@ +ObjectiveCount: 21 +Name: Falcon I +Location: 22 13 +Name: Falcon II +Location: 19 48 +Name: Falcon III +Location: 90 24 +Name: Charly Nord +Location: 379 15 +Name: Charly Middle +Location: 380 87 +Name: Charly South +Location: 376 123 +Name: Foxtrott East +Location: 195 125 +Name: Foxtrott South +Location: 202 155 +Name: Foxtrott West +Location: 155 132 +Name: Bismark HQ +Location: 21 176 +Name: Bismark East +Location: 65 168 +Name: Bismark South +Location: 50 217 +Name: Leipzig +Location: 243 216 +Name: Chemnitz +Location: 236 240 +Name: Dresden +Location: 294 239 +Name: Alpha I +Location: 322 330 +Name: Alpha II +Location: 317 370 +Name: Alpha III +Location: 262 367 +Name: Dakota II +Location: 39 379 +Name: Dakota HQ +Location: 77 360 +Name: Dakota I +Location: 128 384 diff -Nru netpanzer-0.8.2/maps/Hill 221 (mod).spn netpanzer-0.8.4.debian.1/maps/Hill 221 (mod).spn --- netpanzer-0.8.2/maps/Hill 221 (mod).spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Hill 221 (mod).spn 2010-01-25 13:44:51.000000000 +0000 @@ -0,0 +1 @@ +SpawnCount: 11 Location: 29 282 Location: 125 303 Location: 221 283 Location: 199 378 Location: 388 242 Location: 347 185 Location: 269 57 Location: 217 53 Location: 65 78 Location: 133 181 Location: 160 268 \ No newline at end of file Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/Hurry up.npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/Hurry up.npm differ diff -Nru netpanzer-0.8.2/maps/Hurry up.opt netpanzer-0.8.4.debian.1/maps/Hurry up.opt --- netpanzer-0.8.2/maps/Hurry up.opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Hurry up.opt 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,11 @@ +ObjectiveCount: 5 +Name: Outpost#1 +Location: 200 121 +Name: Outpost#2 +Location: 200 6 +Name: Outpost#3 +Location: 297 6 +Name: Outpost#4 +Location: 296 121 +Name: Outpost#5 +Location: 247 63 diff -Nru netpanzer-0.8.2/maps/Hurry up.spn netpanzer-0.8.4.debian.1/maps/Hurry up.spn --- netpanzer-0.8.2/maps/Hurry up.spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Hurry up.spn 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1 @@ +SpawnCount: 13 Location: 24 61 Location: 17 22 Location: 11 133 Location: 65 140 Location: 65 17 Location: 50 93 Location: 74 56 Location: 485 21 Location: 478 133 Location: 407 17 Location: 415 119 Location: 464 89 Location: 436 59 \ No newline at end of file diff -Nru netpanzer-0.8.2/maps/Jamfile netpanzer-0.8.4.debian.1/maps/Jamfile --- netpanzer-0.8.2/maps/Jamfile 2007-05-26 06:55:13.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Jamfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -SubDir TOP maps ; - -InstallData [ Wildcard *.npm *.opt *.spn ] : maps ; Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/Mittelerde.npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/Mittelerde.npm differ diff -Nru netpanzer-0.8.2/maps/Mittelerde.opt netpanzer-0.8.4.debian.1/maps/Mittelerde.opt --- netpanzer-0.8.2/maps/Mittelerde.opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Mittelerde.opt 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,20 @@ +ObjectiveCount: 6 + +Name: Aman +Location: 40 35 + +Name: Valinor +Location: 34 273 + +Name: Beleriand +Location: 271 28 + +Name: Numenor +Location: 181 29 + +Name: Excelsior +Location: 30 166 + +Name: Demokles +Location: 160 259 + diff -Nru netpanzer-0.8.2/maps/Mittelerde.spn netpanzer-0.8.4.debian.1/maps/Mittelerde.spn --- netpanzer-0.8.2/maps/Mittelerde.spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Mittelerde.spn 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,10 @@ +SpawnCount: 9 +Location: 79 29 +Location: 181 157 +Location: 160 179 +Location: 232 167 +Location: 283 130 +Location: 177 98 +Location: 126 129 +Location: 122 204 +Location: 249 290 Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/Operation Blue.npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/Operation Blue.npm differ diff -Nru netpanzer-0.8.2/maps/Operation Blue.opt netpanzer-0.8.4.debian.1/maps/Operation Blue.opt --- netpanzer-0.8.2/maps/Operation Blue.opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Operation Blue.opt 2010-01-25 13:44:51.000000000 +0000 @@ -0,0 +1,33 @@ +ObjectiveCount: 16 +Name: Madrid +Location: 86 31 +Name: Sevilla +Location: 23 104 +Name: Valencia +Location: 144 103 +Name: Bilbao +Location: 199 7 +Name: Paris +Location: 279 77 +Name: Toulouse +Location: 340 173 +Name: Lyon +Location: 429 110 +Name: Nancy +Location: 474 15 +Name: Potsdam +Location: 161 313 +Name: Koeln +Location: 49 352 +Name: Dresden +Location: 154 423 +Name: Bamberg +Location: 30 459 +Name: Breslau +Location: 364 439 +Name: Krakau +Location: 480 478 +Name: Warschau +Location: 484 232 +Name: Lodz +Location: 396 293 diff -Nru netpanzer-0.8.2/maps/Operation Blue.spn netpanzer-0.8.4.debian.1/maps/Operation Blue.spn --- netpanzer-0.8.2/maps/Operation Blue.spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Operation Blue.spn 2010-01-25 13:44:51.000000000 +0000 @@ -0,0 +1 @@ +SpawnCount: 4 Location: 120 66 Location: 383 59 Location: 380 379 Location: 107 390 \ No newline at end of file Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/Road to Abitos.npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/Road to Abitos.npm differ diff -Nru netpanzer-0.8.2/maps/Road to Abitos.opt netpanzer-0.8.4.debian.1/maps/Road to Abitos.opt --- netpanzer-0.8.2/maps/Road to Abitos.opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Road to Abitos.opt 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,5 @@ +ObjectiveCount: 1 + +Name: Abitos +Location: 16 6 + diff -Nru netpanzer-0.8.2/maps/Road to Abitos.spn netpanzer-0.8.4.debian.1/maps/Road to Abitos.spn --- netpanzer-0.8.2/maps/Road to Abitos.spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Road to Abitos.spn 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,4 @@ +SpawnCount: 3 +Location: 119 94 +Location: 109 90 +Location: 105 99 Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/Tankdrive.npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/Tankdrive.npm differ diff -Nru netpanzer-0.8.2/maps/Tankdrive.opt netpanzer-0.8.4.debian.1/maps/Tankdrive.opt --- netpanzer-0.8.2/maps/Tankdrive.opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Tankdrive.opt 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,38 @@ +ObjectiveCount: 12 + +Name: Sweet +Location: 170 232 + +Name: Hustail +Location: 20 118 + +Name: Lavtel +Location: 85 218 + +Name: Streamvell +Location: 25 232 + +Name: Noictown +Location: 235 109 + +Name: Luxfield +Location: 230 210 + +Name: Convex +Location: 189 11 + +Name: Techground +Location: 228 42 + +Name: Spawpoint +Location: 40 42 + +Name: Littleslug +Location: 22 9 + +Name: Mivianor +Location: 135 69 + +Name: Comefield +Location: 128 151 + diff -Nru netpanzer-0.8.2/maps/Tankdrive.spn netpanzer-0.8.4.debian.1/maps/Tankdrive.spn --- netpanzer-0.8.2/maps/Tankdrive.spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Tankdrive.spn 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,5 @@ +SpawnCount: 4 +Location: 169 46 +Location: 65 157 +Location: 195 157 +Location: 74 75 Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/The Pit.npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/The Pit.npm differ diff -Nru netpanzer-0.8.2/maps/The Pit.opt netpanzer-0.8.4.debian.1/maps/The Pit.opt --- netpanzer-0.8.2/maps/The Pit.opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/The Pit.opt 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,23 @@ +ObjectiveCount: 7 + +Name: Radar 1 +Location: 110 101 + +Name: Radar 2 +Location: 125 135 + +Name: Radar 3 +Location: 159 107 + +Name: Hole 1 +Location: 25 19 + +Name: Hole 2 +Location: 231 22 + +Name: Hole 3 +Location: 28 228 + +Name: Hole 4 +Location: 226 229 + diff -Nru netpanzer-0.8.2/maps/The Pit.spn netpanzer-0.8.4.debian.1/maps/The Pit.spn --- netpanzer-0.8.2/maps/The Pit.spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/The Pit.spn 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,6 @@ +SpawnCount: 5 +Location: 127 55 +Location: 214 118 +Location: 53 111 +Location: 136 163 +Location: 127 120 Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/The Valley (mod).npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/The Valley (mod).npm differ diff -Nru netpanzer-0.8.2/maps/The Valley (mod).opt netpanzer-0.8.4.debian.1/maps/The Valley (mod).opt --- netpanzer-0.8.2/maps/The Valley (mod).opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/The Valley (mod).opt 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,65 @@ +ObjectiveCount: 21 + +Name: Lohengrin +Location: 33 28 + +Name: rico +Location: 214 7 + +Name: O.C.B. +Location: 269 8 + +Name: CellarDoor[PG] +Location: 367 9 + +Name: Crusader +Location: 304 84 + +Name: DARKMAN +Location: 172 105 + +Name: MrBill +Location: 23 86 + +Name: scarabe +Location: 56 226 + +Name: Jasper +Location: 100 223 + +Name: Mathias +Location: 76 260 + +Name: a player +Location: 226 220 + +Name: muuseas +Location: 345 190 + +Name: 00Dresden +Location: 356 152 + +Name: Kreuzfeuer +Location: 18 359 + +Name: indy18 +Location: 70 382 + +Name: oconner +Location: 186 386 + +Name: Bambi[PG] +Location: 248 388 + +Name: Goldman[PG] +Location: 365 330 + +Name: sinik +Location: 368 365 + +Name: NewYear +Location: 277 307 + +Name: Puppys=PG! +Location: 181 327 + diff -Nru netpanzer-0.8.2/maps/The Valley (mod).spn netpanzer-0.8.4.debian.1/maps/The Valley (mod).spn --- netpanzer-0.8.2/maps/The Valley (mod).spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/The Valley (mod).spn 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,28 @@ +SpawnCount: 27 +Location: 115 312 +Location: 361 87 +Location: 120 75 +Location: 315 281 +Location: 147 20 +Location: 32 297 +Location: 230 274 +Location: 257 61 +Location: 336 242 +Location: 164 289 +Location: 180 57 +Location: 50 317 +Location: 237 301 +Location: 317 395 +Location: 114 138 +Location: 230 57 +Location: 374 250 +Location: 226 133 +Location: 141 320 +Location: 171 222 +Location: 284 260 +Location: 296 178 +Location: 125 373 +Location: 46 175 +Location: 133 172 +Location: 326 14 +Location: 389 115 Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/Two clans.npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/Two clans.npm differ diff -Nru netpanzer-0.8.2/maps/Two clans.opt netpanzer-0.8.4.debian.1/maps/Two clans.opt --- netpanzer-0.8.2/maps/Two clans.opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Two clans.opt 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,19 @@ +ObjectiveCount: 9 +Name: Wallace 1 +Location: 21 8 +Name: Wallace 2 +Location: 125 8 +Name: Wallace 3 +Location: 242 8 +Name: Fleming 3 +Location: 237 270 +Name: Fleming 2 +Location: 133 270 +Name: Fleming 1 +Location: 30 270 +Name: Village +Location: 230 147 +Name: Middle +Location: 121 121 +Name: Mountain +Location: 84 182 diff -Nru netpanzer-0.8.2/maps/Two clans.spn netpanzer-0.8.4.debian.1/maps/Two clans.spn --- netpanzer-0.8.2/maps/Two clans.spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Two clans.spn 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1 @@ +SpawnCount: 9 Location: 34 91 Location: 101 65 Location: 187 66 Location: 250 87 Location: 243 220 Location: 177 237 Location: 29 225 Location: 3 157 Location: 152 190 \ No newline at end of file Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/Walhalla.npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/Walhalla.npm differ diff -Nru netpanzer-0.8.2/maps/Walhalla.opt netpanzer-0.8.4.debian.1/maps/Walhalla.opt --- netpanzer-0.8.2/maps/Walhalla.opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Walhalla.opt 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,14 @@ +ObjectiveCount: 4 + +Name: Asgard +Location: 18 16 + +Name: Thor +Location: 111 15 + +Name: Odin +Location: 110 108 + +Name: Frigg +Location: 19 110 + diff -Nru netpanzer-0.8.2/maps/Walhalla.spn netpanzer-0.8.4.debian.1/maps/Walhalla.spn --- netpanzer-0.8.2/maps/Walhalla.spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Walhalla.spn 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,5 @@ +SpawnCount: 4 +Location: 39 6 +Location: 88 8 +Location: 84 121 +Location: 43 122 Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/Wall-2.npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/Wall-2.npm differ diff -Nru netpanzer-0.8.2/maps/Wall-2.opt netpanzer-0.8.4.debian.1/maps/Wall-2.opt --- netpanzer-0.8.2/maps/Wall-2.opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Wall-2.opt 2011-11-29 16:53:37.000000000 +0000 @@ -0,0 +1,17 @@ +ObjectiveCount: 8 +Name: Training Camp +Location: 26 73 +Name: Barracks +Location: 100 11 +Name: Castle +Location: 275 13 +Name: Guard post +Location: 202 113 +Name: Resistance +Location: 278 176 +Name: Blockhouse +Location: 215 269 +Name: Commandery +Location: 38 274 +Name: Quartering +Location: 64 170 diff -Nru netpanzer-0.8.2/maps/Wall-2.spn netpanzer-0.8.4.debian.1/maps/Wall-2.spn --- netpanzer-0.8.2/maps/Wall-2.spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Wall-2.spn 2011-11-29 16:53:37.000000000 +0000 @@ -0,0 +1 @@ +SpawnCount: 11 Location: 101 227 Location: 170 188 Location: 4 219 Location: 292 264 Location: 292 116 Location: 191 6 Location: 159 52 Location: 5 7 Location: 26 136 Location: 111 103 Location: 139 292 \ No newline at end of file Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/Wall.npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/Wall.npm differ diff -Nru netpanzer-0.8.2/maps/Wall.opt netpanzer-0.8.4.debian.1/maps/Wall.opt --- netpanzer-0.8.2/maps/Wall.opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Wall.opt 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,17 @@ +ObjectiveCount: 8 +Name: Training Camp +Location: 26 73 +Name: Barracks +Location: 100 11 +Name: Castle +Location: 275 13 +Name: Guard post +Location: 202 113 +Name: Resistance +Location: 278 176 +Name: Blockhouse +Location: 215 269 +Name: Commandery +Location: 38 274 +Name: Quartering +Location: 64 170 diff -Nru netpanzer-0.8.2/maps/Wall.spn netpanzer-0.8.4.debian.1/maps/Wall.spn --- netpanzer-0.8.2/maps/Wall.spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Wall.spn 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1 @@ +SpawnCount: 11 Location: 101 227 Location: 170 188 Location: 4 219 Location: 292 264 Location: 292 116 Location: 191 6 Location: 159 52 Location: 5 7 Location: 26 136 Location: 111 103 Location: 139 292 \ No newline at end of file Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/maps/Wild Hunt.npm and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/maps/Wild Hunt.npm differ diff -Nru netpanzer-0.8.2/maps/Wild Hunt.opt netpanzer-0.8.4.debian.1/maps/Wild Hunt.opt --- netpanzer-0.8.2/maps/Wild Hunt.opt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Wild Hunt.opt 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1,17 @@ +ObjectiveCount: 8 +Name: Krampus +Location: 102 139 +Name: Wodan +Location: 28 10 +Name: Harlequin +Location: 101 51 +Name: Herne +Location: 175 9 +Name: Holle +Location: 175 104 +Name: Berchta +Location: 35 171 +Name: Selga +Location: 175 168 +Name: Nuada +Location: 31 95 diff -Nru netpanzer-0.8.2/maps/Wild Hunt.spn netpanzer-0.8.4.debian.1/maps/Wild Hunt.spn --- netpanzer-0.8.2/maps/Wild Hunt.spn 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/maps/Wild Hunt.spn 2009-07-01 13:28:09.000000000 +0000 @@ -0,0 +1 @@ +SpawnCount: 6 Location: 106 15 Location: 95 187 Location: 6 64 Location: 128 107 Location: 189 53 Location: 48 137 \ No newline at end of file diff -Nru netpanzer-0.8.2/mk/autoconf/ax_type_socklen_t.m4 netpanzer-0.8.4.debian.1/mk/autoconf/ax_type_socklen_t.m4 --- netpanzer-0.8.2/mk/autoconf/ax_type_socklen_t.m4 2007-05-26 06:56:58.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/autoconf/ax_type_socklen_t.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -dnl @synopsis TYPE_SOCKLEN_T -dnl -dnl Check whether sys/socket.h defines type socklen_t. Please note -dnl that some systems require sys/types.h to be included before -dnl sys/socket.h can be compiled. -dnl -dnl @version $Id: ax_type_socklen_t.m4 732 2004-10-05 12:36:48Z matzebraun $ -dnl @author Lars Brinkhoff -dnl -AC_DEFUN([AX_TYPE_SOCKLEN_T], -[AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t, -[ - AC_TRY_COMPILE( - [#include - #include ], - [socklen_t len = 42; return 0;], - ac_cv_type_socklen_t=yes, - ac_cv_type_socklen_t=no) -]) - if test $ac_cv_type_socklen_t != yes; then - AC_DEFINE(socklen_t, int, [define socklen_t if sys headers don't do that]) - fi -]) diff -Nru netpanzer-0.8.2/mk/autoconf/config.guess netpanzer-0.8.4.debian.1/mk/autoconf/config.guess --- netpanzer-0.8.2/mk/autoconf/config.guess 2007-05-26 06:56:58.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/autoconf/config.guess 1970-01-01 00:00:00.000000000 +0000 @@ -1,1354 +0,0 @@ -#! /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. - -timestamp='2002-07-23' - -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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. -# -# 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 . -# Please send patches to . Submit a context -# diff and a properly formatted 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. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; - --version | -v ) - echo "$version" ; exit 0 ;; - --help | --h* | -h ) - echo "$usage"; exit 0 ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# 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 - -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 ; -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 - 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' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -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*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - 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 - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - # 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 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - eval $set_cc_for_build - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - $CC_FOR_BUILD $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 ;; - 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 ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit 0 ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit 0;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit 0 ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit 0;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit 0 ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; - esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - 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 ;; - 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 ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - 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 ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; - 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 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit 0 ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; - # 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 - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # 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 ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit 0 ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - 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 - echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit 0 ;; - Night_Hawk:*:*:PowerMAX_OS) - echo powerpc-harris-powermax - exit 0 ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit 0 ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit 0 ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit 0 ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit 0 ;; - AViiON:dgux:*:*) - # 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 ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit 0 ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit 0 ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit 0 ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit 0 ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit 0 ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; - ????????: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 ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit 0 ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - 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 - 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]) - 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 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit 0 ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit 0 ;; - 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 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit 0 ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit 0 ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit 0 ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit 0 ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 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" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - 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 - fi ;; - esac - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - 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 unknown-hitachi-hiuxwe2 - exit 0 ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit 0 ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit 0 ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit 0 ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit 0 ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit 0 ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit 0 ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit 0 ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit 0 ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit 0 ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit 0 ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit 0 ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - 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 ;; - 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 ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - 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 ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:3*) - echo i386-pc-interix3 - exit 0 ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i386-pc-interix - exit 0 ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit 0 ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - *:GNU:*:*) - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c && rmdir $tmpdir - test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 - ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit 0 ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit 0 ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit 0 ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit 0 ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit 0 ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #ifdef __INTEL_COMPILER - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit 0 ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit 0 ;; - i*86:*:5:[78]*) - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp - exit 0 ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit 0 ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit 0 ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit 0 ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit 0 ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit 0 ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit 0 ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit 0 ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit 0 ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit 0 ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit 0 ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit 0 ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit 0 ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; - *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} - exit 0 ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit 0 ;; - NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit 0 ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit 0 ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit 0 ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit 0 ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit 0 ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit 0 ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit 0 ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit 0 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 -rm -f $dummy.c $dummy && rmdir $tmpdir - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit 0 ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - c34*) - echo c34-convex-bsd - exit 0 ;; - c38*) - echo c38-convex-bsd - exit 0 ;; - c4*) - echo c4-convex-bsd - exit 0 ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff -Nru netpanzer-0.8.2/mk/autoconf/config.sub netpanzer-0.8.4.debian.1/mk/autoconf/config.sub --- netpanzer-0.8.2/mk/autoconf/config.sub 2007-05-26 06:56:58.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/autoconf/config.sub 1970-01-01 00:00:00.000000000 +0000 @@ -1,1460 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. - -timestamp='2002-07-03' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# 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. - -# 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 . Submit a context -# diff and a properly formatted 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. - -# 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. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; - --version | -v ) - echo "$version" ; exit 0 ;; - --help | --h* | -h ) - echo "$usage"; exit 0 ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit 0;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# 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*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -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) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # 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/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | 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 \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mipsisa32 | mipsisa32el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | ns16k | ns32k \ - | openrisc | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xscale | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | 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-* | c54x-* \ - | clipper-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ - | m32r-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipstx39 | mipstx39el \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ - | ymp-* \ - | z8k-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - crds | unos) - basic_machine=m68k-crds - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - 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 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - 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 - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - or32 | or32-*) - basic_machine=or32-unknown - os=-coff - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon) - basic_machine=i686-pc - ;; - pentiumii | pentium2) - basic_machine=i686-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-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3d) - basic_machine=alpha-cray - os=-unicos - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) - basic_machine=sh-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv9 | sparcv9b) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # 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* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -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*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto*) - os=-nto-qnx - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-ibm) - os=-aix - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff -Nru netpanzer-0.8.2/mk/autoconf/initjamfile.m4 netpanzer-0.8.4.debian.1/mk/autoconf/initjamfile.m4 --- netpanzer-0.8.2/mk/autoconf/initjamfile.m4 2007-05-26 06:56:58.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/autoconf/initjamfile.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#---------------------------------------------------------------------------- -# AC_INIT_JAM -# This rule fixes several issues related to autoconf being make centric -#---------------------------------------------------------------------------- -AC_DEFUN([AC_INIT_JAM], - [ - AC_INIT_JAMFILE - AC_OUTPUT_INSTALLDIRS - AC_FIX_INSTALL]) - -#---------------------------------------------------------------------------- -# AC_INIT_JAMFILE -# This rule let's config.status create a wrapper Jamfile in case configure -# has been invoked from a directory outside the source directory -#---------------------------------------------------------------------------- -AC_DEFUN([AC_INIT_JAMFILE], - [AC_CONFIG_COMMANDS([Jamfile], - [AS_IF([test ! -f "${ac_top_builddir}Jamfile"], - [echo Installing Jamfile wrapper. - echo "# This file was automatically create by config.status" > Jamfile - echo "TOP ?= $ac_top_srcdir ;" >> Jamfile - echo "top_builddir ?= . ;" >> Jamfile - echo "include \$(TOP)/Jamfile ;" >> Jamfile])])]) - diff -Nru netpanzer-0.8.2/mk/autoconf/installdirs.m4 netpanzer-0.8.4.debian.1/mk/autoconf/installdirs.m4 --- netpanzer-0.8.2/mk/autoconf/installdirs.m4 2007-05-26 06:56:58.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/autoconf/installdirs.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ -#----------------------------------------------------------------------------- -# installdirs.m4 (c) Matze Braun -# Macros for outputing the installation paths which autoconf gathers into the -# Jamconfig file. -#----------------------------------------------------------------------------- - -#----------------------------------------------------------------------------- -# AC_OUTPUT_INSTALLDIRS -# Transforms the installation dirs which are gathered by autoconf and sets -# properties in the Jamconfig file for them. We deal with stuff like -# variable references inside the paths (often the paths contain ${prefix}) -# and with correct quoting here. -# The script will set the INSTALLDIR.PREFIX, INSTALLDIR.EXEC_PREFIX, -# INSTALLDIR.APPLICATION, INSTALLDIR.SBIN, INSTALLDIR.LIBEXEC, -# INSTALLDIR.DATA, INSTALLDIR.MAP, INSTALLDIR.CONFIG, INSTALLDIR.SHAREDSTATE -# INSTALLDIR.LOCALSTATE, INSTALLDIR.PLUGIN, INSTALLDIR.DOC -# INSTALLDIR.LIBRARY, INSTALLDIR.INCLUDE, INSTALLDIR.OLDINCLUDE, -# INSTALLDIR.INFO, INSTALLDIR.MAN -#----------------------------------------------------------------------------- -AC_DEFUN([AC_OUTPUT_INSTALLDIRS],[ -# Handle the case when no prefix is given. And the special case when a path -# contains more than 2 slashes, these paths seem to be correct but jam fails -# on them. -AS_IF([test $prefix = NONE], [prefix="$ac_default_prefix"], - [prefix=`echo "$prefix" | sed -e 's:///*:/:g'`]) -AS_IF([test $exec_prefix = NONE], - [exec_prefix="AS_ESCAPE([$(prefix)])"], - [exec_prefix=`echo "$exec_prefix" | sed -e 's:///*:/:g'`]) - -prefix=AC_FIX_VARIABLEREF([$prefix]) -exec_prefix=AC_FIX_VARIABLEREF([$exec_prefix]) -bindir=AC_FIX_VARIABLEREF([$bindir]) -sbindir=AC_FIX_VARIABLEREF([$sbindir]) -libexecdir=AC_FIX_VARIABLEREF([$libexecdir]) -datarootdir=AC_FIX_VARIABLEREF([$datarootdir]) -datadir=AC_FIX_VARIABLEREF([$datadir]) -sysconfdir=AC_FIX_VARIABLEREF([$sysconfdir]) -sharedstatedir=AC_FIX_VARIABLEREF([$sharedstatedir]) -localstatedir=AC_FIX_VARIABLEREF([$localstatedir]) -libdir=AC_FIX_VARIABLEREF([$libdir]) -includedir=AC_FIX_VARIABLEREF([$includedir]) -oldincludedir=AC_FIX_VARIABLEREF([$oldincludedir]) -infodir=AC_FIX_VARIABLEREF([$infodir]) -mandir=AC_FIX_VARIABLEREF([$mandir]) - -#hack to get the order right :-/ (autoconf --trace reports wrong order...) -AC_SUBST(prefix) -AC_SUBST(exec_prefix) -AC_SUBST(bindir) -AC_SUBST(sbindir) -AC_SUBST(libexecdir) -AC_SUBST(datadir) -AC_SUBST(sysconfdir) -AC_SUBST(sharedstatedir) -AC_SUBST(localstatedir) -AC_SUBST(libdir) -AC_SUBST(includedir) -AC_SUBST(oldincludedir) -AC_SUBST(infodir) -AC_SUBST(mandir) -]) - -#----------------------------------------------------------------------------- -# AC_FIX_INSTALL -# Fixes the output from AC_PROG_INSTALL -#----------------------------------------------------------------------------- -AC_DEFUN([AC_FIX_INSTALL], [ -AC_REQUIRE([AC_PROG_INSTALL]) -INSTALL=AC_FIX_VARIABLEREF([$INSTALL]) -INSTALL_PROGRAM=AC_FIX_VARIABLEREF([$INSTALL_PROGRAM]) -INSTALL_SCRIPT=AC_FIX_VARIABLEREF([$INSTALL_SCRIPT]) -INSTALL_DATA=AC_FIX_VARIABLEREF([$INSTALL_DATA]) - -# fix for order... -AC_SUBST([INSTALL]) -AC_SUBST([INSTALL_PROGRAM]) -AC_SUBST([INSTALL_SCRIPT]) -AC_SUBST([INSTALL_DATA]) -]) - -#----------------------------------------------------------------------------- -# AC_PREPARE_INSTALLPATH -# Transform variables of the form ${bla} to $(bla) inside the string and -# correctly quotes backslashes. -# This is needed if you want to output some of the paths that autoconf -# creates to the Jamconfig file. -#----------------------------------------------------------------------------- -AC_DEFUN([AC_FIX_VARIABLEREF], -dnl We need all the strange \\\\ quoting here, because the command will be -dnl inserted into a "" block and sed needs quoting as well -[`echo "$1" | sed -e 's/\${\([[a-zA-Z_][a-zA-Z_]]*\)}/$(\1)/g' -e 's/\\\\/\\\\\\\\/g'`]) - diff -Nru netpanzer-0.8.2/mk/autoconf/install-sh netpanzer-0.8.4.debian.1/mk/autoconf/install-sh --- netpanzer-0.8.2/mk/autoconf/install-sh 2007-05-26 06:56:58.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/autoconf/install-sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,251 +0,0 @@ -#!/bin/sh -# -# install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). -# -# Copyright 1991 by the Massachusetts Institute of Technology -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=mkdir - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - true - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift - - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi - - pathcomp="${pathcomp}/" -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - true - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - -fi && - - -exit 0 diff -Nru netpanzer-0.8.2/mk/autoconf/np_findlib.m4 netpanzer-0.8.4.debian.1/mk/autoconf/np_findlib.m4 --- netpanzer-0.8.2/mk/autoconf/np_findlib.m4 2007-05-26 06:56:58.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/autoconf/np_findlib.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -# NP_FINDLIB(VARNAME, NAME, STRING, TESTAPP, CFLAGS, LIBS, ACTION_IF_FOUND, -# ACTION_IF_NOT_FOUND, EXTRACFLAGS, EXTRALIBS) -AC_DEFUN([NP_FINDLIB], [ - AC_ARG_WITH([lib$2], [AC_HELP_STRING([--with-lib$2=dir], - [specify location of lib$2 if not detected automatically; uses - dir, dir/include and dir/lib])]) - - save_CFLAGS="$CFLAGS" - save_CPPFLAGS="$CPPFLAGS" - save_LIBS="$LIBS" - - RESCFLAGS="$5" - RESLIBS="$6" - CFLAGS="$CFLAGS $5 $9" - CPPFLAGS="$CPPFLAGS $5 $9" - LIBS="$LIBS $6 $10" - - AS_IF([test -n "$with_lib$2"], [ - CFLAGS="-I$with_lib$2/include $CFLAGS" - CPPFLAGS="-I$with_lib$2/include $CPPFLAGS" - LIBS="-L$with_lib$2/lib $LIBS" - RESCFLAGS="-I$with_lib$2/include $RESCFLAGS" - RESLIBS="-L$with_lib$2/lib $RESLIBS" - ]) - - AC_MSG_CHECKING([for $3]) - - AC_LINK_IFELSE([$4], [buildok=yes], [buildok=no]) - - LIBS=$save_LIBS - CPPFLAGS=$save_CPPFLAGS - CFLAGS=$save_CFLAGS - - AS_IF([test $buildok = yes], - [AC_MSG_RESULT([found]) - $1_AVAILABLE=yes - $1_CFLAGS="$RESCFLAGS" - $1_LIBS="$RESLIBS"], - [AC_MSG_RESULT([not found]) - $1_AVAILABLE=no - $1_CFLAGS="" - $1_LIBS=""]) - - AC_SUBST([$1_AVAILABLE]) - AC_SUBST([$1_CFLAGS]) - AC_SUBST([$1_LIBS]) - - AS_IF([test $buildok = yes], - [ifelse([$7], , :, [$7])], - [ifelse([$8], , :, [$8])]) -]) diff -Nru netpanzer-0.8.2/mk/autoconf/np_lang_program.m4 netpanzer-0.8.4.debian.1/mk/autoconf/np_lang_program.m4 --- netpanzer-0.8.2/mk/autoconf/np_lang_program.m4 2007-05-26 06:56:58.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/autoconf/np_lang_program.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -# NP_LANG_PROGRAM, custom version of AC_LANG_PROGRAM (because SDL on win32 -# NEEDS main(int argc, char** argv) -AC_DEFUN([NP_LANG_PROGRAM], -[$1 -m4_ifdef([_AC_LANG_PROGRAM_C_F77_HOOKS], [_AC_LANG_PROGRAM_C_F77_HOOKS])[]dnl -int -main(int argc, char** argv) -{ -$2 - ; - return 0; -} -]) diff -Nru netpanzer-0.8.2/mk/autoconf/sdl.m4 netpanzer-0.8.4.debian.1/mk/autoconf/sdl.m4 --- netpanzer-0.8.2/mk/autoconf/sdl.m4 2007-05-26 06:56:58.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/autoconf/sdl.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,175 +0,0 @@ -# Configure paths for SDL -# Sam Lantinga 9/21/99 -# stolen from Manish Singh -# stolen back from Frank Belew -# stolen from Manish Singh -# Shamelessly stolen from Owen Taylor - -dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS -dnl -AC_DEFUN([AM_PATH_SDL], -[dnl -dnl Get the cflags and libraries from the sdl-config script -dnl -AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], - sdl_prefix="$withval", sdl_prefix="") -AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], - sdl_exec_prefix="$withval", sdl_exec_prefix="") -AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], - , enable_sdltest=yes) - - if test x$sdl_exec_prefix != x ; then - sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config - fi - fi - if test x$sdl_prefix != x ; then - sdl_args="$sdl_args --prefix=$sdl_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_prefix/bin/sdl-config - fi - fi - - AC_REQUIRE([AC_CANONICAL_TARGET]) - PATH="$prefix/bin:$prefix/usr/bin:$PATH" - AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) - min_sdl_version=ifelse([$1], ,0.11.0,$1) - AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) - no_sdl="" - if test "$SDL_CONFIG" = "no" ; then - no_sdl=yes - else - SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` - SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` - - sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_sdltest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" -dnl -dnl Now check if the installed SDL is sufficiently new. (Also sanity -dnl checks the results of sdl-config to some extent -dnl - rm -f conf.sdltest - AC_TRY_RUN([ -#include -#include -#include -#include "SDL.h" - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main (int argc, char *argv[]) -{ - int major, minor, micro; - char *tmp_version; - - /* This hangs on some systems (?) - system ("touch conf.sdltest"); - */ - { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_sdl_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_sdl_version"); - exit(1); - } - - if (($sdl_major_version > major) || - (($sdl_major_version == major) && ($sdl_minor_version > minor)) || - (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); - printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); - printf("*** to point to the correct copy of sdl-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_sdl" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$SDL_CONFIG" = "no" ; then - echo "*** The sdl-config script installed by SDL could not be found" - echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the SDL_CONFIG environment variable to the" - echo "*** full path to sdl-config." - else - if test -f conf.sdltest ; then - : - else - echo "*** Could not run SDL test program, checking why..." - CFLAGS="$CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - AC_TRY_LINK([ -#include -#include "SDL.h" - -int main(int argc, char *argv[]) -{ return 0; } -#undef main -#define main K_and_R_C_main -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding SDL or finding the wrong" - echo "*** version of SDL. If it is not finding SDL, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means SDL was incorrectly installed" - echo "*** or that you have moved SDL since it was installed. In the latter case, you" - echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - SDL_CFLAGS="" - SDL_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(SDL_CFLAGS) - AC_SUBST(SDL_LIBS) - rm -f conf.sdltest -]) diff -Nru netpanzer-0.8.2/mk/autoconf/.svn/prop-base/config.guess.svn-base netpanzer-0.8.4.debian.1/mk/autoconf/.svn/prop-base/config.guess.svn-base --- netpanzer-0.8.2/mk/autoconf/.svn/prop-base/config.guess.svn-base 2007-05-26 06:56:57.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/autoconf/.svn/prop-base/config.guess.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -K 13 -svn:eol-style -V 6 -native -K 14 -svn:executable -V 1 -* -K 12 -svn:keywords -V 23 -author date id revision -END diff -Nru netpanzer-0.8.2/mk/autoconf/.svn/prop-base/config.sub.svn-base netpanzer-0.8.4.debian.1/mk/autoconf/.svn/prop-base/config.sub.svn-base --- netpanzer-0.8.2/mk/autoconf/.svn/prop-base/config.sub.svn-base 2007-05-26 06:56:58.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/autoconf/.svn/prop-base/config.sub.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -K 13 -svn:eol-style -V 6 -native -K 14 -svn:executable -V 1 -* -K 12 -svn:keywords -V 23 -author date id revision -END diff -Nru netpanzer-0.8.2/mk/autoconf/.svn/props/config.guess.svn-work netpanzer-0.8.4.debian.1/mk/autoconf/.svn/props/config.guess.svn-work --- netpanzer-0.8.2/mk/autoconf/.svn/props/config.guess.svn-work 2007-05-26 06:56:57.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/autoconf/.svn/props/config.guess.svn-work 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -K 13 -svn:eol-style -V 6 -native -K 14 -svn:executable -V 1 -* -K 12 -svn:keywords -V 23 -author date id revision -END diff -Nru netpanzer-0.8.2/mk/autoconf/.svn/props/config.sub.svn-work netpanzer-0.8.4.debian.1/mk/autoconf/.svn/props/config.sub.svn-work --- netpanzer-0.8.2/mk/autoconf/.svn/props/config.sub.svn-work 2007-05-26 06:56:58.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/autoconf/.svn/props/config.sub.svn-work 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -K 13 -svn:eol-style -V 6 -native -K 14 -svn:executable -V 1 -* -K 12 -svn:keywords -V 23 -author date id revision -END diff -Nru netpanzer-0.8.2/mk/autoconf/.svn/text-base/config.guess.svn-base netpanzer-0.8.4.debian.1/mk/autoconf/.svn/text-base/config.guess.svn-base --- netpanzer-0.8.2/mk/autoconf/.svn/text-base/config.guess.svn-base 2007-05-26 06:56:57.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/autoconf/.svn/text-base/config.guess.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,1354 +0,0 @@ -#! /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. - -timestamp='2002-07-23' - -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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. -# -# 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 . -# Please send patches to . Submit a context -# diff and a properly formatted 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. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; - --version | -v ) - echo "$version" ; exit 0 ;; - --help | --h* | -h ) - echo "$usage"; exit 0 ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# 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 - -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 ; -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 - 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' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -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*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - 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 - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - # 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 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - eval $set_cc_for_build - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - $CC_FOR_BUILD $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 ;; - 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 ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit 0 ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit 0;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit 0 ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit 0;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit 0 ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; - esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - 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 ;; - 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 ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - 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 ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; - 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 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit 0 ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; - # 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 - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # 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 ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit 0 ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - 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 - echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit 0 ;; - Night_Hawk:*:*:PowerMAX_OS) - echo powerpc-harris-powermax - exit 0 ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit 0 ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit 0 ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit 0 ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit 0 ;; - AViiON:dgux:*:*) - # 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 ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit 0 ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit 0 ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit 0 ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit 0 ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit 0 ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; - ????????: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 ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit 0 ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - 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 - 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]) - 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 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit 0 ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit 0 ;; - 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 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit 0 ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit 0 ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit 0 ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit 0 ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 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" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - 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 - fi ;; - esac - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - 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 unknown-hitachi-hiuxwe2 - exit 0 ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit 0 ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit 0 ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit 0 ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit 0 ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit 0 ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit 0 ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit 0 ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit 0 ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit 0 ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit 0 ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit 0 ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - 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 ;; - 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 ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - 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 ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:3*) - echo i386-pc-interix3 - exit 0 ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i386-pc-interix - exit 0 ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit 0 ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - *:GNU:*:*) - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c && rmdir $tmpdir - test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 - ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit 0 ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit 0 ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit 0 ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit 0 ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit 0 ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #ifdef __INTEL_COMPILER - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit 0 ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit 0 ;; - i*86:*:5:[78]*) - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp - exit 0 ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit 0 ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit 0 ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit 0 ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit 0 ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit 0 ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit 0 ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit 0 ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit 0 ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit 0 ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit 0 ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit 0 ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit 0 ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; - *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} - exit 0 ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit 0 ;; - NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit 0 ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit 0 ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit 0 ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit 0 ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit 0 ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit 0 ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit 0 ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit 0 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 -rm -f $dummy.c $dummy && rmdir $tmpdir - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit 0 ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - c34*) - echo c34-convex-bsd - exit 0 ;; - c38*) - echo c38-convex-bsd - exit 0 ;; - c4*) - echo c4-convex-bsd - exit 0 ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff -Nru netpanzer-0.8.2/mk/autoconf/.svn/text-base/config.sub.svn-base netpanzer-0.8.4.debian.1/mk/autoconf/.svn/text-base/config.sub.svn-base --- netpanzer-0.8.2/mk/autoconf/.svn/text-base/config.sub.svn-base 2007-05-26 06:56:58.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/autoconf/.svn/text-base/config.sub.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,1460 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. - -timestamp='2002-07-03' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# 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. - -# 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 . Submit a context -# diff and a properly formatted 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. - -# 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. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; - --version | -v ) - echo "$version" ; exit 0 ;; - --help | --h* | -h ) - echo "$usage"; exit 0 ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit 0;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# 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*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -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) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # 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/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | 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 \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mipsisa32 | mipsisa32el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | ns16k | ns32k \ - | openrisc | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xscale | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | 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-* | c54x-* \ - | clipper-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ - | m32r-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipstx39 | mipstx39el \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ - | ymp-* \ - | z8k-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - crds | unos) - basic_machine=m68k-crds - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - 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 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - 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 - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - or32 | or32-*) - basic_machine=or32-unknown - os=-coff - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon) - basic_machine=i686-pc - ;; - pentiumii | pentium2) - basic_machine=i686-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-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3d) - basic_machine=alpha-cray - os=-unicos - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) - basic_machine=sh-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv9 | sparcv9b) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # 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* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -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*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto*) - os=-nto-qnx - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-ibm) - os=-aix - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff -Nru netpanzer-0.8.2/mk/jam/application.jam netpanzer-0.8.4.debian.1/mk/jam/application.jam --- netpanzer-0.8.2/mk/jam/application.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/application.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ -#============================================================================ -# Rules for compiling applications -#============================================================================ - -## Application appname : sources [ : options ] -## Build an application out of sourcefiles. All sourcefiles will be passed -## to the Objects rule which tries to compile them into object-files. You -## can create rules for your own filetypes with the UserObject rule. Header -## files will just be ignored. They are only used for MSVC projectfile -## generation. -## Possible options are "noinstall" if you don't want a default install -## target to be created and "console" if you're building a console -## application (an application without any graphical output which is -## intended to be used on commandline) -## Some notes: You should not add the .exe extension to the appname - jam -## will do that on win32. -## If you have sourcefiles in subdirectories, then you'll need to use the -## SearchSubdir rule. Never specify sourcefiles with paths, only specify -## the filenames. -## Options: -## console: Create a console application -## noinstall: Don't setup a default installation target. -## independent: The target will not be made a dependency of the apps and -## all target. -rule Application -{ - # check options - CheckOptions noinstall console independent : $(3) : $(<) ; - - local target = [ ConstructApplicationTarget $(<) : $(3) ] ; - local sources = [ DoSourceGrist $(>) ] ; - local objects = [ CompileObjects $(sources) ] ; - - $(<)_TYPE = application ; - $(<)_OBJECTS = $(objects) ; - $(<)_SOURCES = $(sources) ; - $(<)_TARGET = $(target) ; - $(<)_OPTIONS = $(3) ; - $(<)_INSTALLTARGET = ; - - # create target clean rule - Always $(<)clean ; - NotFile $(<)clean ; - Clean $(<)clean : $(objects) ; # create target clean rule - Depends clean : $(<)clean ; - - # so 'jam foo' works when it's really foo.exe (Windows) or foo.app (MacOS/X) - if $(target) != $(<) - { - Depends $(<) : $(target) ; - NotFile $(<) ; - } - - # make dependency on apps target - if ! [ IsElem independent : $(3) ] - { - Depends apps : $(<) ; - } - - # construct Install target - if ! [ IsElem noinstall : $(3) ] - { - $(<)_INSTALLTARGET = [ - DoInstall $(target) : $(bindir) : $(INSTALL_PROGRAM) : nopackage - ] ; - Depends install_bin : $($(<)_INSTALLTARGET) ; - } - - # Link - MakeLocate $(target) : $(LOCATE_TARGETS) ; - SystemLinkApplication $(<) : $(objects) : $(3) ; - - # Import default flags - CppFlags $(<) : $(CPPFLAGS) $(APPLICTION_CPPFLAGS) ; - CFlags $(<) : $(CFLAGS) $(APPLICATION_CFLAGS) ; - C++Flags $(<) : $(C++FLAGS) $(APPLICATION_C++FLAGS) ; - LFlags $(<) : $(LFLAGS) $(APPLICATION_LFLAGS) ; - - # Sources are part of the package - if ! [ IsElem nopackage : $(3) ] - { - Package $(sources) ; - } -} - -#---------------------------------------------------------------------------- -# private part - -# Construct pseudo target apps -Depends all : apps ; -NotFile apps ; - diff -Nru netpanzer-0.8.2/mk/jam/autoconf.jam netpanzer-0.8.4.debian.1/mk/jam/autoconf.jam --- netpanzer-0.8.2/mk/jam/autoconf.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/autoconf.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -# Clean rules for autoconf generated stuff - -## Setup some stuff that makes usage of autoconf easier -rule UseAutoconf -{ - # construct some clean targets - Clean distclean : config.log config.status config.cache aclocal.m4 - Jamconfig config.h out.txt log.txt stamp-h1 - libtool ; - CleanDir distclean : autom4te.cache out ; - Depends distclean : clean ; - - Clean cvsclean : configure aclocal.m4 config.h.in Jamconfig.in ; - Depends cvsclean : distclean ; - - Help clean : "Cleanup objectfiles and targets" ; - Help distclean : "Cleanup objectfiles and build configuration" ; - Help cvsclean : - "Cleanup all objectfiles, buildconfig and generated files." ; - Package autogen.sh configure.ac configure config.h.in - Jamrules Jamconfig.in ; - Package [ Wildcard mk/jam : *.jam ] [ Wildcard mk/autoconf : *.m4 ] - mk/autoconf/config.guess mk/autoconf/config.sub - mk/autoconf/install-sh ; -} diff -Nru netpanzer-0.8.2/mk/jam/build.jam netpanzer-0.8.4.debian.1/mk/jam/build.jam --- netpanzer-0.8.2/mk/jam/build.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/build.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -#============================================================================ -# Main rules file - Includes all important rulefiles in correct order -#============================================================================ - -# enable if you want debug messages -JAM_DEBUG ?= 1 ; - -jamrulesdir = $(TOP)/mk/jam ; - -include $(jamrulesdir)/jamcompatibility.jam ; -include $(jamrulesdir)/helper.jam ; -include $(jamrulesdir)/subdir.jam ; - -include $(jamrulesdir)/package.jam ; - -include $(jamrulesdir)/variant.jam ; -include $(jamrulesdir)/resource.jam ; - -include $(jamrulesdir)/help.jam ; -include $(jamrulesdir)/groups.jam ; -include $(jamrulesdir)/install.jam ; -include $(jamrulesdir)/clean.jam ; - -include $(jamrulesdir)/objects.jam ; -include $(jamrulesdir)/compiler.jam ; - -include $(jamrulesdir)/autoconf.jam ; - -include $(jamrulesdir)/flags.jam ; -include $(jamrulesdir)/libtool.jam ; -include $(jamrulesdir)/library.jam ; -include $(jamrulesdir)/application.jam ; - -include $(jamrulesdir)/options.jam ; - -# Include OS specific rules -switch $(target_os) -{ -case cygwin* : - include $(jamrulesdir)/win32.jam ; -case mingw32* : - include $(jamrulesdir)/win32.jam ; -case apple-darwin : - include $(jamrulesdir)/macosx.jam ; -case linux-gnu : - include $(jamrulesdir)/unix.jam ; -case * : - include $(jamrulesdir)/unix.jam ; -} - diff -Nru netpanzer-0.8.2/mk/jam/clean.jam netpanzer-0.8.4.debian.1/mk/jam/clean.jam --- netpanzer-0.8.2/mk/jam/clean.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/clean.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -#============================================================================ -# Rules for cleaning build detritus. -#============================================================================ - -DELTREE ?= "rm -rf" ; - -# CleanDir : ... -# Forcibly delete a set of directories, even if they are not empty. -# Tag is one of the standard targets used with the "Clean" rule, such as -# "clean" or "distclean". -rule CleanDir -{ - Always $(<) ; - NotFile $(<) ; - NoCare $(>) ; -} - -actions piecemeal together existing CleanDir -{ - $(DELTREE) $(>) -} diff -Nru netpanzer-0.8.2/mk/jam/compiler.jam netpanzer-0.8.4.debian.1/mk/jam/compiler.jam --- netpanzer-0.8.2/mk/jam/compiler.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/compiler.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -#============================================================================ -# Rules for C and C++ files -#============================================================================ - -# convert autoconf style variablenames to jam style ones -CCFLAGS += $(CFLAGS) ; -C++FLAGS += $(CXXFLAGS) ; -LFLAGS += $(LIBS) ; - -if $(CC) -{ - -rule CcRule -{ - local object ; - - if [ IsElem shared : $(2) ] - { - object = [ DoObjectGrist $(<:S=.lo) ] ; - CC on $(object) = "$(LIBTOOL) --mode=compile $(CC)" ; - } else { - object = [ DoObjectGrist $(<:S=.o) ] ; - } - - Cc $(object) : $(<) ; - return $(object) ; -} -RegisterFileType CcRule : .c ; -RegisterHeaderRule HeaderRule : $(HDRPATTERN) : .c ; - -rule Cc -{ - Depends $(<) : $(>) ; -} - -actions Cc -{ - $(CC) -c -o $(<) $(CPPFLAGS) $(CFLAGS) $(>) -} -} # end if $(CC) - -if $(CXX) -{ - -rule C++Rule -{ - local object ; - - if [ IsElem shared : $(2) ] { - object = [ DoObjectGrist $(<:S=.lo) ] ; - CXX on $(object) = "$(LIBTOOL) --mode=compile $(CXX)" ; - } else { - object = [ DoObjectGrist $(<:S=.o) ] ; - } - C++ $(object) : $(<) ; - return $(object) ; -} -RegisterFileType C++Rule : .cpp .cc .c++ ; # we can't register .C here because - # of windows being case-insensitive. -RegisterHeaderRule HeaderRule : $(HDRPATTERN) : .cpp .cc .c++ ; - -rule C++ -{ - Depends $(<) : $(>) ; -} - -actions C++ -{ - $(CXX) -c -o $(<) $(CPPFLAGS) $(C++FLAGS) $(>) -} -} # end if $(CXX) - -rule CreateIncludeFlags -{ - return -I$(<) ; -} - -rule CreateDefineFlags -{ - return -D$(<) ; -} diff -Nru netpanzer-0.8.2/mk/jam/flags.jam netpanzer-0.8.4.debian.1/mk/jam/flags.jam --- netpanzer-0.8.2/mk/jam/flags.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/flags.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,159 +0,0 @@ -#============================================================================ -# Rules for specifying compiler and linker flags -#============================================================================ - -## LinkWith target : libs [ : options ] -## Link a target with libraries. The specified libraries should have -## build rules in the same project. For external libraries use the -## ExternalLibs rule. Specify the library names without any extensions or -## the leading "lib". -rule LinkWith -{ - local i libs sharedlib ; - - for i in $(>) { - if $($(i)_TYPE) = "library" { - if [ IsElem shared : $($(i)_OPTIONS) ] { - libs += $(i) ; - sharedlib = true ; - } else { - # for non shared libs add inherit the compile flags and libs - libs += $(i) $($(i)_LIBRARIES) ; - # inherit the exported flags - CppFlags $(<) : $($(i)_CPPFLAGS) : $(3) ; - CFlags $(<) : $($(i)_CFLAGS) : $(3) ; - C++Flags $(<) : $($(i)_C++FLAGS) : $(3) ; - LFlags $(<) : $($(i)_LFLAGS) : $(3) ; - } - } else { - echo "WARNING: Trying to link" $(i) - "with" $(<) "which is not a library." ; - } - } - # resolve library dependencies - libs = [ RemoveDups $(libs) ] ; - $(<)_LIBRARIES = $(libs) ; - - local libfiles ; - for i in $(libs) { - libfiles += $($(i)_TARGET) ; - } - - DEPENDS $($(<)_TARGET) : $(libfiles) ; - NEEDLIBS on $($(<)_TARGET) += $(libfiles) ; - # the usual libtool hack... - if $(sharedlib) { - LINK on $($(<)_TARGET) = "$(LIBTOOL) $(LINK)" ; - INSTALL on $($(<)_INSTALLTARGET) = "$(LIBTOOL) --mode=install $(INSTALL)" ; - } -} - -rule CppFlags -{ - CPPFLAGS on $($(<)_OBJECTS) += $(>) ; - - if [ IsElem export : $(3) ] { - $(<)_CPPFLAGS = $(>) ; - } -} - -## CFlags target : flags [ : options ] -## Sets cflags on all sourcefiles of a target -## This rule affects c++ and c compiler flags. Options: -## export - export the cflags to dependent targets (for example in -## a library context this will inherit the cflags to the apps using -## the library) -rule CFlags -{ - CFLAGS on $($(<)_OBJECTS) += $(>) ; - - if [ IsElem export : $(3) ] { - $(<)_CFLAGS = $(>) ; - } -} - -rule C++Flags -{ - C++FLAGS on $($(<)_OBJECTS) += $(>) ; - - if [ IsElem export : $(3) ] { - $(<)_C++FLAGS = $(>) ; - } -} - -## LFlags target : flags [ : options ] -## Sets linker flags for a library, plugin or application target -rule LFlags -{ - LFLAGS on $($(<)_TARGET) += $(>) ; - - if [ IsElem export : $(3) ] { - $(<)_LFLAGS = $(>) ; - } -} - -## ExternalLibs appname : linkerflags [ : options ] -## Link an application/library/plugin with external libraries. It is -## possible to give a set of flags which will be passed to the linker when -## building the application (typically -L and -l flags). -rule ExternalLibs -{ - local i ; - - for i in $(>) - { - CppFlags $(<) : $($(i)_CFLAGS) : $(3) ; - LFlags $(<) : $($(i)_LIBS) : $(3) ; - } -} - -## ExtraObjects target : objectfiles -## Link additional object files with a target -rule ExtraObjects -{ - EXTRAOBJECTS on $($(<)_TARGET) += $(>) ; - Depends $($(<)_TARGET) : $(>) ; - Clean $(<)clean : $(>) ; - Clean clean : $(>) ; -} - -## IncludeDir [target : ] directories -## Description: Is used to specify the location of header files for a -## target or the whole project if no target is given. -## This rule will automatically generate the -I compiler flags and makes -## sure the dependency scanner is able to locate your header files. The -## directories are relative to the current subdir specified with the SubDir -## rule. -## Implementation: The directories are simply added to the HDRSEARCH variable -## which is respected by all jam rules. -rule IncludeDir -{ - local dir i ; - - if $(>) { - for i in $(>) { - dir = [ ConcatDirs $(SUBDIR) $(i) ] ; - CppFlags $(<) : [ CreateIncludeFlags $(dir) ] ; - - # needed for header scanning - HDRSEARCH on $($(<)_SOURCES) += $(dir) ; - } - } else { - for i in $(<) { - dir = [ ConcatDirs $(SUBDIR) $(i) ] ; - CPPFLAGS += [ CreateIncludeFlags $(dir) ] ; - # needed for header scanning - HDRSEARCH += $(dir) ; - } - } -} - -rule DefineConst -{ - if $(>) { - CppFlags $(<) : [ CreateDefineFlags $(>) ] ; - } else { - CPPFLAGS += [ CreateDefineFlags $(<) ] ; - } -} - diff -Nru netpanzer-0.8.2/mk/jam/groups.jam netpanzer-0.8.4.debian.1/mk/jam/groups.jam --- netpanzer-0.8.2/mk/jam/groups.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/groups.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -#============================================================================ -# Rules for building compile groups -#============================================================================ - -## CompileGroups target : groups -## Adds a target to a list of compile groups. A compile group is a virtual -## target which combines several targets. This is usefull for things like a -## creating a target which compiles all image loaders, all renderers, ... -rule CompileGroups -{ - local _i ; - - for _i in $(>) - { - Depends $(_i) : $(<) ; - Depends $(_i)clean : $(<)clean ; - } -} - -## RegisterCompileGroups -## Registers compilegroups. You must specify all compile groups here before -## can use them. -rule RegisterCompileGroups -{ -# nothing here (but msvcgen will override this) -} - diff -Nru netpanzer-0.8.2/mk/jam/helper.jam netpanzer-0.8.4.debian.1/mk/jam/helper.jam --- netpanzer-0.8.2/mk/jam/helper.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/helper.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,177 +0,0 @@ -#============================================================================ -# Helper rules -#============================================================================ - -CP ?= "cp" ; -MV ?= "mv" ; - -## Wildcard [ dir : ] patterns -## Create a list of files in a directory which match the pattern. You can -## optionally specify a subdirectory. The files will be returned with -## stripped pathnames. The difference from GLOB is that this rule respects -## subdirectories which may have been entered with the SubDir rule. -rule Wildcard -{ - local files dir sdir wildcards ; - - # Is a directory given? - if $(>) { - dir = $(<)/ ; - sdir = $(<) ; - wildcards = $(>) ; - } else { - dir = "" ; - sdir = "" ; - wildcards = $(<) ; - } - - files = [ GLOB [ ConcatDirs $(SUBDIR) $(dir) ] : $(wildcards) ] ; - - return $(files:BSR=$(sdir)) ; -} - -## Prefix list : prefix -## Adds a prefix to a all elements in list. -rule Prefix -{ - return $(>)$(<) ; -} - -if $(JAMVERSION) >= 2.5 -{ - -## IsElem element : list -## Returns "true" if the elemnt is in the list. Otherwise nothing is -## returned. -rule IsElem -{ - local i ; - - for i in $(>) - { - if $(i) = $(<) - { - return "true" ; - } - } - - return ; -} - -} -else -{ - -# jam<2.4's return statement doesn't exit the function -rule IsElem -{ - local i result ; - - for i in $(>) - { - if $(i) = $(<) - { - result = "true" ; - $(>) = ; - } - } - - return $(result) ; -} - -} - -## Filter list : filter -## Returns the list without the words contained in filter. -rule Filter -{ - local i result ; - - for i in $(<) - { - if ! [ IsElem $(i) : $(>) ] - { - result += $(i) ; - } - } - - return $(result) ; -} - -## RemoveDups list -## Removes duplicates in the list (this function tries to preserve the list -## order) -rule RemoveDups -{ - local i result ; - - for i in $(<) - { - if ! [ IsElem $(i) : $(result) ] - { - result += $(i) ; - } - } - - return $(result) ; -} - -rule Reverse -{ - local result ; - - for i in $(<) - { - result = $(i) $(result) ; - } - return $(result) ; -} - -## GetVar argument -## Simply returns the value of the variable with name argument. -## This is useful to query on target variables: -## bla = [ on TARGET GetVar CFlags ] ; -rule GetVar -{ - return $($(<)) ; -} - -## ConcatDirs dirs -## Concatenates a set of directories. This is a substitute for FDirName in -## Jambase. It works also correctly for several rooted paths, where FDirName -## fails. -## The advantage over $(dir1)/$(dir2) is that this also works correctly if -## $(dir1) or $(dir2) is not set. -rule ConcatDirs -{ - local i ; - local result = $(<[1]) ; - if ! $(result) { $result = "" ; } - local dir1 dir2 ; - - for i in $(<[2-]) - { - # eleminate multiple slashes because jam is somewhat buggy here - dir1 = [ MATCH (.*[^/]?) : $(result) ] ; - dir2 = [ MATCH ([^/].*) : $(i) ] ; - if ! $(dir1) { dir1 = "" ; } - if $(dir1) != "" { dir1 = $(dir1)/ ; } - if ! $(dir2) { dir2 = "" ; } - result = $(dir1)$(dir2) ; - } - - return $(result) ; -} - -## Copy target : source -## Copy source file to target. -actions Copy -{ - $(CP) "$(>)" "$(<)" -} - -actions ignore Move -{ - $(MV) $(>) $(<) -} - diff -Nru netpanzer-0.8.2/mk/jam/help.jam netpanzer-0.8.4.debian.1/mk/jam/help.jam --- netpanzer-0.8.2/mk/jam/help.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/help.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -#============================================================================ -# Rules for displaying help messages about targets -#============================================================================ - -## Help target : description -## Adds a description to a target which will be shown to the user when -## "jam help" is invoked. -rule Help -{ - $(<)_help = $(>) ; - local target = $(<:G=help) ; - Depends help : $(target) ; - NotFile $(>) ; - PrintHelp $(target) : $(>) ; - Always $(target) ; -} - -#---------------------------------------------------------------------------- - -NotFile help ; -Always help ; - -actions quietly PrintHelp -{ - # target width:13, description width:51 - echo "jam ->$(<) <- =>$(>) <=" | \ - sed 's/->\(..............\).*<-/\1/;s/=>\(...................................................\).*<=/\1/' -} diff -Nru netpanzer-0.8.2/mk/jam/install.jam netpanzer-0.8.4.debian.1/mk/jam/install.jam --- netpanzer-0.8.2/mk/jam/install.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/install.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,162 +0,0 @@ -#============================================================================ -# Rules for installation -#============================================================================ - -COPYDIRS ?= "cp -R" ; - -INSTALL ?= "install" ; -INSTALL_PROGRAM ?= $(INSTALL) ; -INSTALL_SCRIPT ?= $(INSTALL) ; -INSTALL_DATA ?= "$(INSTALL) -m644" ; - -# set some paths -appdatadir ?= [ ConcatDirs $(datadir) $(PACKAGE_NAME) ] ; -appdocdir ?= [ ConcatDirs $(datadir) doc $(PACKAGE_NAME)-$(PACKAGE_VERSION) ] ; -appconfdir ?= [ ConcatDirs $(sysconfdir) $(PACKAGE_NAME) ] ; -plugindir ?= [ ConcatDirs $(libdir) $(PACKAGE_NAME) ] ; -applicationsdir ?= [ ConcatDirs $(datadir) applications ] ; -pixmapsdir ?= [ ConcatDirs $(datadir) pixmaps ] ; - -## InstallHeader headername [ : subdir ] -## DoInstall a headerfile into the includedir directory. A subdirectory -## relative to the includedir can be specified. -rule InstallHeader -{ - SEARCH on $(<:G=installheader) = $(SUBDIR) ; - Depends install_include : [ DoInstall $(<:G=installheader) : $(includedir) $(2) ] ; -} - -## InstallShellScript scriptname [ : subdir ] -## Installs a shell script into the bindir directory. A subdirectory -## relative to the bindir can be specified. -rule InstallShellScript -{ - SEARCH on $(<:G=installscript) = $(SUBDIR) ; - Depends install_shellscript - : [ DoInstall $(<:G=installscript) : $(bindir) $(2) : $(INSTALL_SCRIPT) ] - ; -} - -## InstallData files [ : subdir ] -## Installs data files -rule InstallData -{ - SEARCH on $(<:G=installdata) = $(SUBDIR) ; - Depends install_data : [ DoInstall $(<:G=installdata) : $(appdatadir) $(2) ] ; -} - -## InstallConfig files [ : subdir ] -## Installs configuration files -rule InstallConfig -{ - SEARCH on $(<:G=installconfig) = $(SUBDIR) ; - Depends install_config : [ DoInstall $(<:G=installconfig) : $(appconfdir) $(2) ] ; -} - -## InstallDoc files [ : subdir ] -## Installs documentation files -rule InstallDoc -{ - SEARCH on $(<:G=installdoc) = $(SUBDIR) ; - Depends install_doc : [ DoInstall $(<:G=installdoc) : $(appdocdir) $(2) ] ; -} - -## InstallMan files -## DoInstall man files -rule InstallMan -{ - local dir i ; - - SEARCH on $(<:G=installman) = $(SUBDIR) ; - for i in $(<:G=installman) { - dir = $(mandir) ; - switch $(i:S) { - case .1 : dir += man1 ; - case .2 : dir += man2 ; - case .3 : dir += man3 ; - case .4 : dir += man4 ; - case .5 : dir += man5 ; - case .6 : dir += man6 ; - case .7 : dir += man7 ; - case .8 : dir += man8 ; - case .9 : dir += man9 ; - case * : - echo "WARNING: manfile has no *.[0-9] ending." ; - } - Depends install_man : [ DoInstall $(i) : $(dir) ] ; - } -} - -## InstallPixmap files [ : subdir ] -## Install a pixmap -rule InstallPixmap -{ - LOCATE on $(<:G=installpixmap) = $(SUBDIR) ; - Depends install_data - : [ DoInstall $(<:G=installpixmap) : $(pixmapsdir) $(2) ] ; -} - -## InstallDesktop files [ : subdir ] -## Install a .desktop file (menu entries for kde/gnome and others) -rule InstallDesktop -{ - LOCATE on $(<:G=installdesktop) = $(SUBDIR) ; - Depends install_bin - : [ DoInstall $(<:G=installdesktop) : $(applicationsdir) $(2) ] ; -} - -## DoInstall sourcename : directories [ : installapp ] [ : options ] -## Creates a new installtarget for the given sources. The target(s) are -## returned as function result. -rule DoInstall -{ - local targets target i dir gdir ; - dir = [ ConcatDirs $(DESTDIR) $(2) ] ; - - gdir = $(dir:G=dir) ; - MkDir $(gdir) ; - - for i in $(<) { - target = $(i:BSR=$(dir):G=install) ; - targets += $(target) ; - Depends $(target) : $(gdir) $(i) ; - Install1 $(target) : $(i) ; - - if $(3) { - INSTALL on $(target) = $(3) ; - } else { - INSTALL on $(target) = $(INSTALL_DATA) ; - } - } - - # We want to package all files we install - if ! [ IsElem nopackage : $(4) ] { - Package $(<) ; - } - - Always $(targets) ; - return $(targets) ; -} - -#---------------------------------------------------------------------------- - -INSTALLTARGETS = install_bin install_plugin install_lib install_header - install_shellscript install_data install_config - install_doc ; - -Always install $(INSTALLTARGETS) ; -NotFile install $(INSTALLTARGETS) ; -Depends install : $(INSTALLTARGETS) ; - -Help install : "Install $(PACKAGE_NAME)" ; - -actions Install1 -{ - $(INSTALL) "$(>)" "$(<:D)" $(INSTALLFLAGS) ; -} - -actions CopyDirs -{ - $(COPYDIRS) "$(>)" "$(<)" -} - diff -Nru netpanzer-0.8.2/mk/jam/jamcompatibility.jam netpanzer-0.8.4.debian.1/mk/jam/jamcompatibility.jam --- netpanzer-0.8.2/mk/jam/jamcompatibility.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/jamcompatibility.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,337 +0,0 @@ -#============================================================================ -# Several hacks to make the build compatible with certain old/broken jam -# versions -#============================================================================ - -# boostjam is evil: It is compatible to jam 2.4 but has a version number 3.1, we# try to detect boostjam with the ARGV extension -if $(ARGV[0]) -{ -# boostjam hacks - JAMVERSION = 2.4 ; - rule FIncludes - { - return -I$(<) ; - } - rule FDefines - { - return -D$(<) ; - } -} - -# we can't use boostjam at the moment as it still has the bug from jam 2.4 where -# settings variables on header targets doesn't work -if $(JAMVERSION) <= 2.4 -{ - EXIT "Error: This buildsystem requires jam version 2.5 or later." ; -} -# don't confuse users for now... -#if $(JAMVERSION) = 2.4 & $(JAM_DEBUG) -#{ -# echo "Warning: It is recommended to use jam2.5rc3 or later." ; -#} - -# All scripts invoked by the build system expect a Bourne or compatible shell. -# Reject C-shell and its variants (such as tcsh). Unfortunately, this is a bit -# of an ugly hack. It would be nicer to perform this logic at the very end of -# this file as a last-minute assertion. Unfortunately, however, it seems that -# references to $(SHELL) in any of the included files get bound at the point -# of reference, thus we need to perform this filtering as early as possible. -if [ Match (csh) : $(SHELL) ] -{ - SHELL = "/bin/sh" ; -} - -# jam 2.4s SubDir rule had some problems and misses the usefull SUBDIRRULES -# extension. So we override it here with a better version (from jam 2.5rc3) -if $(JAMVERSION) = 2.4 -{ - -rule SubDir -{ - # - # SubDir TOP d1 d2 ... ; - # - # Support for a project tree spanning multiple directories. - # - # SubDir declares a Jamfile's location in a project tree, setting - # Jambase variables (SEARCH_SOURCE, LOCATE_TARGET) so that source - # files can be found. - # - # TOP is a user-select variable name for root of the tree, and - # d1 d2 ... are the directory elements that lead from the root - # of the tree to the directory of the Jamfile. - # - # TOP can be set externally, but normally the first SubDir call - # computes TOP as the path up from the current directory; the - # path contains one ../ for each of d1 d2 ... - # - # SubDir reads once the project-specific rules file Jamrules - # in the TOP directory, if present. This can be overridden - # with the variable TOPRULES. - # - # SubDir supports multiple, overlaid project trees: SubDir - # invocations with different TOPs can appear in the same Jamfile. - # The location established by the first SubDir call is used set - # the TOPs for the subsequent SubDir calls. - # - # SubDir's public variables: - # - # $(TOP) = path from CWD to root. - # $(SUBDIR) = path from CWD to the directory SubDir names. - # $(SUBDIR_TOKENS) = path from $(TOP) to $(SUBDIR) as dir names - # $(SEARCH_SOURCE) = $(SUBDIR) - # $(LOCATE_SOURCE) = $(ALL_LOCATE_TARGET) $(SUBDIR) - # $(LOCATE_TARGET) = $(ALL_LOCATE_TARGET) $(SUBDIR) - # $(SOURCE_GRIST) = $(SUBDIR_TOKENS) with !'s - # - - local _top = $(<[1]) ; - local _tokens = $(<[2-]) ; - - # - # First time through sets up relative root and includes Jamrules. - # - - if ! $(_top) - { - Exit SubDir syntax error ; - } - - if ! $($(_top)-SET) - { - $(_top)-SET = true ; - - # First time we've seen this TOP. - # We'll initialize a number of internal variables: - # - # $(TOP-UP) = directories from ROOT to a common point - # $(TOP-DOWN) = directories from common point to TOP - # $(TOP-ROOT) = root directory for UP/DOWN -- normally CWD - # $(SUBDIR_UP) = current value of $(TOP-UP) - # $(SUBDIR_DOWN) = current value of $(TOP-DOWN) - # $(SUBDIR_ROOT) = current value of $(TOP-ROOT) - # - - if $($(_top)) - { - # TOP externally set. - # We'll ignore the relative (UP/DOWN) path that - # got us here, and instead remember the hard ROOT. - - $(_top)-UP = ; - $(_top)-DOWN = ; - $(_top)-ROOT = $($(_top)) ; - } - else - { - # TOP not preset. - - # Establishing a new TOP. In the simplest case, - # (SUBDIR_UP/SUBDIR_DOWN/SUBDIR_ROOT unset), it's - # merely a certain number of directories down from - # the current directory, and FSubDirPath will set - # TOP to a path consisting of ../ for each of the - # elements of _tokens, because that represents how - # far below TOP the current directory sits. - # - # In the more complicated case, the starting directory - # isn't the directory of jam's invocation but an - # location established by previous SubDir call. The - # starting directory is SUBDIR_UP directories up from - # SUBDIR_ROOT, and then SUBDIR_DOWN directories down - # from that. If SUBDIR_ROOT is not set, that means - # SUBDIR_DOWN and SUBDIR_UP represent the path from - # the directory of jam's invocation. - # - # In the most complicated case, the _tokens also - # represents directories down, because TOP is being - # estalished in a directory other than TOP's root. - # Hopefully, _tokens and SUBDIR_DOWN represent the - # same final directory, relative to the new TOP and - # the previous SubDIr's TOP. To find the new TOP, - # we have to chop off any common directories from - # then ends of _tokens and SUBDIR_DOWN. To do so, - # we reverse each of them, call FStripCommon to - # remove the initial common elements, and then - # reverse them again. After this process, if - # both _tokens and SUBDIR_DOWN have elements, it - # means the directory names estalished by the two - # SubDir calls don't match, and a warning is issued. - # All hell will likely break loose at this point, - # since the whole SubDir scheme relies on the SubDir - # calls accurately naming the current directory. - - # Strip common trailing elements of _tokens and SUBDIR_DOWN. - - _tokens = [ FReverse $(_tokens) ] ; - SUBDIR_DOWN = [ FReverse $(SUBDIR_DOWN) ] ; - FStripCommon _tokens : SUBDIR_DOWN ; - SUBDIR_DOWN = [ FReverse $(SUBDIR_DOWN) ] ; - _tokens = [ FReverse $(_tokens) ] ; - - if $(SUBDIR_DOWN) && $(_tokens) - { - Echo Warning: SubDir $(<) misplaced! ; - } - - # We'll remember the relative (UP/DOWN) path that - # got us here, plus any hard ROOT starting point - # for the UP/DOWN. If TOP is never set externally, - # ROOT will always be "" (directory of jam's invocation). - - $(_top)-UP = $(SUBDIR_UP) $(_tokens) ; - $(_top)-DOWN = $(SUBDIR_DOWN) ; - $(_top)-ROOT = $(SUBDIR_ROOT:E="") ; - $(_top) = [ FSubDirPath $(_top) ] ; - } - - # Set subdir vars for the inclusion of the Jamrules, - # just in case they have SubDir rules of their own. - # Note that SUBDIR_DOWN is empty: it's all the way - # up where the Jamrules live. These gets overrided - # just after the inclusion. - - SUBDIR_UP = $($(_top)-UP) ; - SUBDIR_DOWN = ; - SUBDIR_ROOT = $($(_top)-ROOT) ; - - # Include $(TOPRULES) or $(TOP)/Jamrules. - # Include $(TOPRULES) if set. - # Otherwise include $(TOP)/Jamrules if present. - - if $($(_top)RULES) { - include $($(_top)RULES) ; - } else { - NoCare $(JAMRULES:R=$($(_top)):G=$(_top)) ; - include $(JAMRULES:R=$($(_top)):G=$(_top)) ; - } - } - - # Get path from $(TOP) to named directory. - # Save dir tokens for other potential uses. - - SUBDIR_UP = $($(_top)-UP) ; - SUBDIR_DOWN = $($(_top)-DOWN) $(_tokens) ; - SUBDIR_ROOT = $($(_top)-ROOT) ; - SUBDIR_TOKENS = $(SUBDIR_DOWN) ; - - SUBDIR = [ FSubDirPath $(<) ] ; - - # Now set up SEARCH_SOURCE, LOCATE_TARGET, SOURCE_GRIST - # These can be reset if needed. For example, if the source - # directory should not hold object files, LOCATE_TARGET can - # subsequently be redefined. - - SEARCH_SOURCE = $(SUBDIR) ; - LOCATE_SOURCE = $(ALL_LOCATE_TARGET) $(SUBDIR) ; - LOCATE_TARGET = $(ALL_LOCATE_TARGET) $(SUBDIR) ; - SOURCE_GRIST = [ FGrist $(SUBDIR_TOKENS) ] ; - - # Reset per-directory ccflags, hdrs, etc, - # listed in SUBDIRRESET. - # Note use of variable expanded assignment var - - SUBDIR$(SUBDIRRESET) = ; - - # Invoke user-specific SubDir extensions, - # rule names listed in SUBDIRRULES. - # Note use of variable expanded rule invocation - - $(SUBDIRRULES) $(<) ; -} - -rule FSubDirPath -{ - # FSubDirPath TOP d1 ... ; - - # Returns path to named directory. - - # If jam is invoked in a subdirectory of the TOP, then we - # need to prepend a ../ for every level we must climb up - # (TOP-UP), and then append the directory names we must - # climb down (TOP-DOWN), plus the named directories d1 ... - # If TOP was set externally, or computed from another TOP - # that was, we'll have to reroot the whole thing at TOP-ROOT. - - local _r = [ FRelPath $($(<[1])-UP) : $($(<[1])-DOWN) $(<[2-]) ] ; - - return $(_r:R=$($(<[1])-ROOT)) ; -} - -rule SubInclude -{ - # SubInclude TOP d1 ... ; - # - # Include a subdirectory's Jamfile. - - # We use SubDir to get there, in case the included Jamfile - # either doesn't have its own SubDir (naughty) or is a subtree - # with its own TOP. - - if ! $($(<[1])) - { - Exit SubInclude $(<[1]) without prior SubDir $(<[1]) ; - } - - SubDir $(<) ; - - include $(JAMFILE:D=$(SUBDIR)) ; -} - -rule SubRules -{ - # SubRules TOP d1 ... : Other-TOP ; - # - # Read another tree's Jamrules, by giving it's path according - # to this tree and it's own name. - - if ! $($(<[1])) - { - Exit SubRules $(<[1]) without prior SubDir $(<[1]) ; - } - - SubDir $(<) ; - SubDir $(>) ; -} - -## Now we try to fix up the already messed settings -## XXX We can only hope that jam2.4 users don't try starting jam from -## subdirectories -TOP-SET = true ; -TOP-UP = ; -TOP-DOWN = ; -TOP-ROOT = $(TOP) ; -SUBDIR_UP = $(TOP-UP) ; -SUBDIR_DOWN = ; -SUBDIR_ROOT = $(TOP-ROOT) ; - -#SubDir TOP ; - -} # end if $(JAMVERSION) = 2.4 - -# MakeLocate rule from jam 2.4 isn't optimal. Use improved version from jam -# 2.5 -if $(JAMVERSION) = 2.4 -{ - -rule MakeLocate -{ - # MakeLocate targets : directory ; - - # Sets special variable LOCATE on targets, and arranges - # with MkDir to create target directory. - - # Note we grist the directory name with 'dir', - # so that directory path components and other - # targets don't conflict. - - if $(>) - { - LOCATE on $(<) = $(>) ; - Depends $(<) : $(>[1]:G=dir) ; - MkDir $(>[1]:G=dir) ; - } -} - -} - diff -Nru netpanzer-0.8.2/mk/jam/library.jam netpanzer-0.8.4.debian.1/mk/jam/library.jam --- netpanzer-0.8.2/mk/jam/library.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/library.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,170 +0,0 @@ -#============================================================================ -# Rules for library creation -#============================================================================ - -## Library libname : sources [ : options ] -## Build a library out of sourcefiles. All sourcefiles will be passed -## to the Objects rule which tries to compile them into object-files. You -## can create rules for your own filetypes with the UserObject rule. Header -## files will just be ignored. They are only used for MSVC projectfile -## generation. If additional objects are given (fourth argument), they -## should be the output of CompileObjects, and will be included in the -## library. -## Available options are 'shared' if you want to build a shared library on -## platforms which support that. You can specify the 'noinstall' option if -## you don't want an install target is generated. -## Don't specify any extensions for the library name, also leave out the -## leading "lib". -rule Library -{ - # check options - CheckOptions noinstall independent shared : $(3) : $(<) ; - - local no_scan_archive = $(NOARSCAN) ; - local target = [ ConstructLibraryTarget $(<) : $(3) ] ; - local sources = [ DoSourceGrist $(>) ] ; - local objects = [ CompileObjects $(sources) : $(3) ] ; - local install_targets ; - - $(<)_TYPE = library ; - $(<)_OBJECTS = $(objects) ; - $(<)_SOURCES = $(sources) ; - $(<)_TARGET = $(target) ; - $(<)_OPTIONS = $(3) ; - - # create target clean rule - Always $(<)clean ; - NotFile $(<)clean ; - Clean $(<)clean : $(objects) ; # create target clean rule - - # so 'jam foo' works when it's really foo.exe (Windows) or foo.app (MacOS/X) - if $(target) != $(<) - { - Depends $(<) : $(target) ; - NotFile $(<) ; } - - # library depends on its member objects - if ! [ IsElem independent : $(3) ] - { - if $(KEEPOBJS) - { - Depends obj : $(objects) ; - } - else - { - Depends libs : $(<) ; - } - } - - # Generate install rules - if ! [ IsElem noinstall : $(3) ] - { - install_targets = [ DoInstall $(target) : $(libdir) : $(INSTALL) : nopackage ] ; - Depends install_lib : $(install_targets) ; - } - - if [ IsElem shared : $(3) ] - { - if ! $(LIBTOOL) { - exit "LIBTOOL not defined, can't create dynamic library." ; - } - no_scan_archive = 1 ; - DoLibToolClean ; - - if $(install_targets) { - INSTALL on $(install_targets) = "$(LIBTOOL) --mode=install $(INSTALL)" ; - InvokeLibtoolFinish $(install_targets) ; - } - } - - # Set LOCATE for the library and its contents. The bound - # value shows up as $(NEEDLIBS) on the Link actions. - # For compatibility, we only do this if the library doesn't - # already have a path. - if ! $(target:D) - { - MakeLocate $(target) $(target)($(objects:BS)) : $(LOCATE_TARGET) ; - } - - if ! $(no_scan_archive) - { - # If we can scan the library, we make the library depend - # on its members and each member depend on the on-disk - # object file. - Depends $(target) : $(target)($(objects:BS)) ; - - local i ; - for i in $(objects) - { - Depends $(target)($(i:BS)) : $(i) ; - } - } else { - Depends $(target) : $(objects) ; - } - - if $(CRELIB) { CreLib $(target) : $(objects[1]) ; } - - SystemLinkLibrary $(<) : $(objects) : $(3) ; - - # If we can't scan the library, we have to leave the .o's around. - if ! ( $(no_scan_archive) || $(NOARUPDATE) ) - { - RmTemps $(target) : $(objects) ; - } - - # Import default flags - CppFlags $(<) : $(CPPFLAGS) $(LIBRARY_CPPFLAGS) ; - CFlags $(<) : $(CFLAGS) $(LIBRARY_CFLAGS) ; - C++Flags $(<) : $(C++FLAGS) $(LIBRARY_C++FLAGS) ; - LFlags $(<) : $(LFLAGS) $(LIBRARY_LFLAGS) ; - - # Sources are part of the package - if ! [ IsElem nopackage : $(3) ] - { - Package $(sources) ; - } -} - -## LibraryVersion -## Specify the version of a library. The version should have the form -## major:minor:patchlevel -rule LibraryVersion -{ - LFLAGS on $($(<)_TARGET) = -version-info $(>) ; -} - -#---------------------------------------------------------------------------- -# private part - -# default implementation of SystemLinkLibrary -rule SystemLinkLibrary -{ - local target = $($(<)_TARGET) ; - - if [ IsElem shared : $(3) ] { - LINK on $(target) = "$(LIBTOOL) --mode=link $(LINK) -rpath $(libdir)" ; - LinkLibrary $(target) : $(>) ; - } else { - Archive $(target) : $(>) ; - if $(RANLIB) { Ranlib $(target) ; } - } - - Clean clean : $(target) ; - Clean $(<)clean : $(target) ; -} - -actions together Ranlib -{ - $(RANLIB) $(<) -} - -actions LinkLibrary bind NEEDLIBS bind EXTRAOBJECTS -{ - $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LFLAGS) -} - -# Construct pseudo target libs which is used instead of the pseudo target lib -# in Jambase -Depends lib : libs ; -NotFile libs ; - diff -Nru netpanzer-0.8.2/mk/jam/libtool.jam netpanzer-0.8.4.debian.1/mk/jam/libtool.jam --- netpanzer-0.8.2/mk/jam/libtool.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/libtool.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -rule InvokeLibtoolFinish -{ - # eventually invoke libtool --mode=finish after installation - if ! $(INVOKE_LIBTOOL_FINISH) && ! $(DESTDIR) { - INVOKE_LIBTOOL_FINISH = true ; - NotFile libtool_finish ; - Always libtool_finish ; - LibToolFinish libtool_finish ; - Depends install_lib : libtool_finish ; - } - Depends libtool_finish : $(<) ; -} - -rule DoLibToolClean -{ - local target = libtoolclean ; - Always $(target) ; - NotFile $(target) ; - - Depends clean : $(target) ; - LibToolClean $(target) ; -} - -actions LibToolFinish bind INSTALLLIBS -{ - $(LIBTOOL) --mode=finish $(libdir) -} - -actions LibToolClean -{ - $(LIBTOOL) --mode=clean $(RM) -} - -if ! $(LIBTOOL_VERBOSE) -{ - LIBTOOL = "$(LIBTOOL) --quiet" ; -} - diff -Nru netpanzer-0.8.2/mk/jam/macosx.jam netpanzer-0.8.4.debian.1/mk/jam/macosx.jam --- netpanzer-0.8.2/mk/jam/macosx.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/macosx.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -#============================================================================ -# Jam configuration and actions for MacOS/X -# Copyright (C) 2003 by Eric Sunshine -#============================================================================ -SHELL ?= "/bin/sh" ; -DEEPCOPY ?= "cp -R" ; - -# Experience seems to indicate that library scanning misbehaves on MacOS/X with -# Jam 2.4, consequently we disable it. -AR = "ar ru" ; -NOARUPDATE = true ; -NOARSCAN = true ; -actions Archive -{ - $(AR) $(<) $(>) -} - -#------------------------------------------------------------------------------ -# Public rules. -#------------------------------------------------------------------------------ - -# ConstructApplicationTarget target : options -# Constructs the application target name (ie. foo.app for foo) -rule ConstructApplicationTarget -{ - return $(<) ; -} - -# ConstructLibraryTarget target : options -rule ConstructLibraryTarget -{ - return lib$(<).a ; -} - -# SystemLinkApplication target : objects : options -rule SystemLinkApplication -{ - local target = $($(<)_TARGET) ; - Depends $(target) : $(>) ; - - LinkApplication $(target) : $(>) ; - Clean clean : $(target) ; - Clean $(<)clean : $(target) ; -} - -# LinkApplicationConsole exe : objects -# Link a console (non-GUI) appliation from a set of object files. -actions LinkApplication bind NEEDLIBS bind EXTRAOBJECTS -{ - $(MACOSX.ENVIRON) - $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LFLAGS) -} - diff -Nru netpanzer-0.8.2/mk/jam/msvcgen.jam netpanzer-0.8.4.debian.1/mk/jam/msvcgen.jam --- netpanzer-0.8.2/mk/jam/msvcgen.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/msvcgen.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,383 +0,0 @@ -#============================================================================ -# Rules for creating msvc projectfiles -#============================================================================ - -# BUGS & TODO -#------------ -# - Create a secondary target (such as "msvcinst") which copies the generated -# project files from the build/"out" directory back into the source -# directory. This is useful for maintainers who, after having created and -# tested a new set of project files, want to then commit them to the CVS -# repository. -# -# - Either respect ExternaLibs() or fix all the Jamfiles which require special -# Windows libraries to invoke MsvcExternalLibrary(). This is necessary for -# modules such as cssocket and ensocket which require wsock32.lib, for -# instance. There are a number of other such modules. The current monlithic -# solution of placing this information in CS/mk/msvcgen/Jamconfig is ugly, -# error-prone, and a maintenance headache. -# -# - Overhaul the "config" file handling rule so that it associates -# configuration files with built targets. This will allow the generated -# projects to reference configuration files. Rather than the present -# InstallConfig rule, we either need a ConfigFile:: rule, or -# we should upgrade the Application and Plugin rules to also accept -# configuration files. -# -# - Likewise, provide a generic Resources() rule which allows specification of -# additional textual resources for inclusion in generated projects. -# -# - Upgrade module Jamfiles to mention headers from the CS/include/module -# directory. This will allow related headers to appear in the generated -# project files. For instance, the libcsengine project should mention -# headers from CS/include/csengine, in addition to the ones from -# CS/libs/csengine which it currently mentions. -# -# - When PERL5.SDK.AVAILABLE is "yes", Jam reports that it doesn't know how to -# locate or create csperlxs.c. - -if $(MSVCGEN_CONFIG) -{ - -MSVCGEN = "$(PERL) $(TOP)/mk/msvcgen/msvcgen.pl" ; -MKVERRES = "$(SHELL) $(TOP)/libs/cssys/win32/mkverres.sh" ; -MKMETADATARES = "$(SHELL) $(TOP)/libs/cssys/win32/mkmetadatares.sh" ; -MERGERES = "$(SHELL) $(TOP)/libs/cssys/win32/mergeres.sh" ; - -MSVCGEN_BUILD_ROOT = $(BUILDTOP)/out ; - -MSVC_VERSION ?= 6 ; -if $(MSVC_VERSION) = 6 -{ - MSVCGEN_LOCATE_TARGET ?= $(MSVCGEN_BUILD_ROOT)/mk/visualc6 ; - MSVCGEN_LOCATE_FRAGMENT ?= $(MSVCGEN_BUILD_ROOT)/mk/fragment6 ; - MSVCGEN_TEMPLATEDIR ?= $(TOP)/mk/msvcgen/template6 ; - MSVCGEN_EXTRA_OPTS = ; - SSUFPRJ = dsp ; - SSUFWSP = dsw ; - SUFPRJ = .dsp ; - SUFWSP = .dsw ; -} -else if $(MSVC_VERSION) = 7 -{ - MSVCGEN_LOCATE_TARGET ?= $(MSVCGEN_BUILD_ROOT)/mk/visualc7 ; - MSVCGEN_LOCATE_FRAGMENT ?= $(MSVCGEN_BUILD_ROOT)/mk/fragment7 ; - MSVCGEN_TEMPLATEDIR ?= $(TOP)/mk/msvcgen/template7 ; - MSVCGEN_EXTRA_OPTS = --xml-protect ; - SSUFPRJ = vcproj ; - SUFPRJ = .vcproj ; - SSUFWSP = sln ; - SUFWSP = .sln ; -} -else -{ - EXIT "No support for MSVC version $(MSVC_VERSION) yet!" ; -} - -#---------------------------------------------------------------------------- -# Override some rules - - -## MsvcProject target : sources : type : target-with-ext -rule MsvcProject -{ - local rcpath resource msvcname target fragments fragroot files i ; - - switch $(3) - { - case appgui : - msvcname = app$(<) ; - case appcon : - msvcname = app$(<) ; - case plugin : - msvcname = plg$(<) ; - case library : - msvcname = lib$(<) ; - case group : - msvcname = grp$(<) ; - case * : - exit "Unknown msvc projecttype: $(3) specified!" ; - } - $(<)_MSVCNAME = $(msvcname) ; - - fragroot = $(MSVCGEN_LOCATE_FRAGMENT)/$(msvcname).frag ; - NotFile $(fragroot) ; - - fragments = [ FAppendSuffix $(msvcname) : .frag.cff ] - [ FAppendSuffix $(msvcname) : .frag.dpf ] - [ FAppendSuffix $(msvcname) : .frag.pjf ] ; - MakeLocate $(fragments) : $(MSVCGEN_LOCATE_FRAGMENT) ; - target = [ FAppendSuffix $(msvcname) : $(SUFPRJ) ] ; - MakeLocate $(target) : $(MSVCGEN_LOCATE_TARGET) ; - target += $(fragments) ; - $(<)_TARGET = $(target) ; - - # Only include source and headers files for now. In the future, we also - # want to include .cfg files and any other textual resources which which the - # user might care to read/view in the MSVC IDE. - for i in $(>) - { - i = $(i:G=$(LOCATE_SOURCE)) ; - switch $(i:S) - { - case .h : files += $(i) ; - case .hpp : files += $(i) ; - case .H : files += $(i) ; - case .c : files += $(i) ; - case .cc : files += $(i) ; - case .cpp : files += $(i) ; - case .m : files += $(i) ; - case .mm : files += $(i) ; - case .M : files += $(i) ; - } - } - # Search at the correct place for the files - SEARCH on $(files) = $(SEARCH_SOURCE) ; - - # Add resource file - if $(3) = "plugin" || $(3) = "appgui" || $(3) = "appcon" - { - resource = $(msvcname:S=.rc) ; - # @@@ Uber-ugly - rcpath = ../../../mk/visualc7/$(msvcname:S=.rc) ; - #files += $(resource) ; - Depends $(target) : $(resource) ; - LOCATE on $(resource) = $(MSVCGEN_LOCATE_TARGET) ; - SEARCH on $(resource) = $(MSVCGEN_LOCATE_FRAGMENT) ; - NAME on $(resource) = $(<) ; - #RCNAME on $(<) = $(resource) ; - $(<)_RCNAME = $(resource) ; - #ResourceGen $(resource) ; - - local versionrc = $(resource:S=.vrctmp) ; - - # normalize version list - local v1, v2, v3, v4 ; - v1 = $(PACKAGE.VERSION.LIST[1]) ; - if ! $(v1) { v1 = 0 ; } - v2 = $(PACKAGE.VERSION.LIST[2]) ; - if ! $(v2) { v2 = 0 ; } - v3 = $(PACKAGE.VERSION.LIST[3]) ; - if ! $(v3) { v3 = 0 ; } - v4 = $(PACKAGE.VERSION.LIST[4]) ; - if ! $(v4) { v4 = 0 ; } - PACKAGE.VERSION.LIST on $(versionrc) = $(v1) $(v2) $(v3) $(v4) ; - - # @@@ The "Help" rule is usually invoked after 'Plugin'/'Application', - # so "$(<)_help" is empty... - DESCRIPTION on $(versionrc) = $($(<)_help) ; - - LOCATE on $(versionrc) = $(MSVCGEN_LOCATE_FRAGMENT) ; - - GenerateWin32VersionRc $(versionrc) ; - Always $(versionrc) ; - Win32Resource $(<) : $(versionrc) ; - RmTemps $(target) : $(versionrc) ; - - if $(3) = "plugin" - { - local metarc = $(resource:S=.mrctmp) ; - - LOCATE on $(metarc) = $(MSVCGEN_LOCATE_FRAGMENT) ; - SEARCH on $(metarc) = $(SEARCH_SOURCE) ; - - Depends $(metarc) : $($(<)_METAFILE) ; - GenerateWin32MetadataRc $(metarc) : $($(<)_METAFILE) ; - Always $(metarc) ; - Win32Resource $(<) : $(metarc) ; - RmTemps $(target) : $(metarc) ; - } - - Always $(resource) ; - } - - RAWNAME on $(target) = $(<) ; - PROJECTNAME on $(target) = $(msvcname) ; - TARGET on $(target) = $(4) ; - TYPE on $(target) = $(3) ; - FRAGMENT_ROOT on $(target) = $(fragroot) ; - DEPEND on $(target) += $(MSVC.DEPEND) $(MSVC.DEPEND.$(3)) ; - LIBRARIES on $(target) += $(MSVC.LIBRARY) $(MSVC.LIBRARY.$(3)) ; - LFLAGS on $(target) += $(MSVC.LFLAGS) $(MSVC.LFLAGS.$(3)) ; - CFLAGS on $(target) += $(MSVC.CFLAGS) $(MSVC.CFLAGS.$(3)) ; - - Depends msvcgen : $(target) ; - Depends $(target) : $(files) $(MSVCGEN_LOCATE_FRAGMENT:G=dir) ; - MsvcProjectGen $(target) : $(files) $(rcpath) ; - Always $(target) ; - - MSVCWorkspace csall : $(fragments) : $(fragroot) ; - - Clean msvcclean : $(target) ; -} - -#---------------------------------------------------------------------------- - -rule Application -{ -# _Options $(<) : $(3) ; - - local projtype ; - if $(CONSOLEAPP_$(<)) = "yes" - { - projtype = appcon ; - } - else - { - projtype = appgui ; - } - - MsvcProject $(<) : $(>) : $(projtype) : $(<:S=.exe) ; - CompileGroups $(<) : all apps ; -} - -rule Plugin -{ - local metafile ; - metafile = [ FAppendSuffix $(<) : $(SUFMETA) ] ; - SEARCH on $(metafile) = $(SEARCH_SOURCE) ; - - $(<)_METAFILE = $(metafile) ; - - MsvcProject $(<) : $(>) : plugin : $(<:S=.dll) ; - CompileGroups $(<) : all plugins ; -} - -rule Library -{ - MsvcProject $(<) : $(>) : library : $(<:S=.lib) ; - CompileGroups $(<) : all libs ; -} - -rule RegisterCompileGroups -{ - local i ; - for i in $(<) - { - RegisterCompileGroup $(i) ; - } -} - -rule RegisterCompileGroup -{ - MsvcProject $(<) : $(>) : group ; -} - -rule CompileGroups -{ - for i in $(>) - { - DEPEND on $($(i)_TARGET) += $($(<)_MSVCNAME) ; - } -} - -rule LinkWith -{ - DEPEND on $($(<)_TARGET) += lib$(>) ; -} - -rule MsvcExternalLibrary -{ - LIBRARIES on $($(<)_TARGET) += $(>) ; -} - -rule CFlags -{ - if $(>) != "" - { - CFLAGS on $($(<)_TARGET) += $(>) ; - } -} - -rule LFlags -{ - LFLAGS on $($(<)_TARGET) += $(>) ; -} - -rule ExternalLibs -{ - local i ; - - for i in $(>) - { - CFlags $(<) : $($(i).CFLAGS) ; - LFlags $(<) : $($(i).LFLAGS) ; - MsvcExternalLibrary $(<) : $($(i).MSVCLIBS) ; - } -} - -rule MSVCWorkspace -{ - local target ; - - target = [ FAppendSuffix $(<) : $(SUFWSP) ] ; - MakeLocate $(target) : $(MSVCGEN_LOCATE_TARGET) ; - - Depends msvcgen : $(target) ; - Depends $(target) : $(>[1]) ; - MsvcWorkspaceGen $(target) : $(3) ; - - RmTemps $(target) : $(>) ; -} - -rule Win32Resource -{ - Depends $(<) : $($(<)_RCNAME) ; - Depends $($(<)_RCNAME) : $(>) ; - MergeRcs $($(<)_RCNAME) : $(>) ; -} - -#---------------------------------------------------------------------------- - -actions MsvcProjectGen -{ - $(MSVCGEN) \ - --quiet \ - --project \ - $(MSVCGEN_EXTRA_OPTS) \ - --project-extension=$(SSUFPRJ) \ - --name=$(RAWNAME) \ - --template=$(TYPE) \ - --template-dir=$(MSVCGEN_TEMPLATEDIR) \ - --project-name=$(PROJECTNAME) \ - --output=$(<[1]) \ - --target=$(TARGET) \ - --fragment=$(FRAGMENT_ROOT) \ - --depend=$(DEPEND) \ - --library=$(LIBRARIES) \ - --lflags='$(LFLAGS)' \ - --cflags='$(CFLAGS)' \ - --strip-root='$(TOP)/' \ - --strip-root='$(MSVCGEN_BUILD_ROOT)/' \ - $(>) -} - -actions together MsvcWorkspaceGen -{ - $(MSVCGEN) \ - --quiet \ - --workspace \ - $(MSVCGEN_EXTRA_OPTS) \ - --workspace-extension=$(SSUFWSP) \ - --output=$(<) \ - --template-dir=$(MSVCGEN_TEMPLATEDIR) \ - $(>) -} - -actions together MergeRcs -{ - $(MERGERES) '$(<)' '$(TOP)' '../..' '$(>)' -} - -#---------------------------------------------------------------------------- - -RegisterCompileGroups all apps plugins libs ; -NotFile msvcgen ; -Always msvcgen ; -Clean clean : $(MSVCGEN_LOCATE_TARGET:G=dir) ; -Clean clean : $(MSVCGEN_LOCATE_FRAGMENT:G=dir) ; -Clean clean : $(MSVCGEN_BUILD_ROOT) ; -Clean msvcclean : $(MSVCGEN_LOCATE_TARGET:G=dir) ; -Clean msvcclean : $(MSVCGEN_LOCATE_FRAGMENT:G=dir) ; - -} diff -Nru netpanzer-0.8.2/mk/jam/objects.jam netpanzer-0.8.4.debian.1/mk/jam/objects.jam --- netpanzer-0.8.2/mk/jam/objects.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/objects.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,207 +0,0 @@ -#============================================================================ -# Rules for compiling a set of sources to object files -#============================================================================ -# These are slightly modified versions of the Object and Objects rules from -# jam. The problem with the original rules in Jambase is the handling of -# custom file types. The solution with the UserObject rule is monolithic, you -# can only have 1 such rule. Thus we construct a more flexible toolkit here -# which let's you register rules for certain filetypes. - -## RegisterFileType Rulename : extensions -## Register a rule which is used to compile a filetype into object -## files. The registered rule is called with the name of the -## sourcefile as argument and should return a list of objectfiles which are -## created. You should set the grist of the object files by using the -## DoObjectGrist function. -rule RegisterFileType -{ - local suffix ; - for suffix in $(>) - { - FILETYPE_$(suffix) = $(<) ; - } -} - -## RegisterHeaderRule rulename : regexpattern : extensions -## Registers a rule and a regular expression which will be used for header -## file scanning of the specified extensions. -rule RegisterHeaderRule -{ - local suffix ; - for suffix in $(3) - { - HDRRULE_$(suffix) = $(<) ; - HDRPATTERN_$(suffix) = $(>) ; - } -} - -## CompileObjects sources [ : options ] -## Compile a set of sourcefiles into objectfiles (extension: SUFOBJ, -## usually .o). This rule takes care of setting LOCATE and SEARCH -## variables to the $(SEARCH_SOURCE) and $(LOCATE_SOURCE) variables. -## The Application, Plugin and Library rules already use this rule -## internally. You should only use this rule if you have to avoid the -## Application, Plugin or Library rules. -rule CompileObjects -{ - local source ; - local targets ; - - # Search the source - SEARCH on $(<) = $(SEARCH_SOURCE) ; - - for source in $(<) - { - # compile the sourcefile to targetfile - targets += [ CompileObject $(source) : $(2) ] ; - } - - # locate the targets - MakeLocate $(targets) : $(LOCATE_TARGET) ; - - return $(targets) ; -} - -#---------------------------------------------------------------------------- -# private part - -# CompileObject sourcefile [ : options ] -# helper rule: Compiles a source file to an object file. Does header file -# scanning, sets LOCATE and SEARCH for source and target, grists the files -# with the current subdir and searches for the correct registered rule. -rule CompileObject -{ - # handle #includes for source: Jam scans for headers with - # the regexp pattern $(HDRSCAN) and then invokes $(HDRRULE) - # with the scanned file as the target and the found headers - # as the sources. HDRSEARCH is the value of SEARCH used for - # the found header files. - - # $(SEARCH_SOURCE:E) is where cc first looks for #include - # "foo.h" files. If the source file is in a distant directory, - # look there. Else, look in "" (the current directory). - if $(HDRRULE_$(<:S)) - { - HDRSEARCH on $(<) = $(SEARCH_SOURCE:E) $(HDRSEARCH) $(STDHDRSEARCH) ; - SEARCH_SOURCE on $(<) = $(SEARCH_SOURCE) ; - HDRRULE on $(<) = $(HDRRULE_$(<:S)) ; - HDRSCAN on $(<) = $(HDRPATTERN_$(<:S)) ; - } - - local targets ; - # Invoke filetype specific rule - if $(FILETYPE_$(<:S)) - { - targets = [ $(FILETYPE_$(<:S)) $(<) : $(2) ] ; - } - else - { - echo "Warning: no rules for filetype $(>:S) defined (at file $(>))." ; - } - - if $(targets) - { - # construct clean target - Clean clean : $(targets) ; - } - - return $(targets) ; -} - -## HeaderRule source : headers -## This rule is the default header rule used by the objects rules. You -## might register custom rules with the RegisterHeaderRule rule. -rule HeaderRule -{ - # N.B. This rule is called during binding, potentially after - # the fate of many targets has been determined, and must be - # used with caution: don't add dependencies to unrelated - # targets, and don't set variables on $(<). - - # Tell Jam that anything depending on $(<) also depends on $(>), - # set SEARCH so Jam can find the headers, but then say we don't - # care if we can't actually find the headers (they may have been - # within ifdefs), - local HDRSEARCH = [ on $(<) GetVar HDRSEARCH ] ; - local SEARCH_SOURCE = [ on $(<) GetVar SEARCH_SOURCE ] ; - - Includes $(<) : $(>) ; - SEARCH on $(>) = $(HDRSEARCH) $(SEARCH_SOURCE)/$(<:D) ; - NoCare $(>) ; - - local i ; - for i in $(>) - { - - SEARCH on $(>) = $(HDRSEARCH) $(SEARCH_SOURCE)/$(<:D) ; - if $(i:D) = "" { - SEARCH_SOURCE on $(i) = $(SEARCH_SOURCE)/$(<:D) ; - } else { - SEARCH_SOURCE on $(i) = $(SEARCH_SOURCE) ; - } - HDRSEARCH on $(>) = $(HDRSEARCH) ; - HDRRULE on $(>) = [ on $(<) GetVar HDRRULE ] ; - HDRSCAN on $(>) = [ on $(<) GetVar HDRPATTERN ] ; - } -} - -if $(JAMVERSION) < 2.5 -{ -## XXX XXX XXX a bug in jam 2.4 let's the version above fail. I'll let this -## non-optimal version in here until jam 2.5 is out. - -rule HeaderRule -{ - local s = $(>:G=$(HDRGRIST)) ; - - Includes $(<) : $(s) ; - SEARCH on $(s) = $(HDRSEARCH) ; - NoCare $(s) ; - - local i ; - for i in $(s) - { - if $(HDRRULE_$(i:S)) - { - HDRGRIST on $(s) = $(HDRGRIST) ; - HDRSEARCH on $(s) = $(HDRSEARCH) ; - HDRRULE on $(s) = $(HDRRULE_$(i:S)) ; - HDRSCAN on $(s) = $(HDRPATTERN_$(i:S)) ; - } - else if $(JAM_DEBUG) - { - #echo "No Header rule for $(i:S) file $(i) " ; - } - } -} - -} # end of if $(JAMVERSION) < 1.5 - -# Dummy rule: .o files are used as is. -rule UseObjectFile -{ - return $(<) ; -} -RegisterFileType UseObjectFile : .o ; - -# Ignore header files. -rule UseHeaderFile -{ - return ; -} -RegisterFileType UseHeaderFile : .h .hpp ; -RegisterHeaderRule HeaderRule : $(HDRPATTERN) : .h .hpp .inc ; - -# Generates a grist suitable for output objects based on -# SUBVARIANT and SUBDIR variable. -rule DoObjectGrist -{ - return $(<:G=$(SOURCE_GRIST:E)!$(SUBVARIANT)) ; -} - -# Generates a grist suitable for source files based on SUBDIR variable. -rule DoSourceGrist -{ - return $(<:G=$(SOURCE_GRIST:E)) ; -} - diff -Nru netpanzer-0.8.2/mk/jam/options.jam netpanzer-0.8.4.debian.1/mk/jam/options.jam --- netpanzer-0.8.2/mk/jam/options.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/options.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -#============================================================================ -# Rule for setting options at targets -#============================================================================ - -#---------------------------------------------------------------------------- -# private rule - please specify the options in Application, Plugin or Library -# rule and don't use this rule here directly. - -## CheckOptions candidates : Options : target -rule CheckOptions -{ - local i ; - for i in $(>) - { - if ! [ IsElem $(i) : $(<) ] - { - echo "WARNING: Unknown option $(i) specified at $(3)." ; - } - } -} - diff -Nru netpanzer-0.8.2/mk/jam/package.jam netpanzer-0.8.4.debian.1/mk/jam/package.jam --- netpanzer-0.8.2/mk/jam/package.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/package.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -#============================================================================ -# Rules for creating distribution packages -#============================================================================ - -PACKAGE_FILES = ; -PACKAGE_FILE = $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2 ; -PACKAGE_DIR = $(PACKAGE_NAME)-$(PACKAGE_VERSION) ; -LOCATE_DISTTEMP ?= $(top_builddir)/build/dist ; - -## Package files -## Add files to distribution package -rule Package -{ - for i in $(<) { - local target = $(i:R=$(LOCATE_DISTTEMP)/$(PACKAGE_DIR)/$(SUBDIR)) ; - local dir = $(i:DR=$(LOCATE_DISTTEMP)/$(PACKAGE_DIR)/$(SUBDIR)) ; - local source = $(i:G=$(SOURCE_GRIST:E)_PACKAGE) ; - MkDir $(dir) ; - Copy $(target) : $(source) ; - LOCATE on $(source) = $(SUBDIR) ; - Depends $(target) : $(dir) ; - Depends $(target) : $(source) ; - Depends $(PACKAGE_FILE) : $(target) ; - } -} - -actions TarBz2 -{ - tar -c --bzip2 -C $(LOCATE_DISTTEMP) -f $(<) $(PACKAGE_DIR) -} - -TarBz2 $(PACKAGE_FILE) ; -Depends dist : $(PACKAGE_FILE) ; diff -Nru netpanzer-0.8.2/mk/jam/resource.jam netpanzer-0.8.4.debian.1/mk/jam/resource.jam --- netpanzer-0.8.2/mk/jam/resource.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/resource.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -#============================================================================ -# Stub Rules for handling additional resources (the OS specific Jamfiles will -# override these. -#============================================================================ - -## Win32Resource -## Specify .rc files for targets. The .rc files should already have SEARCH -## set correctly. -rule Win32Resource { } - -## ApplicationIconOSX basename : icon [ : pathcomponents ] -## Specify the icon for the application given by basename. If -## pathcomponents is omitted, SEARCH_SOURCE is used. If this rule is not -## invoked, then the icon specified via ApplicationIconDefaultOSX is used. -## If ApplicationIconDefaultOSX was never invoked, then no icon is used. -rule ApplicationIconOSX { } - -## ApplicationIconDefaultOSX icon [ : pathcomponents ] -## Specify the default icon for GUI applications. This setting can be -## overriden for a individual application with the ApplicationIconOSX rule. -rule ApplicationIconDefaultOSX { } - diff -Nru netpanzer-0.8.2/mk/jam/subdir.jam netpanzer-0.8.4.debian.1/mk/jam/subdir.jam --- netpanzer-0.8.2/mk/jam/subdir.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/subdir.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -#============================================================================ -# Work around problems the SubDir rule of Jambase -# (until jampeople accept my patches :-/ ) -#============================================================================ - -LOCATE_OBJECTS ?= $(top_builddir)/build/$(target) ; -LOCATE_TARGETS ?= $(top_builddir) ; -LOCATE_DOCS ?= $(top_builddir)/build ; - -SUBDIRRULES += FixSubDirPath ; - -MKDIR ?= mkdir ; -MKDIRS ?= "$(MKDIR) -p" ; - -rule FixSubDirPath -{ - LOCATE_SOURCE = [ ConcatDirs $(LOCATE_OBJECTS) $(SUBDIR_TOKENS) ] ; - LOCATE_TARGET = [ ConcatDirs $(LOCATE_OBJECTS) $(SUBDIR_TOKENS) ] ; - - # We need to package the Jamfile (a bit hacky here...) - Package Jamfile ; -} - -# fix bug in Jambase where SubInclude in the middle of a jam file made it break -rule SubInclude -{ - if ! $($(<[1])) - { - Exit SubInclude $(<[1]) without prior SubDir $(<[1]) ; - } - - local save_SUBDIR_TOKENS = $(SUBDIR_TOKENS) ; - - SubDir $(<) ; - - include $(JAMFILE:D=$(SUBDIR)) ; - - SubDir $(<[1]) $(save_SUBDIR_TOKENS) ; -} - -# this MakeLocate rule differs from the Jambase one in that it also works with -# files being in subdirectories -rule MakeLocate -{ - # MakeLocate targets : directory ; - - # Sets special variable LOCATE on targets, and arranges - # with MkDir to create target directory. - - # Note we grist the directory name with 'dir', - # so that directory path components and other - # targets don't conflict. - - if $(>) && $(>) != "" && $(>) != "." - { - local i ; - for i in $(<) { - LOCATE on $(i) = $(>) ; - - local targetfile = $(i:R=$(>)) ; - Depends $(i) : $(targetfile:DG=dir) ; - MkDir $(targetfile:DG=dir) ; - } - } -} - -# The default MkDir rule in Jambase has problems when paths contains a sequence -# of multiple slashes (ie. bla////fup). We solve these problems and greatly -# simply this rule by using the "mkdir -p" or mkdirs command. -rule MkDir -{ - # MkDir directory ; - - # Make a directory and all its parent directories. - - # Ignore timestamps on directories: we only care if they - # exist. - - NoUpdate $(<) ; - - # don't create the dir multiple times - if ! $($(<)-mkdir) - { - $(<)-mkdir = true ; - MkDir1 $(<) ; - } -} - -actions MkDir1 -{ - $(MKDIRS) "$(<)" -} - diff -Nru netpanzer-0.8.2/mk/jam/unix.jam netpanzer-0.8.4.debian.1/mk/jam/unix.jam --- netpanzer-0.8.2/mk/jam/unix.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/unix.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -#============================================================================ -# Jam configuration and actions for Linux/Unix -#============================================================================ -SHELL ?= "/bin/sh" ; - -#---------------------------------------------------------------------------- -# platform specific rules - -## ConstructApplicationTarget target : options -## Constructs the application atrget name (ie. foo.exe for foo) -rule ConstructApplicationTarget -{ - return $(<) ; -} -rule ConstructLibraryTarget -{ - if [ IsElem shared : $(2) ] { - return lib$(<).la ; - } else { - return lib$(<).a ; - } -} -rule ConstructPluginTarget -{ - return $(<).so ; -} - -# SystemLinkApplication target : objects : options -# do system specific actions needed for linking the application and construct -# correct clean targets. -rule SystemLinkApplication -{ - local target = $($(<)_TARGET) ; - - Depends $(target) : $(>) ; - LinkApplication $(target) : $(>) ; - # setup clean rules - Clean clean : $(target) ; - Clean $(<)clean : $(target) ; -} - -actions LinkApplication bind NEEDLIBS bind EXTRAOBJECTS -{ - $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LFLAGS) -} - - diff -Nru netpanzer-0.8.2/mk/jam/variant.jam netpanzer-0.8.4.debian.1/mk/jam/variant.jam --- netpanzer-0.8.2/mk/jam/variant.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/variant.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -#============================================================================ -# Setup of compiler/linker flags for debug/optimize mode -#============================================================================ - -VARIANT ?= optimize ; -if $(VARIANT) != "debug" && $(VARIANT) != "optimize" && $(VARIANT) != "profile" -{ - exit "Invalid modus set, please set VARIANT to debug, profile or optimize" ; -} - -switch $(VARIANT) -{ -case optimize : - SHORTVARIANT = opt ; -case debug : - SHORTVARIANT = dbg ; -case profile : - SHORTVARIANT = prof ; -} - -# Set modus related flags -CCFLAGS += $(COMPILER_CFLAGS) $(COMPILER_CFLAGS_$(VARIANT)) ; -C++FLAGS += $(COMPILER_CFLAGS) $(COMPILER_C++FLAGS) - $(COMPILER_CFLAGS_$(VARIANT)) $(COMPILER_C++FLAGS_$(VARIANT)) ; -LFLAGS += $(LDFLAGS) $(COMPILER_LFLAGS) $(COMPILER_LFLAGS_$(VARIANT)) ; -LOCATE_OBJECTS = $(LOCATE_OBJECTS)/$(SHORTVARIANT) ; - -## SubVariant variantname -## Specify subvarianet which are placed in separate compilation directories. -SUBVARIANT ?= "" ; -rule SubVariant -{ - SUBVARIANT = $(<) ; - if ! $(<) - { - SUBVARIANT = "" ; - if $(SAVED_LOCATE_TARGET) - { - LOCATE_TARGET = $(SAVED_LOCATE_TARGET) ; - } - SAVED_LOCATE_TARGET = ; - } - else - { - if ! $(SAVED_LOCATE_TARGET) - { - SAVED_LOCATE_TARGET = $(LOCATE_TARGET) ; - } - LOCATE_TARGET = $(LOCATE_TARGET)/$(SUBVARIANT) ; - } -} - diff -Nru netpanzer-0.8.2/mk/jam/win32.jam netpanzer-0.8.4.debian.1/mk/jam/win32.jam --- netpanzer-0.8.2/mk/jam/win32.jam 2007-05-26 06:56:55.000000000 +0000 +++ netpanzer-0.8.4.debian.1/mk/jam/win32.jam 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -#============================================================================ -# Jam configuration and actions for Win32 -#============================================================================ -SHELL ?= "/bin/sh" ; - -#---------------------------------------------------------------------------- -# resource handling -# Unfortunately we can't simply specify resources on the source list, because -# Mingw/Cygwin have the limitation that they can only link 1 resource file -# in. So we have to concatenate all resourcefiles here before compiling them. - -actions together CompileResources -{ - cat $(>) | $(WINDRES) $(WINDRES_FLAGS) --include-dir=$(>:D) -o $(<) -} - -rule CompileResources -{ - Depends $(<) : $(>) ; -} - -rule Win32Resource -{ - local target = $($(<)_TARGET) ; - local rcobject = [ DoObjectGrist _resource.o ] ; - LOCATE on $(rcobject) = $(LOCATE_TARGET) ; - SEARCH on $(rcobject) = $(LOCATE_TARGET) ; - - # only add 1 resource object per target - if ! $($(<)_HASWIN32RESOURCE) - { - $(<)_HASWIN32RESOURCE = yes ; - ExtraObjects $(<) : $(rcobject) ; - } - - CompileResources $(rcobject) : $(>) ; -} - -#---------------------------------------------------------------------------- -# linking part - -## ConstructApplicationTarget target : options -## Constructs the application atrget name (ie. foo.exe for foo) -rule ConstructApplicationTarget -{ - return $(<).exe ; -} -rule ConstructLibraryTarget -{ - return lib$(<).a ; -} -rule ConstructPluginTarget -{ - return $(<).dll ; -} - -# SystemLinkApplication target : objects : options -rule SystemLinkApplication -{ - local target = $($(<)_TARGET) ; - - Depends $(target) : $(>) ; - LinkApplication $(target) : $(>) ; - # setup clean rules - Clean clean : $(target) ; - Clean $(<)clean : $(target) ; -} - -actions LinkApplication bind NEEDLIBS bind EXTRAOBJECTS -{ - $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LFLAGS) -} - Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/button1.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/button1.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/button2.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/button2.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/button.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/button.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/page.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/page.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inGameClose Options.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inGameClose Options.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inGameControls.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inGameControls.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inGameExit netPanzer.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inGameExit netPanzer.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inGameInterface.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inGameInterface.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inGameNO.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inGameNO.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inGameResign.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inGameResign.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inGameSound.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inGameSound.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inGameVisuals.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inGameVisuals.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inGameYES.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inGameYES.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusBack.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusBack.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusControls.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusControls.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusDirect Connect.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusDirect Connect.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusExit netPanzer.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusExit netPanzer.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusHelp.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusHelp.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusHost.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusHost.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusInterface.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusInterface.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusJoin.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusJoin.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusMain.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusMain.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusModem.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusModem.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusMultiplayer.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusMultiplayer.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusNext.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusNext.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusNO.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusNO.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusOptions.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusOptions.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusReady.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusReady.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusSound.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusSound.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusTCPIP.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusTCPIP.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusVisuals.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusVisuals.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/buttons/default/pak/inMenusYES.pak and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/buttons/default/pak/inMenusYES.pak differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/menu/connectionMB.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/menu/connectionMB.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/menu/defaultMB.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/menu/defaultMB.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/menu/hostjoinMB.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/menu/hostjoinMB.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/menu/loadingMB.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/menu/loadingMB.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/menu/optionsMB.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/menu/optionsMB.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/backgrounds/menus/menu/sessionMB.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/backgrounds/menus/menu/sessionMB.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/chars5x5.raw and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/chars5x5.raw differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/chars8x8.raw and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/chars8x8.raw differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/cursors/grey-target.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/cursors/grey-target.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/default/ally.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/default/ally.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/default/allyOther.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/default/allyOther.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/default/allyRequest.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/default/allyRequest.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/default/lock.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/default/lock.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/default/noAlly.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/default/noAlly.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/default/playerColor.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/default/playerColor.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/albania.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/albania.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/algeria.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/algeria.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/angola.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/angola.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/argentinia.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/argentinia.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/armenia.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/armenia.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/australia.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/australia.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/austria.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/austria.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/bahrain.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/bahrain.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/belgium.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/belgium.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/benin.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/benin.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/bolivia.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/bolivia.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/bosnia-herzigovina.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/bosnia-herzigovina.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/bot.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/bot.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/botswana.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/botswana.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/brazil.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/brazil.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/bulgaria.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/bulgaria.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/cameroon.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/cameroon.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/canada.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/canada.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/chile.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/chile.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/china.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/china.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/colombia.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/colombia.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/croatia.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/croatia.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/czech-republic.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/czech-republic.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/denmark.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/denmark.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/dominican-republic.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/dominican-republic.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/england.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/england.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/estonia.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/estonia.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/european-union.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/european-union.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/finland.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/finland.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/france.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/france.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/georgia.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/georgia.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/germany.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/germany.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/greece.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/greece.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/guatemala.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/guatemala.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/hungary.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/hungary.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/image1.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/image1.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/iran.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/iran.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/ireland.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/ireland.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/israel.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/israel.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/italy.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/italy.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/jamaica.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/jamaica.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/japan.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/japan.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/jap.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/jap.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/jordan.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/jordan.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/korea-north.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/korea-north.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/korea-south.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/korea-south.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/latvia.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/latvia.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/libya.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/libya.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/lithuania.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/lithuania.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/luxembourg.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/luxembourg.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/mauritania.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/mauritania.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/mexico.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/mexico.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/morocco.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/morocco.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/netherlands.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/netherlands.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/new-zealand.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/new-zealand.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/nigeria.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/nigeria.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/norway.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/norway.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/olympic.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/olympic.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/panamá.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/panamá.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/paraguay.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/paraguay.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/peru.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/peru.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/pirate.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/pirate.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/poland.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/poland.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/portugal.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/portugal.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/romania.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/romania.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/russia.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/russia.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/saudi-arabia.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/saudi-arabia.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/seychelles.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/seychelles.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/slovakia.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/slovakia.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/spain.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/spain.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/sweden.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/sweden.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/switzerland.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/switzerland.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/taiwan.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/taiwan.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/tanzania.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/tanzania.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/thailand.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/thailand.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/tunisia.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/tunisia.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/turkey.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/turkey.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/ukraine.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/ukraine.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/united-kingdom.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/united-kingdom.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/united-nations.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/united-nations.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/uruguay.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/uruguay.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/usa.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/usa.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/venezuela.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/venezuela.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/flags/zaire.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/flags/zaire.bmp differ Binary files /tmp/YbcWhJQRaU/netpanzer-0.8.2/pics/grass.bmp and /tmp/AJSeNSVWvt/netpanzer-0.8.4.debian.1/pics/grass.bmp differ diff -Nru netpanzer-0.8.2/pics/Jamfile netpanzer-0.8.4.debian.1/pics/Jamfile --- netpanzer-0.8.2/pics/Jamfile 2007-05-26 06:41:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/pics/Jamfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -SubDir TOP pics ; - -PATHS = - particles/puff/dirt/pak - particles/puff/smokeDark/pak - particles/puff/smokeLight/pak - particles/clouds/pak - particles/craters/pak - particles/explosion/explosion0/pak - particles/explosion/explosion1/pak - particles/lights/pak - particles/missles/pak - particles/chunks/pak - particles/shells/pak - flags - cursors - menus/vehicleSelectionView - backgrounds/menus/buttons/default/pak - backgrounds/menus/menu/pak - backgrounds/menus/menu - . -; - -for p in $(PATHS) { - InstallData [ Wildcard $(p) : *.bmp *.pak *.raw ] : pics $(p) ; -} - diff -Nru netpanzer-0.8.2/powerups/Jamfile netpanzer-0.8.4.debian.1/powerups/Jamfile --- netpanzer-0.8.2/powerups/Jamfile 2007-05-26 06:35:51.000000000 +0000 +++ netpanzer-0.8.4.debian.1/powerups/Jamfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -SubDir TOP powerups ; - -InstallData [ Wildcard *.pak ] : powerups ; diff -Nru netpanzer-0.8.2/README netpanzer-0.8.4.debian.1/README --- netpanzer-0.8.2/README 2007-05-26 06:57:02.000000000 +0000 +++ netpanzer-0.8.4.debian.1/README 2011-12-24 02:24:39.000000000 +0000 @@ -35,11 +35,10 @@ The game depends on some tools and libraries to be present, before you can start building it. Here's a list of them: -* normal gnu compiler and additional tools (g++ version 3.2 or later is - required at the moment) +* normal gnu compiler and additional tools -* perforce jam 2.5 or later (used as build tool) - ftp://ftp.perforce.com/pub/jam +* SCons build tool + http://www.scons.org/ * SDL 1.2.5 or later http://www.libsdl.org @@ -47,44 +46,121 @@ * SDL_mixer 1.2.4 or later http://www.libsdl.org/projects/SDL_mixer/ -* SDL_image 1.2.3 or later - http://www.libsdl.org/projects/SDL_image/ - -* PhysicsFS 0.1.9 or later - http://www.icculus.org/physfs/ +* subversion (needed to download the source code) + http://subversion.tigris.org/ Thanks to all the authors of these helpful libraries that made our development easy and straightforward. -2.2 Building +To download the code use the subversion client to download from + svn://svn.berlios.de/netpanzer/tags/netpanzer/ + +An explample for version 0.8.4 would be: + svn export svn://svn.berlios.de/netpanzer/tags/netpanzer/0.8.4 netpanzer + +Note that I use "export" instead of "checkout" to avoid having all the ".svn" +folders spread over the source. This is interesting for Linux distributions. + +2.2 Building without installing on non Windows + +To build the game and run as normal user do the following: + +# scons + +When scons finish without errors the game is ready to play, type this: + +# ./netpanzer + +Remember that next time you want to play you have to go to the same folder where +you compiled and type './netpanzer' + +2.3 Building on Windows + +Building on windows is a little bit more complicated, developers shouldn't have +any big problem. + +MinGW should be installed in C:\mingw + +Get the development libraries of SDL for mingw32, copy the include directory to +C:\mingw\include\SDL so you have the file "C:\mingw\include\SDL\SDL.h", and the +lib folder to C:\mingw\lib + +Get SDL_mixer development libraries for VC8, copy the header file to +C:\mingw\include\SDL and the .lib file to c:\mingw\lib + +Python and scons should be installed and working. + +To compile netpanzer run scons on the folder where you have the netpanzer source +code: -To build and install the game use the following commands: +C:\Some\Folder\With\Netpanzer> scons -./configure -jam - (You probably need to be root for the installation, so using "su" is a good - idea here) -jam install +After scons finish without errors you have to copy all the .DLL files from SDL +and from SDL_mixer to the netpanzer folder. -The configure script also lets you set some more options like the installation -directory (--prefix argument). You'll get a full list of these if you invoke -"configure --help". The game should be installed now. +To run you can type 'netpanzer' or click on the netpanzer.exe file in explorer. -2.3 Music +2.4 Building for distribution on non Windows operating systems + +If you plan to distribute NetPanzer for installation (on Linux systems, for example) +there are some extra steps to be taken care. + +NetPanzer needs to know where the data files will be stored when the game runs. To +set this data you have to add the parameter "datadir=/some/dir/" at compile time +and NetPanzer will look there for its data files. Example: + +# scons datadir=/usr/local/games/netpanzer + +Using the sample line, after NetPanzer is built, it will look in /usr/local/games/netpanzer +for it's data files. + +For versioning, there is a file called "RELEASE_VERSION", the first line on that file will +be the version that NetPanzer will show. You can use that file to change the version of +the game shown. You should modify the file before compilation. + +Actually there is no install script, you will have to prepare the script by yourself. +The installation is actually easy, and you only have to copy several files. The following +directories should be copied on the "datadir" destination: +- cache/ +- fonts/ +- maps/ +- pics/ +- powerups/ +- scripts/ +- sound/ +- units/ +- wads/ + +If you want to copy some documentation, the "doc" folder has it. There is also the BUGS, +COPYING, ChangeLog, README (this file), RELNOTES and TODO. + +"netpanzer.desktop" is a sample file for using on desktop systems. + +"netpanzer.png" and "netpanzer.xpm" are some sample icons to be use with the game. + +And of course, the file "netpanzer" is the main binary that should be on the PATH. + +2.5 Music Netpanzer doesn't come with own musicfiles yet. However you can place your favourite .mp3, .ogg or .mod files into the sound/music directory and netpanzer will play these in random order while you play. -2.4 Starting the game +2.6 Starting the game + +You can start the game in several ways: -You can start the game by typing +If you compiled yourself NetPanzer (and didn't install), first "cd" to the folder where +you compiled it and type: +# ./netpanzer -netpanzer +If NetPanzer was installed and is in the PATH, type +# netpanzer -Note that on first startup the game needs some time to precalculate some data. -This might take up to 5 minutes. So just wait a bit when you have a black -screen. +It is possible that in your distribution NetPanzer was installed and has a menu item, +if that is the case, just click on the item. + +On Windows, you can click on the "netpanzer.exe" file. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -97,6 +173,8 @@ 4. Dedicated Server and Configuration Files +Note: This has to be reviewed, so much is unwritten. + You can start a dedicated netpanzer server (a pure server, without any video output). By starting netpanzer with the -d commandline option. @@ -169,28 +247,16 @@ 5. Bot Players -Netpanzer provides a bot player for these times when you don't have a human -opponent. You can start netpanzer in a special mode where it connects to a -server and simulates a real player. You can start netpanzer like this to connect -as bot to a server: - -netpanzer -b servername - -Example: -This example shows how you can play locally against 2 bots: - -netpanzer -d & -netpanzer -b localhost & -netpanzer -b localhost & -netpanzer -c localhost +*This has to be revised* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 6. Contact -Bugs should be reported to the bug trackker on Berlios: - http://developer.berlios.de/bugs/?group_id=1250 -You can contact us at the netpanzer-devel mailinglist at Berlios: - https://lists.berlios.de/mailman/listinfo/netpanzer-devel -or you might be able to catch us in irc at irc.freenode.net #netpanzer. +Bugs can be reported to the netPanzer forum: + http://www.netpanzer.org/forum + +or you *might* be able to catch someone in irc at irc.freenode.net #netpanzer. +... But most likely you will find some important players in the servers and +they will get in contact with us ... diff -Nru netpanzer-0.8.2/readme.html netpanzer-0.8.4.debian.1/readme.html --- netpanzer-0.8.2/readme.html 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/readme.html 2011-09-15 11:43:06.000000000 +0000 @@ -0,0 +1,365 @@ + + + + NetPanzer Readme + + + +
+
+
+
+

NetPanzer Readme

+ Visit the site at http://www.netpanzer.org +
+
+

Copyright © 2011, NetPanzer Team

+
+
+
+
+
+

Table of Contents

+
+
Introduction
+
Building and Installation
+
+
+
Prerequesites
+
Building without installing on non Windows
+
Building on Windows
+
Building for distribution on non Windows operating systems
+
Starting the game
+
+
+
Gameplay
+
Dedicated Server and Configuration Files
+
Bot Players
+
Contact
+
+
+
+
+
+
+
+

Introduction

+
+
+
+

+ netPanzer is an online multiplayer tactical warfare game designed for FAST + ACTION combat. Gameplay concentrates on the core -- no resource management is + needed. The game is based on quick tactical action and unit management in + real-time. Battles progress quickly and constantly as destroyed players respawn + with a set of new units. Players can join or leave multiplayer games at any + time. +

A bit of history

+ The original development of netpanzer was done from PyroSoft inc. Though in + 1999 they stop development and released the game 2002 in GPL and it was nearly + forgotten, until Ingo announce it at happypenguin.org. Soon after this + announcement a group of coders did the linux port in roughly 2 weeks, with + another 2 weeks polishing for this release. Now we'll go along and improve the + game... +

+
+
+
+
+
+
+

Building and Installation

+
+
+
+
+
+
+
+

Prerequesites

+
+
+
+

+ The game depends on some tools and libraries to be present, before you can start + building it. Here's a list of them:
+

    +
  • normal gnu compiler and additional tools (g++ version 3.2 or later is required at the moment)
    • +
  • SCons build tool http://www.scons.org/
    • +
  • SDL 1.2.5 or later http://www.libsdl.org
    • +
  • SDL_mixer 1.2.4 or later http://www.libsdl.org/projects/SDL_mixer/
    • +
  • subversion (needed to download the source code) http://subversion.tigris.org/
    • +
+ Thanks to all the authors of these helpful libraries that made our development + easy and straightforward.

+ To download the code use the subversion client to download from + svn://svn.berlios.de/netpanzer/tags/netpanzer/
+ + An explample for version 0.8.3 would be:
+ 
svn export svn://svn.berlios.de/netpanzer/tags/netpanzer/0.8.3 netpanzer
+ + Note that I use "export" instead of "checkout" to avoid having all the ".svn" + folders spread over the source. This is interesting for Linux distributions. +

+
+
+
+
+
+

Building without installing on non Windows

+
+
+
+

+ To build the game and run as normal user do the following: + 

scons
+ When scons finish without errors the game is ready to play, type this: + 
./netpanzer
+ Remember that next time you want to play you have to go to the same folder where + you compiled and type './netpanzer' +

+
+
+
+
+
+

Building on Windows

+
+
+
+

+ Building on windows is a little bit more complicated, developers shouldn't have + any big problem.
+ MinGW should be installed in C:\mingw
+ Get the development libraries of SDL for mingw32, copy the include directory to + C:\mingw\include\SDL so you have the file "C:\mingw\include\SDL\SDL.h", and the + lib folder to C:\mingw\lib
+ Get SDL_mixer development libraries for VC8, copy the header file to + C:\mingw\include\SDL and the .lib file to c:\mingw\lib
+ Python and scons should be installed and working.
+ To compile netpanzer run scons on the folder where you have the netpanzer source + code: + 

C:\Some\Folder\With\Netpanzer> scons
+ After scons finish without errors you have to copy all the .DLL files from SDL + and from SDL_mixer to the netpanzer folder.
+ To run you can type 'netpanzer' or click on the netpanzer.exe file in explorer. +

+
+
+
+
+
+

Building for distribution on non Windows operating systems

+
+
+
+

+ If you plan to distribute NetPanzer for installation (on Linux systems, for example) + there are some extra steps to be taken care.

+ + NetPanzer needs to know where the data files will be stored when the game runs. To + set this data you have to add the parameter "datadir=/some/dir/" at compile time + and NetPanzer will look there for its data files. Example: + + 

scons datadir=/usr/local/games/netpanzer
+ + Using the sample line, after NetPanzer is built, it will look in /usr/local/games/netpanzer + for it's data files.

+ + For versioning, there is a file called "RELEASE_VERSION", the first line on that file will + be the version that NetPanzer will show. You can use that file to change the version of + the game shown. You should modify the file before compilation.

+ + Actually there is no install script, you will have to prepare the script by yourself. + The installation is actually easy, and you only have to copy several files. The following + directories should be copied on the "datadir" destination: + 
+- cache/
+- fonts/
+- maps/
+- pics/
+- powerups/
+- scripts/
+- sound/
+- units/
+- wads/
+
+ If you want to copy some documentation, the "doc" folder has it. There is also the BUGS, + COPYING, ChangeLog, README (this file), RELNOTES and TODO.

+ + "netpanzer.desktop" is a sample file for using on desktop systems.

+ + "netpanzer.png" and "netpanzer.xpm" are some sample icons to be use with the game.

+ + And of course, the file "netpanzer" is the main binary that should be on the PATH.
+

+
+
+
+
+
+

Starting the game

+
+
+
+

+ You can start the game in several ways:

+ + If you compiled yourself NetPanzer (and didn't install), first "cd" to the folder where + you compiled it and type: + 

./netpanzer
+ + If NetPanzer was installed and is in the PATH, type + 
netpanzer
+ + It is possible that in your distribution NetPanzer was installed and has a menu item, + if that is the case, just click on the item.

+ + On Windows, you can click on the "netpanzer.exe" file. +

+
+
+
+
+
+
+

Gameplay

+

This section needs to be written... Press F1 in the game for a quick overview of + keys and in general trust your intuition :)

+
+
+
+
+
+
+
+
+
+

Dedicated Server and Configuration Files

+
+
+
+

+ You can start a dedicated netpanzer server (a pure server, without any video + output). By starting netpanzer with the -d commandline option.

+ + The server reads the configuration from + 

$HOME/.netpanzer/config/netpanzer-dedicated.ini
+ The format is basically the same as the normal configuration file of + netpanzer. Here's a short introduction into the option specific to a server in + the server section of the file:

+ +
    +
  • serverport [number], default 3030
    • +
      +
    • Specifies the port which the server will be using.(The server is doing both, + TCP and UDP connections on this port)
      • +

    +
  • bindaddress [string], default ""
    • +
      +
    • Allows you to bind the server to a specific IP address (usefull if you have + multiple IP addresses on 1 box)
      • +

    +
  • logging [yes,no], default no
    • +
      +
    • When enabled the server creates detailed logs about the matches in the + $HOME/logs directory. This can be usefull for creating statistics about the matches.
      • +

    +
  • public [yes,no], default yes
    • +
      +
    • Register at the internet masterservers so that the server will appear in the + serverlist of other players.
      • +

    +
  • maxplayers [number], default 8
    • +
      +
    • Number of players and bots that are able to play simultaneously on the server.
      • +

    +
  • mapcycle [name], default "Cramped, Tight Quarters, Two Villages"
    • +
      +
    • A comma separated list of maps that this server will use.
      • +

    +
  • maxunits [number], default 500
    • +
      +
    • Number of maximum available units for all players. (Each + player will be able to have maxplayers/maxunits units at once)
      • +

    +
  • gametype [0,1,2], default 0
    • +
      +
    • Type of game: (0=Objectives, 1=FragLimit, 2=TimeLimit)
      • +

    +
  • timelimit [number], default 50
    • +
      +
    • timelimit of the map in minutes (used when gametype = 2)
      • +

    +
  • fraglimit [number], default 500
    • +
      +
    • fraglimit of the map (used when gametype=1)
      • +

    +
  • objectivepercentage [number], default 50
    • +
      +
    • Percentage of outposts that has to be captured to win the game.(used when gametype=0)
      • +

    +
  • mapcycling [yes,no], default no
    • +
      +
    • cycle to next map after a map ended.
      • +

    +
  • powerups [yes,no], default yes
    • +
      +
    • enable/disable powerups
      • +

    +
  • allowallies [yes,no], default yes
    • +
      +
    • allow/disallow players to allie
      • +

    +
  • cloudcoverage [number], default 65
    • +
      +
    • Number of clouds flying over the map.
      • +

    +
  • windspeed [number], default 30
    • +
      +
    • windspeed that affects particles and clouds
      • +

    +
  • respawntype [0,1], default 1
    • +
      +
    • Spawn mode: 0=Round Robin, 1=Random
      • +

    +
  • autokicktime [number], default 10
    • +
      +
    • Time before the server rejects the inactive players (in minutes)
      • +

    +
+

+
+
+
+
+
+
+

Bot Players

+

Bot players can be spawn only on the dedicated server. To do that enter the + server console and type: + 

 > addbot
+ + A new bot will appear on the game. Type help on the server console for more + info and commands. +

+
+
+
+
+
+
+
+
+
+

Contact

+

Bugs should be reported to the netPanzer forum: + http://www.netpanzer.org/forum
+

+
+
+
+
+
+ + diff -Nru netpanzer-0.8.2/README-zlib123.txt netpanzer-0.8.4.debian.1/README-zlib123.txt --- netpanzer-0.8.2/README-zlib123.txt 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/README-zlib123.txt 2009-06-27 10:30:03.000000000 +0000 @@ -0,0 +1,125 @@ +ZLIB DATA COMPRESSION LIBRARY + +zlib 1.2.3 is a general purpose data compression library. All the code is +thread safe. The data format used by the zlib library is described by RFCs +(Request for Comments) 1950 to 1952 in the files +http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) +and rfc1952.txt (gzip format). These documents are also available in other +formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html + +All functions of the compression library are documented in the file zlib.h +(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example +of the library is given in the file example.c which also tests that the library +is working correctly. Another example is given in the file minigzip.c. The +compression library itself is composed of all source files except example.c and +minigzip.c. + +To compile all files and run the test program, follow the instructions given at +the top of Makefile. In short "make test; make install" should work for most +machines. For Unix: "./configure; make test; make install". For MSDOS, use one +of the special makefiles such as Makefile.msc. For VMS, use make_vms.com. + +Questions about zlib should be sent to , or to Gilles Vollant + for the Windows DLL version. The zlib home page is +http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem, +please check this site to verify that you have the latest version of zlib; +otherwise get the latest version and check whether the problem still exists or +not. + +PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking +for help. + +Mark Nelson wrote an article about zlib for the Jan. 1997 +issue of Dr. Dobb's Journal; a copy of the article is available in +http://dogma.net/markn/articles/zlibtool/zlibtool.htm + +The changes made in version 1.2.3 are documented in the file ChangeLog. + +Unsupported third party contributions are provided in directory "contrib". + +A Java implementation of zlib is available in the Java Development Kit +http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html +See the zlib home page http://www.zlib.org for details. + +A Perl interface to zlib written by Paul Marquess is in the +CPAN (Comprehensive Perl Archive Network) sites +http://www.cpan.org/modules/by-module/Compress/ + +A Python interface to zlib written by A.M. Kuchling is +available in Python 1.5 and later versions, see +http://www.python.org/doc/lib/module-zlib.html + +A zlib binding for TCL written by Andreas Kupries is +availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html + +An experimental package to read and write files in .zip format, written on top +of zlib by Gilles Vollant , is available in the +contrib/minizip directory of zlib. + + +Notes for some targets: + +- For Windows DLL versions, please see win32/DLL_FAQ.txt + +- For 64-bit Irix, deflate.c must be compiled without any optimization. With + -O, one libpng test fails. The test works in 32 bit mode (with the -n32 + compiler flag). The compiler bug has been reported to SGI. + +- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works + when compiled with cc. + +- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is + necessary to get gzprintf working correctly. This is done by configure. + +- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with + other compilers. Use "make test" to check your compiler. + +- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers. + +- For PalmOs, see http://palmzlib.sourceforge.net/ + +- When building a shared, i.e. dynamic library on Mac OS X, the library must be + installed before testing (do "make install" before "make test"), since the + library location is specified in the library. + + +Acknowledgments: + + The deflate format used by zlib was defined by Phil Katz. The deflate + and zlib specifications were written by L. Peter Deutsch. Thanks to all the + people who reported problems and suggested various improvements in zlib; + they are too numerous to cite here. + +Copyright notice: + + (C) 1995-2004 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + +If you use the zlib library in a product, we would appreciate *not* +receiving lengthy legal documents to sign. The sources are provided +for free but without warranty of any kind. The library has been +entirely written by Jean-loup Gailly and Mark Adler; it does not +include third-party code. + +If you redistribute modified sources, we would appreciate that you include +in the file ChangeLog history information documenting your changes. Please +read the FAQ for more information on the distribution of modified source +versions. diff -Nru netpanzer-0.8.2/RELEASE_VERSION netpanzer-0.8.4.debian.1/RELEASE_VERSION --- netpanzer-0.8.2/RELEASE_VERSION 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/RELEASE_VERSION 2011-12-24 02:24:39.000000000 +0000 @@ -0,0 +1 @@ +0.8.4 diff -Nru netpanzer-0.8.2/RELNOTES netpanzer-0.8.4.debian.1/RELNOTES --- netpanzer-0.8.2/RELNOTES 2007-05-26 06:57:02.000000000 +0000 +++ netpanzer-0.8.4.debian.1/RELNOTES 2010-02-12 12:44:23.000000000 +0000 @@ -1,3 +1,27 @@ +*** 0.8.3 *** +Fixed: + +- fix playing in 64 bit machines. +- fix many small bugs. +- fix production bug when loosing the base. +- fix problem of not able to capture some bases. +- fix bad colors on some systems. +- fix alliance, new alliance method (click to request ally). +- fix frag limit mode. +- fixed some flags and added Spain and Bulgaria flags. + +Added: + +- added a Mac OS X universal binary of netPanzer. +- added lua support, currently for configuration. +- added screenshoot function (press F9). +- added any resolution support (>= 640x480) and resizable window. +- added sound configuration (volume, enable/disable). +- added some new maps done by community. +- new unit selection modes, double and tripple click. +- player flags appears in chat messages. +- player name appear over tanks (configurable, press "n"). + *** 0.8.1 *** * Change default masterserver to netpanzer.dyndns.org diff -Nru netpanzer-0.8.2/SConstruct netpanzer-0.8.4.debian.1/SConstruct --- netpanzer-0.8.2/SConstruct 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/SConstruct 2011-12-22 18:32:06.000000000 +0000 @@ -0,0 +1,356 @@ +import os +import glob +import sys +import string +import subprocess + +################################################################ +# Fix compiling with long lines in windows +################################################################ +class ourSpawn: + def ourspawn(self, sh, escape, cmd, args, env): + newargs = string.join(args[1:], ' ') + cmdline = cmd + " " + newargs + startupinfo = subprocess.STARTUPINFO() + startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW + proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False, env = env) + data, err = proc.communicate() + rv = proc.wait() + if rv: + print "=====" + print err + print "=====" + return rv + +def SetupSpawn( env ): + if sys.platform == 'win32': + buf = ourSpawn() + buf.ourenv = env + env['SPAWN'] = buf.ourspawn + +################################################################ +# Modified copy from BosWars of globSources +################################################################ + +def globSources(localenv, sourcePrefix, sourceDirs, pattern): + sources = [] + sourceDirs = Split(sourceDirs) + for d in sourceDirs: + sources.append(glob.glob( sourcePrefix + '/' + d + '/' + pattern)) + sources = Flatten(sources) + targetsources = [] + for s in sources: + targetsources.append(localenv['FINALBUILDDIR'] + s) + + return targetsources + +################################################################ +# Make static libraries +################################################################ + +def MakeStaticLib(localenv, libname, libdirs, pattern): + sources = globSources(localenv, 'src/Lib', libdirs, pattern) + localenv.StaticLibrary( localenv['FINALLIBSDIR'] + libname, sources) + +################################################################ +# Add options +################################################################ + +opts = Options() +opts.AddOptions( + ('mode','set compile mode to debug or release','release'), + ('datadir','define the extra directory where the netpanzer will look for data files, usefull for linux distributions, defaults to no extra directory',''), + ('sdlconfig','sets the sdl-config full path', 'sdl-config'), + ('universal','builds universal app in Max OS X(default false, other value is true)', 'false'), + ('crosslinuxcompilerprefix', 'sets the prefix for the cross linux compiler, example: i686-pc-linux-gnu-', ''), + ('crossmingwcompilerprefix', 'sets the prefix for the cross mingw compiler, example: i686-mingw32-', ''), + ('crosslinuxsdlconfig','sets the sdl-config full path for linux cross compiler', 'sdl-config'), + ('crossmingwsdlconfig','sets the sdl-config full path for mingw cross compiler', 'sdl-config') +) + +env = Environment(ENV = os.environ, options = opts) +Help(opts.GenerateHelpText(env)) + +################################################################ +# Create Environments +################################################################ + +if not (env['mode'] in ['debug', 'release']): + print "Error: mode can only be 'debug' or 'release', found: " + env['mode'] + Exit(1) + +crossmingwenv = env.Clone(); +crosslinuxenv = env.Clone(); + +if 'crossmingw' in COMMAND_LINE_TARGETS: + if env['crossmingwcompilerprefix'] == '': + print 'You need to set a compiler prefix for mingw cross compilation' + Exit(1) + + if env['crossmingwsdlconfig'] == 'sdl-config': + print 'You need to set the full path of sdl-config for mingw cross compilation' + Exit(1) + + crossmingwenv = Environment( ENV = {'PATH' : os.environ['PATH']}, tools = ['mingw'], options=opts ) + crossmingwenv.Replace( CXX = env['crossmingwcompilerprefix'] + crossmingwenv['CXX'] ) + crossmingwenv.Replace( CC = env['crossmingwcompilerprefix'] + crossmingwenv['CC'] ) + crossmingwenv.Replace( AR = env['crossmingwcompilerprefix'] + crossmingwenv['AR'] ) + crossmingwenv.Replace( RANLIB = env['crossmingwcompilerprefix'] + crossmingwenv['RANLIB'] ) + crossmingwenv.Replace( RC = env['crossmingwcompilerprefix'] + crossmingwenv['RC'] ) + crossmingwenv.Append( CCFLAGS = [ '-Dsocklen_t=int' ] ) + crossmingwenv.Append( LDFLAGS = [ '-mwindows' ] ) + crossmingwenv.Append( LIBS = [ 'ws2_32', 'mingw32' ] ) + crossmingwenv['WINICON'] = crossmingwenv.RES( 'support/icon/npicon.rc' ) + crossmingwenv['PROGSUFFIX'] = '.exe' + +if 'crosslinux' in COMMAND_LINE_TARGETS: + if env['crosslinuxcompilerprefix'] == '': + print 'You need to set a compiler prefix for linux cross compilation' + Exit(1) + + if env['crosslinuxsdlconfig'] == 'sdl-config': + print 'You need to set the full path of sdl-config for linux cross compilation' + Exit(1) + + crosslinuxenv= Environment(ENV = {'PATH' : os.environ['PATH']},tools = ['gcc','g++','ar','gnulink'], options=opts ) + crosslinuxenv.Replace( CXX = env['crosslinuxcompilerprefix'] + env['CXX'] ) + crosslinuxenv.Replace( CC = env['crosslinuxcompilerprefix'] + env['CC'] ) + crosslinuxenv.Replace( AR = env['crosslinuxcompilerprefix'] + env['AR'] ) + crosslinuxenv.Replace( RANLIB = env['crosslinuxcompilerprefix'] + env['RANLIB'] ) + crosslinuxenv.Append( LINKFLAGS = [ '-static-libgcc' ] ) + #crosslinuxenv.Prepend( _LIBFLAGS = [ '-static-libgcc' ] ) + #crosslinuxenv.Prepend( _LIBFLAGS = [ '-lstdc++' ] ) + #crosslinuxenv.Append( _LIBFLAGS = [ '`' + crosslinuxenv['CXX'] + ' -print-file-name=libstdc++.a`' ] ) + #crosslinuxenv.Prepend( _LIBFLAGS = [ '/usr/local/gcc/i686-linux/lib/gcc/i686-linux/4.2.4/../../../../i686-linux/lib/libstdc++.a' ] ) + +env.Append( LINKFLAGS = [ '-static-libgcc' ] ) +env['FINALBUILDDIR'] = 'build/' + env['mode'] + '/' +env['FINALLIBSDIR'] = env['FINALBUILDDIR'] + 'libs/' +crossmingwenv['FINALBUILDDIR'] = 'build/crossmingw/' + env['mode'] + '/' +crossmingwenv['FINALLIBSDIR'] = crossmingwenv['FINALBUILDDIR'] + 'libs/' +crosslinuxenv['FINALBUILDDIR'] = 'build/crosslinux/' + env['mode'] + '/' +crosslinuxenv['FINALLIBSDIR'] = crosslinuxenv['FINALBUILDDIR'] + 'libs/' + +# HANDLE 'mode' flags +if env['mode'] == 'debug': + env.Append(CCFLAGS = ['-g', '-O0']) + env['FINALEXENAME'] = 'netpanzer-debug' + crossmingwenv.Append(CCFLAGS = ['-g', '-O0']) + crossmingwenv['FINALEXENAME'] = crossmingwenv['FINALBUILDDIR'] + 'netpanzer-debug' + crosslinuxenv.Append(CCFLAGS = ['-g', '-O0']) + crosslinuxenv['FINALEXENAME'] = crosslinuxenv['FINALBUILDDIR'] + 'netpanzer-debug' +else: + env.Append(CCFLAGS = ['-O2','-s']) + env['FINALEXENAME'] = 'netpanzer' + crossmingwenv.Append(CCFLAGS = ['-O2','-s']) + crossmingwenv['FINALEXENAME'] = crossmingwenv['FINALBUILDDIR'] + 'netpanzer' + crosslinuxenv.Append(CCFLAGS = ['-O2','-s']) + crosslinuxenv['FINALEXENAME'] = crosslinuxenv['FINALBUILDDIR'] + 'netpanzer' + +env.Append(CCFLAGS = ['-Wall']) + +env.BuildDir(env['FINALBUILDDIR'],'.',duplicate=0) +crossmingwenv.BuildDir(crossmingwenv['FINALBUILDDIR'],'.',duplicate=0) +crosslinuxenv.BuildDir(crosslinuxenv['FINALBUILDDIR'],'.',duplicate=0) + +luaenv = env.Clone() +physfsenv = env.Clone() +networkenv = env.Clone() + +crossmingwluaenv = crossmingwenv.Clone() +crossmingwphysfsenv = crossmingwenv.Clone() +crossmingwnetworkenv = crossmingwenv.Clone() + +crosslinuxluaenv = crosslinuxenv.Clone() +crosslinuxphysfsenv = crosslinuxenv.Clone() +crosslinuxnetworkenv = crosslinuxenv.Clone() + +################################################################ +# Set NetPanzer Version +################################################################ + +NPVERSION = '' +SVERSION = '' + +try: + FILE = open('RELEASE_VERSION', 'r') + NPVERSION = FILE.readline().strip(' \n\r') + FILE.close() +except: + pass + +try: + SVERSION = os.popen('svnversion').read()[:-1] + SVERSION = SVERSION.split(':')[-1] +except: + pass + +print "NPVERSION = " + NPVERSION +print "SVERSION = " + SVERSION +if NPVERSION == '' and SVERSION != '': + NPVERSION = 'svn-' + SVERSION; + +env.Append( CCFLAGS = [ '-DPACKAGE_VERSION=\\"' + NPVERSION + '\\"' ] ) +if env['datadir'] != '': + env.Append( CCFLAGS = [ '-DNP_DATADIR=\\"' + env['datadir'] + '\\"' ]) + +crossmingwenv.Append( CCFLAGS = [ '-DPACKAGE_VERSION=\\"' + NPVERSION + '\\"' ] ) +crosslinuxenv.Append( CCFLAGS = [ '-DPACKAGE_VERSION=\\"' + NPVERSION + '\\"' ] ) + +thisplatform = sys.platform; +print 'Building version ' + NPVERSION + ' in ' + sys.platform + +################################################################ +# Configure Environments +################################################################ + +env.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] ) +crossmingwenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] ) +crosslinuxenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] ) + +# for this platform +if thisplatform == 'darwin': + env.Append( CPPPATH = ['/Library/Frameworks/SDL.framework/Headers', + '/Library/Frameworks/SDL_mixer.framework/Headers' ] ) + + if env['universal'] != 'false': + env.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) + luaenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) + physfsenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) + networkenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) + env.Append( LINKFLAGS = [ '-mmacosx-version-min=10.4', '-arch', 'ppc', '-arch', 'i386' ] ) + else: + env.Append( CCFLAGS = [ '-arch', 'i386' ] ) + luaenv.Append( CCFLAGS = [ '-arch', 'i386' ] ) + physfsenv.Append( CCFLAGS = [ '-arch', 'i386' ] ) + networkenv.Append( CCFLAGS = [ '-arch', 'i386' ] ) + env.Append( LINKFLAGS = [ '-arch', 'i386' ] ) + + env.AppendUnique(FRAMEWORKS=Split('SDL SDL_mixer Cocoa IOKit')) + env.Append( NPSOURCES = ['support/macosx/SDLMain.m'] ) +elif thisplatform == 'win32': + env.Append( CPPPATH = [ 'C:/mingw/include/SDL' ] ) + env.Append( LIBS = [ 'ws2_32', 'mingw32', 'SDLMain', 'SDL' ] ) + env.Append( CCFLAGS = [ '-Dsocklen_t=int' ] ) + networkenv.Append( CCFLAGS = [ '-Dsocklen_t=int' ] ) + env.Append( _LIBFLAGS = [ '-mwindows' ] ) + env.Prepend( _LIBFLAGS = [ 'c:/mingw/lib/SDL_mixer.lib' ] ) + env['WINICON'] = env.RES( 'support/icon/npicon.rc' ) + SetupSpawn(env) +else: + env.ParseConfig(env['sdlconfig'] + ' --cflags --libs') + env.Append( NPLIBS = [ 'SDL_mixer' ] ) + +# for crossmingw platform +if 'crossmingw' in COMMAND_LINE_TARGETS: + crossmingwenv.ParseConfig(env['crossmingwsdlconfig'] + ' --cflags --libs') + crossmingwenv.Prepend( _LIBFLAGS = [ '-L/usr/local/lib', '/usr/local/lib/SDL_mixer.lib' ] ) +# crossmingwenv.Append( NPLIBS = [ '/usr/local/lib/SDL_mixer.lib' ] ) + +# for crosslinux platform +if 'crosslinux' in COMMAND_LINE_TARGETS: + crosslinuxenv.ParseConfig(env['crosslinuxsdlconfig'] + ' --cflags --libs') + crosslinuxenv.Append( NPLIBS = [ 'SDL_mixer' ] ) + +################################################################ +# Makes libs +################################################################ + +# BUILDS NETWORK +networkenv.Append( CPPPATH = [ 'src/Lib' ] ) +crossmingwnetworkenv.Append( CPPPATH = [ 'src/Lib' ] ) +crosslinuxnetworkenv.Append( CPPPATH = [ 'src/Lib' ] ) +MakeStaticLib( networkenv, 'npnetwork', 'Network', '*.cpp') +MakeStaticLib(crossmingwnetworkenv, 'npnetwork', 'Network', '*.cpp') +MakeStaticLib(crosslinuxnetworkenv, 'npnetwork', 'Network', '*.cpp') + +# BUILDS LUA +luaenv.Append( CPPPATH = [ 'src/Lib/lua'] ) +crossmingwluaenv.Append( CPPPATH = [ 'src/Lib/lua'] ) +crosslinuxluaenv.Append( CPPPATH = [ 'src/Lib/lua'] ) +MakeStaticLib( luaenv, 'nplua', 'lua', '*.c') +MakeStaticLib(crossmingwluaenv, 'nplua', 'lua', '*.c') +MakeStaticLib(crosslinuxluaenv, 'nplua', 'lua', '*.c') + +# BUILDS PHYSFS +physfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] ) +physfsenv.Append( CPPPATH = [ 'src/Lib/physfs', 'src/Lib/physfs/zlib123' ] ) +MakeStaticLib(physfsenv, 'npphysfs', 'physfs physfs/platform physfs/archivers physfs/zlib123', '*.c') + +crossmingwphysfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] ) +crossmingwphysfsenv.Append( CPPPATH = [ 'src/Lib/physfs', 'src/Lib/physfs/zlib123' ] ) +MakeStaticLib(crossmingwphysfsenv, 'npphysfs', 'physfs physfs/platform physfs/archivers physfs/zlib123', '*.c') + +crosslinuxphysfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] ) +crosslinuxphysfsenv.Append( CPPPATH = [ 'src/Lib/physfs', 'src/Lib/physfs/zlib123' ] ) +MakeStaticLib(crosslinuxphysfsenv, 'npphysfs', 'physfs physfs/platform physfs/archivers physfs/zlib123', '*.c') + +# BUILDS 2D +env.Append( CFLAGS = [ '-DZ_PREFIX=1' ] ) +env.Append( CPPPATH = 'src/Lib/physfs/zlib123' ) +MakeStaticLib(env, 'np2d', '2D 2D/libpng', '*.c*') +crossmingwenv.Append( CFLAGS = [ '-DZ_PREFIX=1' ] ) +crossmingwenv.Append( CPPPATH = 'src/Lib/physfs/zlib123' ) +MakeStaticLib(crossmingwenv, 'np2d', '2D 2D/libpng', '*.c*') +crosslinuxenv.Append( CFLAGS = [ '-DZ_PREFIX=1' ] ) +crosslinuxenv.Append( CPPPATH = 'src/Lib/physfs/zlib123' ) +MakeStaticLib(crosslinuxenv, 'np2d', '2D 2D/libpng', '*.c*') + +# BUILDS REST OF LIBRARIES +MakeStaticLib(env, 'nplibs', 'ArrayUtil INIParser Types Util optionmm','*.cpp') +MakeStaticLib(crossmingwenv, 'nplibs', 'ArrayUtil INIParser Types Util optionmm','*.cpp') +MakeStaticLib(crosslinuxenv, 'nplibs', 'ArrayUtil INIParser Types Util optionmm','*.cpp') + +################################################################ +# NetPanzer source dirs +################################################################ + +npdirs = """ + Bot Classes Classes/AI Classes/Network Core Interfaces Network + Objectives Particles PowerUps Resources Scripts System Units Weapons + Views Views/Components Views/Game Views/MainMenu Views/MainMenu/Multi + Views/MainMenu/Multi/MasterServer Views/MainMenu/Options +""" + +env.Append( NPSOURCES = globSources(env, 'src/NetPanzer', npdirs, "*.cpp") ) +if env.has_key('WINICON'): + env.Append( NPSOURCES = env['WINICON'] ) + +crossmingwenv.Append( NPSOURCES = globSources(crossmingwenv, 'src/NetPanzer', npdirs, "*.cpp") ) +if crossmingwenv.has_key('WINICON'): + crossmingwenv.Append( NPSOURCES = crossmingwenv['WINICON'] ) + +crosslinuxenv.Append( NPSOURCES = globSources(crosslinuxenv, 'src/NetPanzer', npdirs, "*.cpp") ) + +env.Append( NPLIBS = ['nplua','np2d','npnetwork','nplibs','npphysfs'] ) +crossmingwenv.Append( NPLIBS = ['nplua','np2d','npnetwork','nplibs','npphysfs'] ) +crosslinuxenv.Append( NPLIBS = ['nplua','np2d','npnetwork','nplibs','npphysfs'] ) + +if env.has_key('LIBS'): + env.Append( NPLIBS = env['LIBS'] ) + +if crossmingwenv.has_key('LIBS'): + crossmingwenv.Append( NPLIBS = crossmingwenv['LIBS'] ) + +if crosslinuxenv.has_key('LIBS'): + crosslinuxenv.Append( NPLIBS = crosslinuxenv['LIBS'] ) + +env.Append( NPLIBPATH = env['FINALLIBSDIR'] ) +crossmingwenv.Append( NPLIBPATH = crossmingwenv['FINALLIBSDIR'] ) +crosslinuxenv.Append( NPLIBPATH = crosslinuxenv['FINALLIBSDIR'] ) + +netpanzer = env.Program( env['FINALEXENAME'], env['NPSOURCES'], + LIBS=env['NPLIBS'], LIBPATH=env['NPLIBPATH'] ) + +crossmingw = crossmingwenv.Program( crossmingwenv['FINALEXENAME'], crossmingwenv['NPSOURCES'], + LIBS=crossmingwenv['NPLIBS'], LIBPATH=crossmingwenv['NPLIBPATH'] ) + +Alias('crossmingw', crossmingw); + +crosslinux = crosslinuxenv.Program( crosslinuxenv['FINALEXENAME'], crosslinuxenv['NPSOURCES'], + LIBS=crosslinuxenv['NPLIBS'], LIBPATH=crosslinuxenv['NPLIBPATH'] ) + +Alias('crosslinux', crosslinux); + +Default(netpanzer) diff -Nru netpanzer-0.8.2/scripts/initcolors.lua netpanzer-0.8.4.debian.1/scripts/initcolors.lua --- netpanzer-0.8.2/scripts/initcolors.lua 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/scripts/initcolors.lua 2010-01-20 15:26:20.000000000 +0000 @@ -0,0 +1,75 @@ +unitAqua = rgb( 0, 204, 255) +unitYellow = rgb(255, 255, 0) +unitRed = rgb(255, 0, 0) +unitBlue = rgb( 3, 3, 255) +unitDarkBlue = rgb( 0, 0, 128) +unitLightGreen = rgb(163, 214, 159) +unitGreen = rgb( 31, 166, 36) +unitBlueGray = rgb( 43, 85, 131) +unitDarkRed = rgb(150, 0, 0) +unitBlack = rgb( 6, 2, 2) +unitDarkGreen = rgb( 26, 88, 36) +unitWhite = rgb(250, 253, 248) +unitLightOrange = rgb(246, 210, 99) +unitOrange = rgb(205, 144, 9) +unitGray = rgb(186, 186, 186) +unitDarkGray = rgb( 99, 100, 102) + +-- Grays +black = rgb( 0, 0, 0, true) +gray32 = rgb( 32, 32, 32) +gray64 = rgb( 64, 64, 64) +gray96 = rgb( 96, 96, 96) +gray128 = rgb(128, 128, 128) +gray160 = rgb(160, 160, 160) +gray192 = rgb(192, 192, 192) +gray224 = rgb(224, 224, 224) +white = rgb(255, 255, 255) + +-- Dark Colors !FIXME! +darkGray = gray64 +darkRed = rgb(128, 0, 0) -- fixed +darkGreen = rgb( 0, 128, 0) -- fixed +darkBlue = rgb( 0, 0, 128) -- fixed +darkYellow = rgb(255, 168, 18) -- fixed +darkOrange = rgb(255, 140, 0) -- fixed +darkMagenta = rgb(148, 0, 211) -- fixed +darkCyan = rgb( 0, 206, 209) -- fixed + +-- Normal Colors +gray = gray128 +red = rgb(255, 0, 0) -- fixed +green = rgb( 0, 255, 0) -- fixed +blue = rgb( 0, 0, 255) -- fixed +yellow = rgb(255, 255, 0) -- fixed +orange = rgb(255, 128, 0) -- fixed +magenta = rgb(255, 0, 255) -- fixed +cyan = rgb( 0, 255, 255) -- fixed +--brown = rgb(128, 42, 42) -- fixed +brown = rgb(200, 80, 80) -- new brown is lighter + +--tan 210 180 140 0.8235 0.7059 0.5490 +tan = rgb(210, 180, 140) -- fixed +--chartreuse 127 255 0 0.4980 1.0000 0.0000 +chartreuse = rgb(127, 255, 0) -- fixed +--cobalt_green 61 145 64 0.2400 0.5700 0.2500 +cobaltGreen = rgb( 61, 145, 64) -- fixed +--emerald_green 0 201 87 0.0000 0.7900 0.3400 +emeraldGreen = rgb( 0, 201, 87) -- fixed +--forest_green 34 139 34 0.1333 0.5451 0.1333 +forestGreen = rgb( 34, 139, 34) -- fixed +--olive_green_dark 85 107 47 0.3333 0.4196 0.1843 +darkOliveGreen = rgb( 85, 107, 47) -- fixed +--terre_verte 56 94 15 0.2200 0.3700 0.0600 +terreVerte = rgb( 56, 94, 15) -- fixed + +-- Normal Colors !FIXME! +lightGray = gray192 +lightRed = rgb(255, 160, 122) -- fixed +lightGreen = rgb( 50, 205, 50) -- fixed +lightBlue = rgb(135, 206, 250) -- fixed +lightYellow = rgb(255, 255, 224) -- fixed +lightOrange = rgb(237, 145, 33) -- fixed +lightMagenta = rgb( 0, 255, 255) +lightCyan = rgb(224, 255, 255) -- fixed + diff -Nru netpanzer-0.8.2/scripts/initialize.lua netpanzer-0.8.4.debian.1/scripts/initialize.lua --- netpanzer-0.8.2/scripts/initialize.lua 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/scripts/initialize.lua 2011-12-03 11:21:16.000000000 +0000 @@ -0,0 +1,82 @@ +--LOGGER:log("Script initialization"); + +--LOGGER:log("Video Config: " .. config.video.width .. " x " .. config.video.height) +--LOGGER:log("Fullscreen: " .. tostring(config.video.fullscreen)) + +function pairs(t) + local mt = getmetatable(t) + local iter = mt and mt.__next or next + return iter, t, nil +end + +game = { tasks = {} }; +game.addTask = function(name, task) +-- if name ~= nil then + game.tasks[name] = task; +-- else +-- table.insert(game.tasks, task); +-- end +end; + +game.hasTask = function(name) + return game.tasks[name] ~= nil; +end; + +function dump_table(result, t, extra) + local lin = extra or "" + + if type(t) ~= 'table' then + --LOGGER:log("ERROR dumping table: it is not a table") + return + end + + for key,value in pairs(t) do + local keytext + local valuetext + + if type(key) == 'number' then + if extra then + keytext = "[" .. key .. "]" + end + else + if extra then + keytext = "." .. key + else + keytext = key; + end + end + + if type(value) == 'table' then + if keytext then + dump_table(result, value, (lin or "") .. keytext) + end + elseif type(value) == 'string' then + valuetext = '"' .. string.gsub(value,'"','\\"') .. '"' + elseif type(value) ~= 'function' then + valuetext = tostring(value) + end + + if keytext and valuetext then + table.insert(result, lin .. keytext .. " = " .. valuetext) + end + end +end + +gconcat = table.concat; + +config.dump = function(table) + result = {} + dump_table(result, table) + return gconcat(result,"\n"); +end + +count_time = 0; + +function scriptLoop() + for i, func in pairs(game.tasks) do + if func() then game.tasks[i] = nil end + end +end + +--LOGGER:log("Dumping conf:\n" .. config.dump(config)) + diff -Nru netpanzer-0.8.2/scripts/particles.lcfg netpanzer-0.8.4.debian.1/scripts/particles.lcfg --- netpanzer-0.8.2/scripts/particles.lcfg 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/scripts/particles.lcfg 2010-01-13 17:24:44.000000000 +0000 @@ -0,0 +1,82 @@ +-- clouds: required, single file + +clouds = { "pics/particles/clouds/clouds.png", 300, 300, 10, alpha=128 } +flash = { "pics/particles/lights/flash2.png", 240, 194, 20 } +--flash = { "pics/particles/lights/flash3.png", 256, 256, 17 } +--flash = { "pics/particles/lights/flash5.png", 240, 194, 20 } +chunks = { "pics/particles/chunks/groundChunks.png", 2, 2, 256, alpha=128 } +craters= { "pics/particles/craters/craters.png", 32, 32, 3, alpha=255 } + +-- puffs is required, must have: light, dark and dirt +-- format is file_name, width, height, num_frames + +lightpuffs = +{ + { "pics/particles/puff/smokeLightPuff0004.png", 4, 4, 26, alpha=128 }, + { "pics/particles/puff/smokeLightPuff0008.png", 8, 8, 26, alpha=128 }, + { "pics/particles/puff/smokeLightPuff0012.png", 12, 12, 26, alpha=128 }, + { "pics/particles/puff/smokeLightPuff0016.png", 16, 16, 26, alpha=128 }, + { "pics/particles/puff/smokeLightPuff0020.png", 20, 20, 26, alpha=128 }, + { "pics/particles/puff/smokeLightPuff0024.png", 24, 24, 26, alpha=128 }, + { "pics/particles/puff/smokeLightPuff0028.png", 28, 28, 26, alpha=128 }, + { "pics/particles/puff/smokeLightPuff0032.png", 32, 32, 26, alpha=128 }, + { "pics/particles/puff/smokeLightPuff0036.png", 36, 36, 26, alpha=128 }, + { "pics/particles/puff/smokeLightPuff0040.png", 40, 40, 26, alpha=128 }, + { "pics/particles/puff/smokeLightPuff0044.png", 44, 44, 26, alpha=128 }, + { "pics/particles/puff/smokeLightPuff0048.png", 48, 48, 26, alpha=128 }, +} + +darkpuffs = +{ + { "pics/particles/puff/smokeDarkPuff0004.png", 4, 4, 26, alpha=128 }, + { "pics/particles/puff/smokeDarkPuff0008.png", 8, 8, 26, alpha=128 }, + { "pics/particles/puff/smokeDarkPuff0012.png", 12, 12, 26, alpha=128 }, + { "pics/particles/puff/smokeDarkPuff0016.png", 16, 16, 26, alpha=128 }, + { "pics/particles/puff/smokeDarkPuff0020.png", 20, 20, 26, alpha=128 }, + { "pics/particles/puff/smokeDarkPuff0024.png", 24, 24, 26, alpha=128 }, + { "pics/particles/puff/smokeDarkPuff0028.png", 28, 28, 26, alpha=128 }, + { "pics/particles/puff/smokeDarkPuff0032.png", 32, 32, 26, alpha=128 }, + { "pics/particles/puff/smokeDarkPuff0036.png", 36, 36, 26, alpha=128 }, + { "pics/particles/puff/smokeDarkPuff0040.png", 40, 40, 26, alpha=128 }, + { "pics/particles/puff/smokeDarkPuff0044.png", 44, 44, 26, alpha=128 }, + { "pics/particles/puff/smokeDarkPuff0048.png", 48, 48, 26, alpha=128 } +} + +dirtpuffs = +{ + { "pics/particles/puff/dirtPuff0004.png", 4, 4, 26, alpha=128 }, + { "pics/particles/puff/dirtPuff0008.png", 8, 8, 26, alpha=128 }, + { "pics/particles/puff/dirtPuff0012.png", 12, 12, 26, alpha=128 }, + { "pics/particles/puff/dirtPuff0016.png", 16, 16, 26, alpha=128 }, + { "pics/particles/puff/dirtPuff0020.png", 20, 20, 26, alpha=128 }, + { "pics/particles/puff/dirtPuff0024.png", 24, 24, 26, alpha=128 }, + { "pics/particles/puff/dirtPuff0028.png", 28, 28, 26, alpha=128 }, + { "pics/particles/puff/dirtPuff0032.png", 32, 32, 26, alpha=128 }, + { "pics/particles/puff/dirtPuff0036.png", 36, 36, 26, alpha=128 }, + { "pics/particles/puff/dirtPuff0040.png", 40, 40, 26, alpha=128 }, + { "pics/particles/puff/dirtPuff0044.png", 44, 44, 26, alpha=128 }, + { "pics/particles/puff/dirtPuff0048.png", 48, 48, 26, alpha=128 } +} + +explosions = +{ + { + { "pics/particles/explosion/explosion0_0001.png", 13, 18, 16 }, + { "pics/particles/explosion/explosion0_0002.png", 27, 36, 16 }, + { "pics/particles/explosion/explosion0_0003.png", 41, 54, 16 }, + { "pics/particles/explosion/explosion0_0004.png", 54, 73, 16 }, + { "pics/particles/explosion/explosion0_0005.png", 68, 91, 16 }, + { "pics/particles/explosion/explosion0_0006.png", 82, 109, 16 }, + { "pics/particles/explosion/explosion0_0007.png", 96, 128, 16 } + }, + + { + { "pics/particles/explosion/explosion1_0001.png", 18, 13, 15 }, + { "pics/particles/explosion/explosion1_0002.png", 36, 27, 15 }, + { "pics/particles/explosion/explosion1_0003.png", 54, 41, 15 }, + { "pics/particles/explosion/explosion1_0004.png", 73, 54, 15 }, + { "pics/particles/explosion/explosion1_0005.png", 91, 68, 15 }, + { "pics/particles/explosion/explosion1_0006.png", 109, 82, 15 }, + { "pics/particles/explosion/explosion1_0007.png", 128, 96, 15 } + } +} diff -Nru netpanzer-0.8.2/scripts/servercommands.lua netpanzer-0.8.4.debian.1/scripts/servercommands.lua --- netpanzer-0.8.2/scripts/servercommands.lua 1970-01-01 00:00:00.000000000 +0000 +++ netpanzer-0.8.4.debian.1/scripts/servercommands.lua 2011-12-22 11:59:10.000000000 +0000 @@ -0,0 +1,214 @@ +local splitsay = function(player, prefix, tbl) + local s = ""; + local i = 0; + while ( i < #tbl ) + do + i = i + 1; + if ( #s + #tbl[i] > 80 ) then + netpanzer.serversayto(player, prefix .. s); + s = tbl[i]; + else + if ( #s > 0 ) then s = s .. ',' end + s = s .. tbl[i]; + end + end + + if ( #s > 0 ) then + netpanzer.serversayto(player, prefix .. s); + end +end; + +local base_modes = {}; +base_modes[0] = "Can't capture"; +base_modes[1] = "Helipad capture"; +base_modes[2] = "Full base capture"; + + +ServerCommands = +{ + say_help = "Says something to all players as server.", + say = function(param, player) + if param then + netpanzer.serversay(param); + end + end, + + listplayers_help = "List the players with their Id", + listplayers = function(param, player) + netpanzer.serversayto(player, 'Listing players:'); + local players = netpanzer.listplayers(); + local i = 0; + while ( i < #players ) + do + i = i + 1; + local p = players[i]; + netpanzer.serversayto(player, p.id .. " - " .. p.name .. " ip: " .. p.ip); + end + end, + + kick_help = "Kicks a player, use the player number (starts in 0)", + kick = function(param, player) + if param then + netpanzer.kick(param); + end + end, + + map_help = "Change the map", + map = function(param, player) + netpanzer.serversayto(player, netpanzer.map(param)); + end, + + listmaps_help = "List the available maps in server", + listmaps = function(param, player) + netpanzer.serversayto(player, 'Listing maps:'); + splitsay(player, '', netpanzer.listmaps()); + end, + + listprofiles_help = "List the available unit profiles in server", + listprofiles = function(param, player) + netpanzer.serversayto(player, 'Listing profiles:'); + splitsay(player, '', netpanzer.listprofiles()); + end, + + listcommands_help = "List the server commands", + listcommands = function(param, player) + netpanzer.serversayto(player, 'Listing commands:'); + local out = {}; + for k,v in pairs(ServerCommands) do + if type(v) == "function" then + table.insert(out,k); + end + end + splitsay(player, '', out); + end, + + _help = "Type /server help or /server listcommands", + help_help = "Provides this kind of help", + help = function(param, player) + local ht = ServerCommands[param .. "_help"]; + if ht then + netpanzer.serversayto( player, param .. ": " .. ht); + else + netpanzer.serversayto( player, "Help not found for " .. param .. ". Use /server listcommands"); + end + end, + + autokick_help = "sets the idle time for kicking a player automatically", + autokick = function(param, player) + if ( param == "" ) then + netpanzer.serversayto( player, "autokick time is " .. config.game.autokicktime); + else + config.game.autokicktime = param; + netpanzer.serversayto( player, "autokick time was set to " .. config.game.autokicktime); + end + end, + + unitprofiles_help = "sets or get list of unit profiles loaded", + unitprofiles = function(param, player) + if ( param == "" ) then + netpanzer.serversayto( player, "Unit profile list: " .. config.game.unit_profiles); + else + config.game.unit_profiles = param; + netpanzer.serversayto( player, "Unit profile list set to: " .. config.game.unit_profiles); + end + end, + + unitspawnlist_help = "sets or get the unitspawnlist", + unitspawnlist = function(param, player) + if ( param == "" ) then + netpanzer.serversayto( player, "Unit spawn list: " .. config.game.unit_spawnlist); + else + config.game.unit_spawnlist = param; + netpanzer.serversayto( player, "Unit spawn list set to: " .. config.game.unit_spawnlist); + end + end, + + baselimit_help = "sets or get the base limit for players", + baselimit = function(param, player) + if ( param == "" ) then + netpanzer.serversayto( player, "Base limit: " .. config.game.base_limit); + else + config.game.base_limit = param; + netpanzer.serversayto( player, "Base limit set to: " .. config.game.base_limit); + end + end, + + basemode_help = "sets or get the base capture mode: 0- no capture, 1- helipad capture, 2- all base capture", + basemode = function(param, player) + if ( param == "" ) then + netpanzer.serversayto( player, "Base capture mode: " .. config.game.base_capture_mode .. "- " .. base_modes[config.game.base_capture_mode]); + else + local v = tonumber(param); + if ( v ~= nil and v >= 0 and v <= 2 ) then + config.game.base_capture_mode = v; + netpanzer.serversayto( player, "Base capture mode set to: " .. config.game.base_capture_mode .. "- " .. base_modes[config.game.base_capture_mode]); + else + netpanzer.serversayto( player, "Capture mode is invalid"); + end + end + end, + + gamepass_help = "sets or get the password for connecting to the server", + gamepass = function(param, player) + if ( param == "" ) then + if ( config.game.gamepass == "" ) then + netpanzer.serversayto( player, "There is no password set"); + else + netpanzer.serversayto( player, "Current game password: " .. config.game.gamepass); + end + else + if ( param == "." ) then + config.game.gamepass = ""; + netpanzer.serversayto( player, "Game password was removed"); + else + config.game.gamepass = param; + netpanzer.serversayto( player, "Game password set to: " .. config.game.gamepass); + end + + end + end, + + countdown_help = "Do a countdown, use 'countdown