From 5722ec807e54e25e1104559466c1efd14f4f4ec6 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 7 Jul 2013 20:49:48 -0700 Subject: [PATCH] more work --- cleantree | 2 + cleanup | 1 + config.log | 1207 ------------------ configure | 245 ++-- git-source-pickup.pl~ | 67 - visualc_net/zlib/contrib/minizip/Makefile.in | 0 6 files changed, 131 insertions(+), 1391 deletions(-) create mode 100755 cleantree delete mode 100644 config.log mode change 100644 => 100755 configure delete mode 100755 git-source-pickup.pl~ create mode 100644 visualc_net/zlib/contrib/minizip/Makefile.in diff --git a/cleantree b/cleantree new file mode 100755 index 000000000..970c5d628 --- /dev/null +++ b/cleantree @@ -0,0 +1,2 @@ +#!/usr/bin/bash +./cleanup diff --git a/cleanup b/cleanup index beef71b23..2bd2ea729 100755 --- a/cleanup +++ b/cleanup @@ -9,4 +9,5 @@ svn del visualc_net/Debug svn del visualc_net/Release svn del visualc_net/libpng/projects/visualc71/Win32_LIB_Debug svn del visualc_net/libpng/projects/visualc71/Win32_LIB_Release +rm -Rfv autom4te.cache diff --git a/config.log b/config.log deleted file mode 100644 index 2952a7349..000000000 --- a/config.log +++ /dev/null @@ -1,1207 +0,0 @@ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by dosbox configure 0.74, which was -generated by GNU Autoconf 2.68. Invocation command line was - - $ ./configure --enable-core-inline --enable-debug=heavy --prefix=/usr - -## --------- ## -## Platform. ## -## --------- ## - -hostname = tvbox22 -uname -m = i686 -uname -r = 3.6.8-isptv -uname -s = Linux -uname -v = #1 SMP Tue Nov 27 03:14:40 Local time zone must be set--see zic - -/usr/bin/uname -p = unknown -/bin/uname -X = unknown - -/bin/arch = unknown -/usr/bin/arch -k = unknown -/usr/convex/getsysinfo = unknown -/usr/bin/hostinfo = unknown -/bin/machine = unknown -/usr/bin/oslevel = unknown -/bin/universe = unknown - -PATH: /usr/local/sbin -PATH: /usr/local/bin -PATH: /sbin -PATH: /bin -PATH: /usr/sbin -PATH: /usr/bin - - -## ----------- ## -## Core tests. ## -## ----------- ## - -configure:2492: checking build system type -configure:2506: result: i686-pc-linux-gnu -configure:2526: checking host system type -configure:2539: result: i686-pc-linux-gnu -configure:2577: checking for a BSD-compatible install -configure:2645: result: /usr/bin/install -c -configure:2656: checking whether build environment is sane -configure:2706: result: yes -configure:2847: checking for a thread-safe mkdir -p -configure:2886: result: /bin/mkdir -p -configure:2899: checking for gawk -configure:2915: found /usr/bin/gawk -configure:2926: result: gawk -configure:2937: checking whether make sets $(MAKE) -configure:2959: result: yes -configure:3042: checking whether make sets $(MAKE) -configure:3064: result: yes -configure:3121: checking for gcc -configure:3137: found /usr/bin/gcc -configure:3148: result: gcc -configure:3377: checking for C compiler version -configure:3386: gcc --version >&5 -gcc (GCC) 4.6.3 -Copyright (C) 2011 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. - -configure:3397: $? = 0 -configure:3386: gcc -v >&5 -Using built-in specs. -COLLECT_GCC=gcc -COLLECT_LTO_WRAPPER=/usr/libexec/gcc/i686-pc-linux-gnu/4.6.3/lto-wrapper -Target: i686-pc-linux-gnu -Configured with: ./configure --prefix=/usr --enable-static --enable-shared --with-gmp=//usr --with-mpfr=//usr --with-mpc=//usr --with-cloog=//usr --with-ppl=//usr --enable-cloog-backend=isl --enable-languages=c,c++,objc,obj-c++ --enable-threads --enable-libssp --enable-libmudflap --enable-libstdcxx-pch --enable-boehm-gc --enable-libgomp --disable-sjlj-exceptions --host=i686-pc-linux-gnu --target=i686-pc-linux-gnu --build=i686-pc-linux-gnu --disable-multilib --config-cache --cache-file=config.cache.used.for.build -Thread model: posix -gcc version 4.6.3 (GCC) -configure:3397: $? = 0 -configure:3386: gcc -V >&5 -gcc: error: unrecognized option '-V' -gcc: fatal error: no input files -compilation terminated. -configure:3397: $? = 1 -configure:3386: gcc -qversion >&5 -gcc: error: unrecognized option '-qversion' -gcc: fatal error: no input files -compilation terminated. -configure:3397: $? = 1 -configure:3417: checking whether the C compiler works -configure:3439: gcc conftest.c >&5 -configure:3443: $? = 0 -configure:3491: result: yes -configure:3494: checking for C compiler default output file name -configure:3496: result: a.out -configure:3502: checking for suffix of executables -configure:3509: gcc -o conftest conftest.c >&5 -configure:3513: $? = 0 -configure:3535: result: -configure:3557: checking whether we are cross compiling -configure:3565: gcc -o conftest conftest.c >&5 -configure:3569: $? = 0 -configure:3576: ./conftest -configure:3580: $? = 0 -configure:3595: result: no -configure:3600: checking for suffix of object files -configure:3622: gcc -c conftest.c >&5 -configure:3626: $? = 0 -configure:3647: result: o -configure:3651: checking whether we are using the GNU C compiler -configure:3670: gcc -c conftest.c >&5 -configure:3670: $? = 0 -configure:3679: result: yes -configure:3688: checking whether gcc accepts -g -configure:3708: gcc -c -g conftest.c >&5 -configure:3708: $? = 0 -configure:3749: result: yes -configure:3766: checking for gcc option to accept ISO C89 -configure:3830: gcc -c -g -O2 conftest.c >&5 -configure:3830: $? = 0 -configure:3843: result: none needed -configure:3874: checking for style of include used by make -configure:3902: result: GNU -configure:3927: checking dependency style of gcc -configure:4037: result: gcc3 -configure:4057: checking how to run the C preprocessor -configure:4088: gcc -E conftest.c -configure:4088: $? = 0 -configure:4102: gcc -E conftest.c -conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory -compilation terminated. -configure:4102: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "dosbox" -| #define PACKAGE_TARNAME "dosbox" -| #define PACKAGE_VERSION "0.74" -| #define PACKAGE_STRING "dosbox 0.74" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "dosbox" -| #define VERSION "0.74" -| /* end confdefs.h. */ -| #include -configure:4127: result: gcc -E -configure:4147: gcc -E conftest.c -configure:4147: $? = 0 -configure:4161: gcc -E conftest.c -conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory -compilation terminated. -configure:4161: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "dosbox" -| #define PACKAGE_TARNAME "dosbox" -| #define PACKAGE_VERSION "0.74" -| #define PACKAGE_STRING "dosbox 0.74" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "dosbox" -| #define VERSION "0.74" -| /* end confdefs.h. */ -| #include -configure:4247: checking for g++ -configure:4263: found /usr/bin/g++ -configure:4274: result: g++ -configure:4301: checking for C++ compiler version -configure:4310: g++ --version >&5 -g++ (GCC) 4.6.3 -Copyright (C) 2011 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. - -configure:4321: $? = 0 -configure:4310: g++ -v >&5 -Using built-in specs. -COLLECT_GCC=g++ -COLLECT_LTO_WRAPPER=/usr/libexec/gcc/i686-pc-linux-gnu/4.6.3/lto-wrapper -Target: i686-pc-linux-gnu -Configured with: ./configure --prefix=/usr --enable-static --enable-shared --with-gmp=//usr --with-mpfr=//usr --with-mpc=//usr --with-cloog=//usr --with-ppl=//usr --enable-cloog-backend=isl --enable-languages=c,c++,objc,obj-c++ --enable-threads --enable-libssp --enable-libmudflap --enable-libstdcxx-pch --enable-boehm-gc --enable-libgomp --disable-sjlj-exceptions --host=i686-pc-linux-gnu --target=i686-pc-linux-gnu --build=i686-pc-linux-gnu --disable-multilib --config-cache --cache-file=config.cache.used.for.build -Thread model: posix -gcc version 4.6.3 (GCC) -configure:4321: $? = 0 -configure:4310: g++ -V >&5 -g++: error: unrecognized option '-V' -g++: fatal error: no input files -compilation terminated. -configure:4321: $? = 1 -configure:4310: g++ -qversion >&5 -g++: error: unrecognized option '-qversion' -g++: fatal error: no input files -compilation terminated. -configure:4321: $? = 1 -configure:4325: checking whether we are using the GNU C++ compiler -configure:4344: g++ -c conftest.cpp >&5 -configure:4344: $? = 0 -configure:4353: result: yes -configure:4362: checking whether g++ accepts -g -configure:4382: g++ -c -g conftest.cpp >&5 -configure:4382: $? = 0 -configure:4423: result: yes -configure:4448: checking dependency style of g++ -configure:4558: result: gcc3 -configure:4617: checking for ranlib -configure:4633: found /usr/bin/ranlib -configure:4644: result: ranlib -configure:4714: checking for sdl-config -configure:4732: found /usr/bin/sdl-config -configure:4745: result: /usr/bin/sdl-config -configure:4754: checking for SDL - version >= 1.2.0 -configure:4839: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread >&5 -configure:4839: $? = 0 -configure:4839: ./conftest -configure:4839: $? = 0 -configure:4853: result: yes -configure:4919: checking SDL version only being 1.2.X -configure:4933: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:4933: $? = 0 -configure:4934: result: yes -configure:4945: checking for an ANSI C-conforming const -configure:5010: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5010: $? = 0 -configure:5017: result: yes -configure:5025: checking for inline -configure:5041: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5041: $? = 0 -configure:5049: result: inline -configure:5068: checking for grep that handles long lines and -e -configure:5126: result: /usr/bin/grep -configure:5131: checking for egrep -configure:5193: result: /usr/bin/grep -E -configure:5198: checking for ANSI C header files -configure:5218: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5218: $? = 0 -configure:5291: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread >&5 -configure:5291: $? = 0 -configure:5291: ./conftest -configure:5291: $? = 0 -configure:5302: result: yes -configure:5315: checking for sys/types.h -configure:5315: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5315: $? = 0 -configure:5315: result: yes -configure:5315: checking for sys/stat.h -configure:5315: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5315: $? = 0 -configure:5315: result: yes -configure:5315: checking for stdlib.h -configure:5315: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5315: $? = 0 -configure:5315: result: yes -configure:5315: checking for string.h -configure:5315: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5315: $? = 0 -configure:5315: result: yes -configure:5315: checking for memory.h -configure:5315: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5315: $? = 0 -configure:5315: result: yes -configure:5315: checking for strings.h -configure:5315: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5315: $? = 0 -configure:5315: result: yes -configure:5315: checking for inttypes.h -configure:5315: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5315: $? = 0 -configure:5315: result: yes -configure:5315: checking for stdint.h -configure:5315: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5315: $? = 0 -configure:5315: result: yes -configure:5315: checking for unistd.h -configure:5315: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5315: $? = 0 -configure:5315: result: yes -configure:5327: checking for size_t -configure:5327: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5327: $? = 0 -configure:5327: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -conftest.c: In function 'main': -conftest.c:57:21: error: expected expression before ')' token -configure:5327: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "dosbox" -| #define PACKAGE_TARNAME "dosbox" -| #define PACKAGE_VERSION "0.74" -| #define PACKAGE_STRING "dosbox 0.74" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "dosbox" -| #define VERSION "0.74" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| /* end confdefs.h. */ -| #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 -| int -| main () -| { -| if (sizeof ((size_t))) -| return 0; -| ; -| return 0; -| } -configure:5327: result: yes -configure:5338: checking whether struct tm is in sys/time.h or time.h -configure:5358: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5358: $? = 0 -configure:5365: result: time.h -configure:5377: checking size of unsigned char -configure:5382: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread >&5 -configure:5382: $? = 0 -configure:5382: ./conftest -configure:5382: $? = 0 -configure:5396: result: 1 -configure:5410: checking size of unsigned short -configure:5415: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread >&5 -configure:5415: $? = 0 -configure:5415: ./conftest -configure:5415: $? = 0 -configure:5429: result: 2 -configure:5443: checking size of unsigned int -configure:5448: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread >&5 -configure:5448: $? = 0 -configure:5448: ./conftest -configure:5448: $? = 0 -configure:5462: result: 4 -configure:5476: checking size of unsigned long -configure:5481: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread >&5 -configure:5481: $? = 0 -configure:5481: ./conftest -configure:5481: $? = 0 -configure:5495: result: 4 -configure:5509: checking size of unsigned long long -configure:5514: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread >&5 -configure:5514: $? = 0 -configure:5514: ./conftest -configure:5514: $? = 0 -configure:5528: result: 8 -configure:5542: checking size of int * -configure:5547: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread >&5 -configure:5547: $? = 0 -configure:5547: ./conftest -configure:5547: $? = 0 -configure:5561: result: 4 -configure:5575: checking for stdlib.h -configure:5575: result: yes -configure:5575: checking for sys/types.h -configure:5575: result: yes -configure:5588: checking for sys/socket.h -configure:5588: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5588: $? = 0 -configure:5588: result: yes -configure:5588: checking for netinet/in.h -configure:5588: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5588: $? = 0 -configure:5588: result: yes -configure:5588: checking for pwd.h -configure:5588: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5588: $? = 0 -configure:5588: result: yes -configure:5632: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5632: $? = 0 -configure:5641: checking if environ can be included -configure:5656: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread >&5 -configure:5656: $? = 0 -configure:5657: result: yes -configure:5668: checking if environ can be linked -configure:5681: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread >&5 -configure:5681: $? = 0 -configure:5682: result: yes -configure:5693: checking if dirent includes d_type -configure:5705: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5705: $? = 0 -configure:5706: result: yes -configure:5717: checking for powf in libm -configure:5734: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread -lm >&5 -configure:5734: $? = 0 -configure:5735: result: yes -configure:5750: checking if compiler allows __attribute__ -configure:5764: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5764: $? = 0 -configure:5765: result: yes -configure:5780: checking if compiler allows __attribute__((always_inline)) -configure:5787: gcc -c -Werror -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5787: $? = 0 -configure:5788: result: yes -configure:5798: checking if compiler allows __attribute__((fastcall)) -configure:5805: gcc -c -Werror -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5805: $? = 0 -configure:5806: result: yes -configure:5828: checking if compiler allows __builtin_expect -configure:5844: g++ -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.cpp >&5 -configure:5844: $? = 0 -configure:5845: result: yes -configure:5903: checking for ALSA CFLAGS -configure:5909: result: -configure:5912: checking for ALSA LDFLAGS -configure:5925: result: -lasound -lm -ldl -lpthread -configure:5929: checking for libasound headers version >= 0.9.0 -configure:5991: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:5991: $? = 0 -configure:5992: result: found. -configure:6009: checking for snd_ctl_open in -lasound -configure:6034: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -lasound -lasound -lm -ldl -lpthread -L/usr/lib -Wl,-rpath,/usr/lib -lSDL >&5 -configure:6034: $? = 0 -configure:6043: result: yes -configure:6281: checking whether byte ordering is bigendian -configure:6296: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -conftest.c:42:9: error: unknown type name 'not' -conftest.c:42:15: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'universal' -conftest.c:42:15: error: unknown type name 'universal' -configure:6296: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "dosbox" -| #define PACKAGE_TARNAME "dosbox" -| #define PACKAGE_VERSION "0.74" -| #define PACKAGE_STRING "dosbox 0.74" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "dosbox" -| #define VERSION "0.74" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define SIZEOF_UNSIGNED_CHAR 1 -| #define SIZEOF_UNSIGNED_SHORT 2 -| #define SIZEOF_UNSIGNED_INT 4 -| #define SIZEOF_UNSIGNED_LONG 4 -| #define SIZEOF_UNSIGNED_LONG_LONG 8 -| #define SIZEOF_INT_P 4 -| #define HAVE_STDLIB_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_SOCKET_H 1 -| #define HAVE_NETINET_IN_H 1 -| #define HAVE_PWD_H 1 -| #define ENVIRON_INCLUDED 1 -| #define ENVIRON_LINKED 1 -| #define DIRENT_HAS_D_TYPE 1 -| #define C_HAS_ATTRIBUTE 1 -| #define C_ATTRIBUTE_ALWAYS_INLINE 1 -| #define C_ATTRIBUTE_FASTCALL 1 -| #define C_HAS_BUILTIN_EXPECT 1 -| #define HAVE_LIBASOUND 1 -| #define HAVE_ALSA 1 -| /* end confdefs.h. */ -| #ifndef __APPLE_CC__ -| not a universal capable compiler -| #endif -| typedef int dummy; -| -configure:6341: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:6341: $? = 0 -configure:6359: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -conftest.c: In function 'main': -conftest.c:48:4: error: unknown type name 'not' -conftest.c:48:12: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'endian' -configure:6359: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "dosbox" -| #define PACKAGE_TARNAME "dosbox" -| #define PACKAGE_VERSION "0.74" -| #define PACKAGE_STRING "dosbox 0.74" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "dosbox" -| #define VERSION "0.74" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define SIZEOF_UNSIGNED_CHAR 1 -| #define SIZEOF_UNSIGNED_SHORT 2 -| #define SIZEOF_UNSIGNED_INT 4 -| #define SIZEOF_UNSIGNED_LONG 4 -| #define SIZEOF_UNSIGNED_LONG_LONG 8 -| #define SIZEOF_INT_P 4 -| #define HAVE_STDLIB_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_SOCKET_H 1 -| #define HAVE_NETINET_IN_H 1 -| #define HAVE_PWD_H 1 -| #define ENVIRON_INCLUDED 1 -| #define ENVIRON_LINKED 1 -| #define DIRENT_HAS_D_TYPE 1 -| #define C_HAS_ATTRIBUTE 1 -| #define C_ATTRIBUTE_ALWAYS_INLINE 1 -| #define C_ATTRIBUTE_FASTCALL 1 -| #define C_HAS_BUILTIN_EXPECT 1 -| #define HAVE_LIBASOUND 1 -| #define HAVE_ALSA 1 -| /* end confdefs.h. */ -| #include -| #include -| -| int -| main () -| { -| #if BYTE_ORDER != BIG_ENDIAN -| not big endian -| #endif -| -| ; -| return 0; -| } -configure:6487: result: no -configure:6512: checking curses.h usability -configure:6512: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:6512: $? = 0 -configure:6512: result: yes -configure:6512: checking curses.h presence -configure:6512: gcc -E -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -configure:6512: $? = 0 -configure:6512: result: yes -configure:6512: checking for curses.h -configure:6512: result: yes -configure:6518: checking for initscr in -lcurses -configure:6543: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -lcurses -lasound -lm -ldl -lpthread -L/usr/lib -Wl,-rpath,/usr/lib -lSDL >&5 -/usr/lib/gcc/i686-pc-linux-gnu/4.6.3/../../../../i686-pc-linux-gnu/bin/ld: cannot find -lcurses -collect2: ld returned 1 exit status -configure:6543: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "dosbox" -| #define PACKAGE_TARNAME "dosbox" -| #define PACKAGE_VERSION "0.74" -| #define PACKAGE_STRING "dosbox 0.74" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "dosbox" -| #define VERSION "0.74" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define SIZEOF_UNSIGNED_CHAR 1 -| #define SIZEOF_UNSIGNED_SHORT 2 -| #define SIZEOF_UNSIGNED_INT 4 -| #define SIZEOF_UNSIGNED_LONG 4 -| #define SIZEOF_UNSIGNED_LONG_LONG 8 -| #define SIZEOF_INT_P 4 -| #define HAVE_STDLIB_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_SOCKET_H 1 -| #define HAVE_NETINET_IN_H 1 -| #define HAVE_PWD_H 1 -| #define ENVIRON_INCLUDED 1 -| #define ENVIRON_LINKED 1 -| #define DIRENT_HAS_D_TYPE 1 -| #define C_HAS_ATTRIBUTE 1 -| #define C_ATTRIBUTE_ALWAYS_INLINE 1 -| #define C_ATTRIBUTE_FASTCALL 1 -| #define C_HAS_BUILTIN_EXPECT 1 -| #define HAVE_LIBASOUND 1 -| #define HAVE_ALSA 1 -| /* end confdefs.h. */ -| -| /* Override any GCC internal prototype to avoid an error. -| Use char because int might match the return type of a GCC -| builtin and then its argument prototype would still apply. */ -| #ifdef __cplusplus -| extern "C" -| #endif -| char initscr (); -| int -| main () -| { -| return initscr (); -| ; -| return 0; -| } -configure:6552: result: no -configure:6558: checking for initscr in -lncurses -configure:6583: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -lncurses -lasound -lm -ldl -lpthread -L/usr/lib -Wl,-rpath,/usr/lib -lSDL >&5 -configure:6583: $? = 0 -configure:6592: result: yes -configure:6598: checking for initscr in -lpdcurses -configure:6623: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -lpdcurses -lasound -lm -ldl -lpthread -L/usr/lib -Wl,-rpath,/usr/lib -lSDL >&5 -/usr/lib/gcc/i686-pc-linux-gnu/4.6.3/../../../../i686-pc-linux-gnu/bin/ld: cannot find -lpdcurses -collect2: ld returned 1 exit status -configure:6623: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "dosbox" -| #define PACKAGE_TARNAME "dosbox" -| #define PACKAGE_VERSION "0.74" -| #define PACKAGE_STRING "dosbox 0.74" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "dosbox" -| #define VERSION "0.74" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define SIZEOF_UNSIGNED_CHAR 1 -| #define SIZEOF_UNSIGNED_SHORT 2 -| #define SIZEOF_UNSIGNED_INT 4 -| #define SIZEOF_UNSIGNED_LONG 4 -| #define SIZEOF_UNSIGNED_LONG_LONG 8 -| #define SIZEOF_INT_P 4 -| #define HAVE_STDLIB_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_SOCKET_H 1 -| #define HAVE_NETINET_IN_H 1 -| #define HAVE_PWD_H 1 -| #define ENVIRON_INCLUDED 1 -| #define ENVIRON_LINKED 1 -| #define DIRENT_HAS_D_TYPE 1 -| #define C_HAS_ATTRIBUTE 1 -| #define C_ATTRIBUTE_ALWAYS_INLINE 1 -| #define C_ATTRIBUTE_FASTCALL 1 -| #define C_HAS_BUILTIN_EXPECT 1 -| #define HAVE_LIBASOUND 1 -| #define HAVE_ALSA 1 -| /* end confdefs.h. */ -| -| /* Override any GCC internal prototype to avoid an error. -| Use char because int might match the return type of a GCC -| builtin and then its argument prototype would still apply. */ -| #ifdef __cplusplus -| extern "C" -| #endif -| char initscr (); -| int -| main () -| { -| return initscr (); -| ; -| return 0; -| } -configure:6632: result: no -configure:6678: result: enabling inlined memory handling in CPU Core -configure:6689: checking for target cpu type -configure:6703: result: x86 compatible -configure:6749: checking whether x86 dynamic cpu core will be enabled -configure:6758: result: yes -configure:6774: checking whether recompiling cpu core will be enabled -configure:6787: result: no, using dynamic-x86 -configure:6811: checking whether fpu emulation will be enabled -configure:6814: result: yes -configure:6831: checking whether x86 assembly fpu core will be enabled -configure:6841: result: yes -configure:6861: checking whether to enable unaligned memory access -configure:6866: result: yes -configure:6874: checking png.h usability -configure:6874: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:6874: $? = 0 -configure:6874: result: yes -configure:6874: checking png.h presence -configure:6874: gcc -E -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -configure:6874: $? = 0 -configure:6874: result: yes -configure:6874: checking for png.h -configure:6874: result: yes -configure:6880: checking for png_get_io_ptr in -lpng -configure:6905: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -lpng -lz -lasound -lm -ldl -lpthread -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lncurses >&5 -configure:6905: $? = 0 -configure:6914: result: yes -configure:6931: checking SDL_net.h usability -configure:6931: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:6931: $? = 0 -configure:6931: result: yes -configure:6931: checking SDL_net.h presence -configure:6931: gcc -E -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -configure:6931: $? = 0 -configure:6931: result: yes -configure:6931: checking for SDL_net.h -configure:6931: result: yes -configure:6967: checking for SDLNet_Init in -lSDL_net -configure:6992: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -lSDL_net -lasound -lm -ldl -lpthread -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lncurses -lpng -lz >&5 -configure:6992: $? = 0 -configure:7001: result: yes -configure:7020: checking for main in -lX11 -configure:7039: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -lX11 -lasound -lm -ldl -lpthread -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lncurses -lpng -lz -lSDL_net >&5 -configure:7039: $? = 0 -configure:7048: result: yes -configure:7056: checking X11/XKBlib.h usability -configure:7056: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:7056: $? = 0 -configure:7056: result: yes -configure:7056: checking X11/XKBlib.h presence -configure:7056: gcc -E -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -configure:7056: $? = 0 -configure:7056: result: yes -configure:7056: checking for X11/XKBlib.h -configure:7056: result: yes -configure:7064: checking for XKBlib support -configure:7070: result: yes -configure:7078: checking for main in -lGL -configure:7097: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -lGL -lasound -lm -ldl -lpthread -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lncurses -lpng -lz -lSDL_net -lX11 >&5 -configure:7097: $? = 0 -configure:7106: result: yes -configure:7114: checking for main in -lopengl32 -configure:7133: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -lopengl32 -lasound -lm -ldl -lpthread -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lncurses -lpng -lz -lSDL_net -lX11 >&5 -/usr/lib/gcc/i686-pc-linux-gnu/4.6.3/../../../../i686-pc-linux-gnu/bin/ld: cannot find -lopengl32 -collect2: ld returned 1 exit status -configure:7133: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "dosbox" -| #define PACKAGE_TARNAME "dosbox" -| #define PACKAGE_VERSION "0.74" -| #define PACKAGE_STRING "dosbox 0.74" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "dosbox" -| #define VERSION "0.74" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define SIZEOF_UNSIGNED_CHAR 1 -| #define SIZEOF_UNSIGNED_SHORT 2 -| #define SIZEOF_UNSIGNED_INT 4 -| #define SIZEOF_UNSIGNED_LONG 4 -| #define SIZEOF_UNSIGNED_LONG_LONG 8 -| #define SIZEOF_INT_P 4 -| #define HAVE_STDLIB_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_SOCKET_H 1 -| #define HAVE_NETINET_IN_H 1 -| #define HAVE_PWD_H 1 -| #define ENVIRON_INCLUDED 1 -| #define ENVIRON_LINKED 1 -| #define DIRENT_HAS_D_TYPE 1 -| #define C_HAS_ATTRIBUTE 1 -| #define C_ATTRIBUTE_ALWAYS_INLINE 1 -| #define C_ATTRIBUTE_FASTCALL 1 -| #define C_HAS_BUILTIN_EXPECT 1 -| #define HAVE_LIBASOUND 1 -| #define HAVE_ALSA 1 -| #define C_DEBUG 1 -| #define C_HEAVY_DEBUG 1 -| #define C_CORE_INLINE 1 -| #define C_TARGETCPU X86 -| #define C_DYNAMIC_X86 1 -| #define C_FPU 1 -| #define C_FPU_X86 1 -| #define C_UNALIGNED_MEMORY 1 -| #define C_SSHOT 1 -| #define C_MODEM 1 -| #define C_IPX 1 -| #define C_X11_XKB 1 -| /* end confdefs.h. */ -| -| -| int -| main () -| { -| return main (); -| ; -| return 0; -| } -configure:7142: result: no -configure:7150: checking GL/gl.h usability -configure:7150: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:7150: $? = 0 -configure:7150: result: yes -configure:7150: checking GL/gl.h presence -configure:7150: gcc -E -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -configure:7150: $? = 0 -configure:7150: result: yes -configure:7150: checking for GL/gl.h -configure:7150: result: yes -configure:7165: checking whether opengl display output will be enabled -configure:7178: result: yes -configure:7198: checking SDL_sound.h usability -configure:7198: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:7198: $? = 0 -configure:7198: result: yes -configure:7198: checking SDL_sound.h presence -configure:7198: gcc -E -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -configure:7198: $? = 0 -configure:7198: result: yes -configure:7198: checking for SDL_sound.h -configure:7198: result: yes -configure:7204: checking for Sound_Init in -lSDL_sound -configure:7229: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -lSDL_sound -lasound -lm -ldl -lpthread -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lncurses -lpng -lz -lSDL_net -lX11 -lGL >&5 -configure:7229: $? = 0 -configure:7238: result: yes -configure:7244: checking for Sound_Seek in -lSDL_sound -configure:7269: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -lSDL_sound -lasound -lm -ldl -lpthread -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lncurses -lpng -lz -lSDL_net -lX11 -lGL >&5 -configure:7269: $? = 0 -configure:7278: result: yes -configure:7299: checking sys/mman.h usability -configure:7299: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5 -configure:7299: $? = 0 -configure:7299: result: yes -configure:7299: checking sys/mman.h presence -configure:7299: gcc -E -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -configure:7299: $? = 0 -configure:7299: result: yes -configure:7299: checking for sys/mman.h -configure:7299: result: yes -configure:7302: checking for mprotect -configure:7302: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -lSDL_sound -lasound -lm -ldl -lpthread -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lncurses -lpng -lz -lSDL_net -lX11 -lGL >&5 -configure:7302: $? = 0 -configure:7302: result: yes -configure:7314: checking for setpriority support -configure:7325: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -lSDL_sound -lasound -lm -ldl -lpthread -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lncurses -lpng -lz -lSDL_net -lX11 -lGL >&5 -configure:7325: $? = 0 -configure:7326: result: yes -configure:7645: creating ./config.status - -## ---------------------- ## -## Running config.status. ## -## ---------------------- ## - -This file was extended by dosbox config.status 0.74, which was -generated by GNU Autoconf 2.68. Invocation command line was - - CONFIG_FILES = - CONFIG_HEADERS = - CONFIG_LINKS = - CONFIG_COMMANDS = - $ ./config.status - -on tvbox22 - -config.status:945: creating Makefile -config.status:945: creating src/Makefile -config.status:945: creating src/cpu/Makefile -config.status:945: creating src/cpu/core_full/Makefile -config.status:945: creating src/cpu/core_normal/Makefile -config.status:945: creating src/cpu/core_dyn_x86/Makefile -config.status:945: creating src/cpu/core_dynrec/Makefile -config.status:945: creating src/debug/Makefile -config.status:945: creating src/dos/Makefile -config.status:945: creating src/fpu/Makefile -config.status:945: creating src/gui/Makefile -config.status:945: creating src/hardware/Makefile -config.status:945: creating src/hardware/serialport/Makefile -config.status:945: creating src/ints/Makefile -config.status:945: creating src/libs/Makefile -config.status:945: creating src/libs/zmbv/Makefile -config.status:945: creating src/libs/gui_tk/Makefile -config.status:945: creating src/misc/Makefile -config.status:945: creating src/shell/Makefile -config.status:945: creating src/platform/Makefile -config.status:945: creating src/platform/visualc/Makefile -config.status:945: creating visualc_net/Makefile -config.status:945: creating include/Makefile -config.status:945: creating docs/Makefile -config.status:945: creating config.h -config.status:1174: executing depfiles commands - -## ---------------- ## -## Cache variables. ## -## ---------------- ## - -ac_cv_build=i686-pc-linux-gnu -ac_cv_c_bigendian=no -ac_cv_c_compiler_gnu=yes -ac_cv_c_const=yes -ac_cv_c_inline=inline -ac_cv_cxx_compiler_gnu=yes -ac_cv_env_CCC_set= -ac_cv_env_CCC_value= -ac_cv_env_CC_set= -ac_cv_env_CC_value= -ac_cv_env_CFLAGS_set= -ac_cv_env_CFLAGS_value= -ac_cv_env_CPPFLAGS_set= -ac_cv_env_CPPFLAGS_value= -ac_cv_env_CPP_set= -ac_cv_env_CPP_value= -ac_cv_env_CXXFLAGS_set= -ac_cv_env_CXXFLAGS_value= -ac_cv_env_CXX_set= -ac_cv_env_CXX_value= -ac_cv_env_LDFLAGS_set= -ac_cv_env_LDFLAGS_value= -ac_cv_env_LIBS_set= -ac_cv_env_LIBS_value= -ac_cv_env_build_alias_set= -ac_cv_env_build_alias_value= -ac_cv_env_host_alias_set= -ac_cv_env_host_alias_value= -ac_cv_env_target_alias_set= -ac_cv_env_target_alias_value= -ac_cv_func_mprotect=yes -ac_cv_header_GL_gl_h=yes -ac_cv_header_SDL_net_h=yes -ac_cv_header_SDL_sound_h=yes -ac_cv_header_X11_XKBlib_h=yes -ac_cv_header_curses_h=yes -ac_cv_header_inttypes_h=yes -ac_cv_header_memory_h=yes -ac_cv_header_netinet_in_h=yes -ac_cv_header_png_h=yes -ac_cv_header_pwd_h=yes -ac_cv_header_stdc=yes -ac_cv_header_stdint_h=yes -ac_cv_header_stdlib_h=yes -ac_cv_header_string_h=yes -ac_cv_header_strings_h=yes -ac_cv_header_sys_mman_h=yes -ac_cv_header_sys_socket_h=yes -ac_cv_header_sys_stat_h=yes -ac_cv_header_sys_types_h=yes -ac_cv_header_unistd_h=yes -ac_cv_host=i686-pc-linux-gnu -ac_cv_lib_GL_main=yes -ac_cv_lib_SDL_net_SDLNet_Init=yes -ac_cv_lib_SDL_sound_Sound_Init=yes -ac_cv_lib_SDL_sound_Sound_Seek=yes -ac_cv_lib_X11_main=yes -ac_cv_lib_asound_snd_ctl_open=yes -ac_cv_lib_curses_initscr=no -ac_cv_lib_ncurses_initscr=yes -ac_cv_lib_opengl32_main=no -ac_cv_lib_pdcurses_initscr=no -ac_cv_lib_png_png_get_io_ptr=yes -ac_cv_objext=o -ac_cv_path_EGREP='/usr/bin/grep -E' -ac_cv_path_GREP=/usr/bin/grep -ac_cv_path_SDL_CONFIG=/usr/bin/sdl-config -ac_cv_path_install='/usr/bin/install -c' -ac_cv_path_mkdir=/bin/mkdir -ac_cv_prog_AWK=gawk -ac_cv_prog_CPP='gcc -E' -ac_cv_prog_ac_ct_CC=gcc -ac_cv_prog_ac_ct_CXX=g++ -ac_cv_prog_ac_ct_RANLIB=ranlib -ac_cv_prog_cc_c89= -ac_cv_prog_cc_g=yes -ac_cv_prog_cxx_g=yes -ac_cv_prog_make_make_set=yes -ac_cv_sizeof_int_p=4 -ac_cv_sizeof_unsigned_char=1 -ac_cv_sizeof_unsigned_int=4 -ac_cv_sizeof_unsigned_long=4 -ac_cv_sizeof_unsigned_long_long=8 -ac_cv_sizeof_unsigned_short=2 -ac_cv_struct_tm=time.h -ac_cv_type_size_t=yes -am_cv_CC_dependencies_compiler_type=gcc3 -am_cv_CXX_dependencies_compiler_type=gcc3 - -## ----------------- ## -## Output variables. ## -## ----------------- ## - -ACLOCAL='${SHELL} /usr/src/dosbox-x-debug/missing --run aclocal-1.11' -ALSA_CFLAGS='' -ALSA_LIBS=' -lasound -lm -ldl -lpthread' -AMDEPBACKSLASH='\' -AMDEP_FALSE='#' -AMDEP_TRUE='' -AMTAR='${SHELL} /usr/src/dosbox-x-debug/missing --run tar' -AUTOCONF='${SHELL} /usr/src/dosbox-x-debug/missing --run autoconf' -AUTOHEADER='${SHELL} /usr/src/dosbox-x-debug/missing --run autoheader' -AUTOMAKE='${SHELL} /usr/src/dosbox-x-debug/missing --run automake-1.11' -AWK='gawk' -CC='gcc' -CCDEPMODE='depmode=gcc3' -CFLAGS='-g -O2' -CPP='gcc -E' -CPPFLAGS=' -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT' -CXX='g++' -CXXDEPMODE='depmode=gcc3' -CXXFLAGS='-g -O2 ' -CYGPATH_W='echo' -DEFS='-DHAVE_CONFIG_H' -DEPDIR='.deps' -ECHO_C='' -ECHO_N='-n' -ECHO_T='' -EGREP='/usr/bin/grep -E' -EXEEXT='' -FLUID_CFLAGS='' -FLUID_LIBS='' -GREP='/usr/bin/grep' -HAVE_WINDRES_FALSE='' -HAVE_WINDRES_TRUE='#' -INSTALL_DATA='${INSTALL} -m 644' -INSTALL_PROGRAM='${INSTALL}' -INSTALL_SCRIPT='${INSTALL}' -INSTALL_STRIP_PROGRAM='$(install_sh) -c -s' -LDFLAGS='' -LIBOBJS='' -LIBS='-lSDL_sound -lasound -lm -ldl -lpthread -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lncurses -lpng -lz -lSDL_net -lX11 -lGL' -LTLIBOBJS='' -MAKEINFO='${SHELL} /usr/src/dosbox-x-debug/missing --run makeinfo' -MKDIR_P='/bin/mkdir -p' -OBJEXT='o' -PACKAGE='dosbox' -PACKAGE_BUGREPORT='' -PACKAGE_NAME='dosbox' -PACKAGE_STRING='dosbox 0.74' -PACKAGE_TARNAME='dosbox' -PACKAGE_URL='' -PACKAGE_VERSION='0.74' -PATH_SEPARATOR=':' -RANLIB='ranlib' -SDL_CFLAGS='-I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT' -SDL_CONFIG='/usr/bin/sdl-config' -SDL_LIBS='-L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread' -SET_MAKE='' -SHELL='/bin/sh' -STRIP='' -VERSION='0.74' -WINDRES=':' -ac_ct_CC='gcc' -ac_ct_CXX='g++' -am__EXEEXT_FALSE='' -am__EXEEXT_TRUE='#' -am__fastdepCC_FALSE='#' -am__fastdepCC_TRUE='' -am__fastdepCXX_FALSE='#' -am__fastdepCXX_TRUE='' -am__include='include' -am__isrc='' -am__leading_dot='.' -am__quote='' -am__tar='${AMTAR} chof - "$$tardir"' -am__untar='${AMTAR} xf -' -bindir='${exec_prefix}/bin' -build='i686-pc-linux-gnu' -build_alias='' -build_cpu='i686' -build_os='linux-gnu' -build_vendor='pc' -datadir='${datarootdir}' -datarootdir='${prefix}/share' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -dvidir='${docdir}' -exec_prefix='${prefix}' -host='i686-pc-linux-gnu' -host_alias='' -host_cpu='i686' -host_os='linux-gnu' -host_vendor='pc' -htmldir='${docdir}' -includedir='${prefix}/include' -infodir='${datarootdir}/info' -install_sh='${SHELL} /usr/src/dosbox-x-debug/install-sh' -libdir='${exec_prefix}/lib' -libexecdir='${exec_prefix}/libexec' -localedir='${datarootdir}/locale' -localstatedir='${prefix}/var' -mandir='${datarootdir}/man' -mkdir_p='/bin/mkdir -p' -oldincludedir='/usr/include' -pdfdir='${docdir}' -prefix='/usr' -program_transform_name='s,x,x,' -psdir='${docdir}' -sbindir='${exec_prefix}/sbin' -sharedstatedir='${prefix}/com' -sysconfdir='${prefix}/etc' -target_alias='' - -## ----------- ## -## confdefs.h. ## -## ----------- ## - -/* confdefs.h */ -#define PACKAGE_NAME "dosbox" -#define PACKAGE_TARNAME "dosbox" -#define PACKAGE_VERSION "0.74" -#define PACKAGE_STRING "dosbox 0.74" -#define PACKAGE_BUGREPORT "" -#define PACKAGE_URL "" -#define PACKAGE "dosbox" -#define VERSION "0.74" -#define STDC_HEADERS 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_STRINGS_H 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_UNISTD_H 1 -#define SIZEOF_UNSIGNED_CHAR 1 -#define SIZEOF_UNSIGNED_SHORT 2 -#define SIZEOF_UNSIGNED_INT 4 -#define SIZEOF_UNSIGNED_LONG 4 -#define SIZEOF_UNSIGNED_LONG_LONG 8 -#define SIZEOF_INT_P 4 -#define HAVE_STDLIB_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_SYS_SOCKET_H 1 -#define HAVE_NETINET_IN_H 1 -#define HAVE_PWD_H 1 -#define ENVIRON_INCLUDED 1 -#define ENVIRON_LINKED 1 -#define DIRENT_HAS_D_TYPE 1 -#define C_HAS_ATTRIBUTE 1 -#define C_ATTRIBUTE_ALWAYS_INLINE 1 -#define C_ATTRIBUTE_FASTCALL 1 -#define C_HAS_BUILTIN_EXPECT 1 -#define HAVE_LIBASOUND 1 -#define HAVE_ALSA 1 -#define C_DEBUG 1 -#define C_HEAVY_DEBUG 1 -#define C_CORE_INLINE 1 -#define C_TARGETCPU X86 -#define C_DYNAMIC_X86 1 -#define C_FPU 1 -#define C_FPU_X86 1 -#define C_UNALIGNED_MEMORY 1 -#define C_SSHOT 1 -#define C_MODEM 1 -#define C_IPX 1 -#define C_X11_XKB 1 -#define C_OPENGL 1 -#define C_SDL_SOUND 1 -#define C_HAVE_MPROTECT 1 -#define C_SET_PRIORITY 1 -#define LINUX 1 -#define C_DIRECTSERIAL 1 - -configure: exit 0 - -## ---------------------- ## -## Running config.status. ## -## ---------------------- ## - -This file was extended by dosbox config.status 0.74, which was -generated by GNU Autoconf 2.68. Invocation command line was - - CONFIG_FILES = - CONFIG_HEADERS = - CONFIG_LINKS = - CONFIG_COMMANDS = - $ ./config.status config.h - -on tvbox22 - -config.status:945: creating config.h -config.status:1126: config.h is unchanged diff --git a/configure b/configure old mode 100644 new mode 100755 index 61ccd4a57..7cc305024 --- a/configure +++ b/configure @@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for dosbox 0.74. +# Generated by GNU Autoconf 2.69 for dosbox 0.74. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,6 +132,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -212,21 +236,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -328,6 +356,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -449,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # 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). @@ -483,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... 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'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -504,28 +544,8 @@ else 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 +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1199,8 +1219,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_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 @@ -1471,9 +1489,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF dosbox configure 0.74 -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1666,7 +1684,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1787,7 +1805,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1803,7 +1822,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1829,7 +1849,8 @@ int main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1845,7 +1866,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1879,7 +1901,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2106,7 +2129,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by dosbox $as_me 0.74, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2597,7 +2620,7 @@ case $as_dir/ in #(( # 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 as_fn_executable_p "$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. @@ -2766,7 +2789,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2806,7 +2829,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2857,7 +2880,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2910,7 +2933,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3092,7 +3115,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3132,7 +3155,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3185,7 +3208,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3226,7 +3249,7 @@ 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 as_fn_executable_p "$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 @@ -3284,7 +3307,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3328,7 +3351,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3774,8 +3797,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* 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); @@ -4214,7 +4236,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4258,7 +4280,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4588,7 +4610,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4628,7 +4650,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4727,7 +4749,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4953,11 +4975,11 @@ else int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -4974,8 +4996,9 @@ main () ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -4991,10 +5014,10 @@ main () iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -5081,7 +5104,7 @@ do 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 + as_fn_executable_p "$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 @@ -5147,7 +5170,7 @@ do 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 + as_fn_executable_p "$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 @@ -7410,7 +7433,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_WINDRES="${ac_tool_prefix}windres" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7450,7 +7473,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_WINDRES="windres" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7935,16 +7958,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... 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'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -8004,28 +8027,16 @@ else 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 + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -8047,7 +8058,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by dosbox $as_me 0.74, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -8113,10 +8124,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ dosbox config.status 0.74 -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -8207,7 +8218,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff --git a/git-source-pickup.pl~ b/git-source-pickup.pl~ deleted file mode 100755 index ef8cf3520..000000000 --- a/git-source-pickup.pl~ +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/perl - -$project = 'isp-utils-v4'; - -print "Ensuring the build tree is clean...\n"; -$x = system("./git-update-all-wo-push"); -die unless $x == 0; - -if (!open(S,"git --no-pager log --max-count=1 |")) { exit 1; } -my $lcommit = "x"; -my $i,$lcdate = "unknown"; -foreach my $line () { - chomp $line; - - if ($line =~ m/^commit +/) { - $lcommit = lc($'); - $lcommit =~ s/ +$//; - } - else { - my @nv = split(/: +/,$line); - my $value = $nv[1]; - my $name = $nv[0]; - - if ($name =~ m/^Date$/i) { - # Fri Apr 15 08:51:32 2011 -0700 - # 0 1 2 3 4 5 - my @b = split(/ +/,$value); - - $mon = lc($b[1]); - $day = $b[2]; - $time = $b[3]; - $year = $b[4]; - $mon = 1 if $mon eq "jan"; - $mon = 2 if $mon eq "feb"; - $mon = 3 if $mon eq "mar"; - $mon = 4 if $mon eq "apr"; - $mon = 5 if $mon eq "may"; - $mon = 6 if $mon eq "jun"; - $mon = 7 if $mon eq "jul"; - $mon = 8 if $mon eq "aug"; - $mon = 9 if $mon eq "sep"; - $mon = 10 if $mon eq "oct"; - $mon = 11 if $mon eq "nov"; - $mon = 12 if $mon eq "dec"; - $mon = $mon+0; - $date = sprintf("%04u%02u%02u",$year+0,$mon,$day+0); - $time =~ s/://g; - $lcdate = $date."-".$time; - } - } -} -close(S); - -#my $filename = $project."-rev-".sprintf("%08u",$lcrev)."-src.tar.bz2"; -my $pwd = `pwd`; chomp $pwd; -my $filename = "../".($as ne "" ? $as : $project)."-$lcdate-commit-$lcommit-src.tar"; -if (!( -f "$filename.xz" )) { - print "Packing source (all build files except LIB,OBJ,etc.)\n"; - print " to: $filename\n"; - - $x = system("tar -C .. -cvf $filename $project"); # --exclude=.git - die unless $x == 0; - print "Packing to XZ\n"; - $x = system("xz -6e $filename"); - die unless $x == 0; -} - diff --git a/visualc_net/zlib/contrib/minizip/Makefile.in b/visualc_net/zlib/contrib/minizip/Makefile.in new file mode 100644 index 000000000..e69de29bb