nam Change Log

diff -Nru nam-1.15~RC4/agent.cc nam-1.15/agent.cc --- nam-1.15~RC4/agent.cc 2010-09-05 23:23:19.000000000 +0000 +++ nam-1.15/agent.cc 2011-11-04 17:18:41.000000000 +0000 @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /cvsroot/nsnam/nam-1/agent.cc,v 1.39 2001/08/10 01:45:46 mehringe Exp $ (LBL) + * @(#) $Header: /cvsroot/nsnam/nam-1/agent.cc,v 1.40 2011/11/02 16:08:03 tom_henderson Exp $ (LBL) */ #include @@ -797,8 +797,6 @@ //---------------------------------------------------------------------- //---------------------------------------------------------------------- const char* Agent::property() { - rgb *color; - color=Paint::instance()->paint_to_rgb(paint_); static char text[256]; char * p; diff -Nru nam-1.15~RC4/autoconf.h nam-1.15/autoconf.h --- nam-1.15~RC4/autoconf.h 2010-09-05 23:23:20.000000000 +0000 +++ nam-1.15/autoconf.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -/* autoconf.h. Generated from autoconf.h.in by configure. */ -/* -*- Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */ -/* - * Copyright (c) 1997 University of Southern California. - * All rights reserved. - * - * Redistribution and use in source and binary forms are permitted - * provided that the above copyright notice and this paragraph are - * duplicated in all such forms and that any documentation, advertising - * materials, and other materials related to such distribution and use - * acknowledge that the software was developed by the University of - * Southern California, Information Sciences Institute. The name of the - * University may not be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -/* This file should contain variables changed only by autoconf. */ - - -/* - * Put autoconf #define's here to keep them off the command line. - * see autoconf.info(Header Templates) in the autoconf docs. - */ - -/* what does random(3) return? */ -#define RANDOM_RETURN_TYPE long - -/* type definitions */ -/* #undef int8_t */ -/* #undef int16_t */ -/* #undef int32_t */ -/* #undef u_int8_t */ -/* #undef u_int16_t */ -/* #undef u_int32_t */ - -/* functions */ -/* #undef HAVE_BCOPY */ -/* #undef HAVE_BZERO */ -/* #undef HAVE_GETRUSAGE */ -/* #undef HAVE_SBRK */ -#define HAVE_SNPRINTF 1 -#define HAVE_STRTOLL 1 -#define HAVE_STRTOQ 1 - -/* headers */ -#define HAVE_STRING_H 1 -#define HAVE_STRINGS_H 1 - diff -Nru nam-1.15~RC4/CHANGES.html nam-1.15/CHANGES.html --- nam-1.15~RC4/CHANGES.html 2010-09-05 23:23:16.000000000 +0000 +++ nam-1.15/CHANGES.html 2011-11-04 17:20:39.000000000 +0000 @@ -1,7 +1,7 @@ nam Change Log - + @@ -13,6 +13,11 @@ with the most recent changes coming first. -->

nam-1.15 +Released Fri Nov 4 2011

Tcl-8.5 support, improved OS X support

+ +

nam-1.14 Released June 17 2009

Refresh packages, some improved 64-bit support

diff -Nru nam-1.15~RC4/conf/configure.in.otcl nam-1.15/conf/configure.in.otcl --- nam-1.15~RC4/conf/configure.in.otcl 2010-09-05 23:23:20.000000000 +0000 +++ nam-1.15/conf/configure.in.otcl 2011-11-04 17:18:42.000000000 +0000 @@ -1,5 +1,5 @@ dnl autoconf rules to find otcl -dnl $Header: /cvsroot/nsnam/conf/configure.in.otcl,v 1.23 2010/02/16 06:07:43 tom_henderson Exp $ (LBL) +dnl $Header: /cvsroot/nsnam/conf/configure.in.otcl,v 1.25 2011/10/31 04:33:25 tom_henderson Exp $ (LBL) AC_ARG_WITH(otcl, --with-otcl=path specify a pathname for otcl, d=$withval, d="") diff -Nru nam-1.15~RC4/config.log nam-1.15/config.log --- nam-1.15~RC4/config.log 2010-09-05 23:23:20.000000000 +0000 +++ nam-1.15/config.log 1970-01-01 00:00:00.000000000 +0000 @@ -1,1317 +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 configure, which was -generated by GNU Autoconf 2.63. Invocation command line was - - $ ./configure - -## --------- ## -## Platform. ## -## --------- ## - -hostname = ns-fedora-core-12 -uname -m = i686 -uname -r = 2.6.31.5-127.fc12.i686.PAE -uname -s = Linux -uname -v = #1 SMP Sat Nov 7 21:25:57 EST 2009 - -/usr/bin/uname -p = unknown -/bin/uname -X = unknown - -/bin/arch = i686 -/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/kerberos/sbin -PATH: /usr/kerberos/bin -PATH: /usr/local/bin -PATH: /bin -PATH: /usr/bin -PATH: /usr/local/sbin -PATH: /usr/sbin -PATH: /sbin -PATH: /home/tomh/bin - - -## ----------- ## -## Core tests. ## -## ----------- ## - -configure:1923: checking for gcc -configure:1939: found /usr/bin/gcc -configure:1950: result: gcc -configure:2182: checking for C compiler version -configure:2190: gcc --version >&5 -gcc (GCC) 4.4.2 20091027 (Red Hat 4.4.2-7) -Copyright (C) 2009 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:2194: $? = 0 -configure:2201: gcc -v >&5 -Using built-in specs. -Target: i686-redhat-linux -Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk --disable-dssi --enable-plugin --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre --enable-libgcj-multifile --enable-java-maintainer-mode --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --disable-libjava-multilib --with-ppl --with-cloog --with-tune=generic --with-arch=i686 --build=i686-redhat-linux -Thread model: posix -gcc version 4.4.2 20091027 (Red Hat 4.4.2-7) (GCC) -configure:2205: $? = 0 -configure:2212: gcc -V >&5 -gcc: '-V' option must have argument -configure:2216: $? = 1 -configure:2239: checking for C compiler default output file name -configure:2261: gcc conftest.c >&5 -configure:2265: $? = 0 -configure:2303: result: a.out -configure:2322: checking whether the C compiler works -configure:2332: ./a.out -configure:2336: $? = 0 -configure:2355: result: yes -configure:2362: checking whether we are cross compiling -configure:2364: result: no -configure:2367: checking for suffix of executables -configure:2374: gcc -o conftest conftest.c >&5 -configure:2378: $? = 0 -configure:2404: result: -configure:2410: checking for suffix of object files -configure:2436: gcc -c conftest.c >&5 -configure:2440: $? = 0 -configure:2465: result: o -configure:2469: checking whether we are using the GNU C compiler -configure:2498: gcc -c conftest.c >&5 -configure:2505: $? = 0 -configure:2522: result: yes -configure:2531: checking whether gcc accepts -g -configure:2561: gcc -c -g conftest.c >&5 -configure:2568: $? = 0 -configure:2669: result: yes -configure:2686: checking for gcc option to accept ISO C89 -configure:2760: gcc -c -g -O2 conftest.c >&5 -configure:2767: $? = 0 -configure:2790: result: none needed -configure:2814: checking how to run the C preprocessor -configure:2854: gcc -E conftest.c -configure:2861: $? = 0 -configure:2892: gcc -E conftest.c -conftest.c:8:28: error: ac_nonexistent.h: No such file or directory -configure:2899: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| /* end confdefs.h. */ -| #include -configure:2932: result: gcc -E -configure:2961: gcc -E conftest.c -configure:2968: $? = 0 -configure:2999: gcc -E conftest.c -conftest.c:8:28: error: ac_nonexistent.h: No such file or directory -configure:3006: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| /* end confdefs.h. */ -| #include -configure:3046: checking for grep that handles long lines and -e -configure:3106: result: /bin/grep -configure:3111: checking for egrep -configure:3175: result: /bin/grep -E -configure:3180: checking for ANSI C header files -configure:3210: gcc -c -g -O2 conftest.c >&5 -configure:3217: $? = 0 -configure:3316: gcc -o conftest -g -O2 conftest.c >&5 -configure:3320: $? = 0 -configure:3326: ./conftest -configure:3330: $? = 0 -configure:3348: result: yes -configure:3464: checking build system type -configure:3482: result: i686-pc-linux-gnu -configure:3504: checking host system type -configure:3519: result: i686-pc-linux-gnu -configure:3541: checking target system type -configure:3556: result: i686-pc-linux-gnu -configure:3633: checking for gcc -configure:3660: result: gcc -configure:3892: checking for C compiler version -configure:3900: gcc --version >&5 -gcc (GCC) 4.4.2 20091027 (Red Hat 4.4.2-7) -Copyright (C) 2009 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:3904: $? = 0 -configure:3911: gcc -v >&5 -Using built-in specs. -Target: i686-redhat-linux -Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk --disable-dssi --enable-plugin --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre --enable-libgcj-multifile --enable-java-maintainer-mode --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --disable-libjava-multilib --with-ppl --with-cloog --with-tune=generic --with-arch=i686 --build=i686-redhat-linux -Thread model: posix -gcc version 4.4.2 20091027 (Red Hat 4.4.2-7) (GCC) -configure:3915: $? = 0 -configure:3922: gcc -V >&5 -gcc: '-V' option must have argument -configure:3926: $? = 1 -configure:3929: checking whether we are using the GNU C compiler -configure:3982: result: yes -configure:3991: checking whether gcc accepts -g -configure:4129: result: yes -configure:4146: checking for gcc option to accept ISO C89 -configure:4250: result: none needed -configure:4326: checking for g++ -configure:4342: found /usr/bin/g++ -configure:4353: result: g++ -configure:4380: checking for C++ compiler version -configure:4388: g++ --version >&5 -g++ (GCC) 4.4.2 20091027 (Red Hat 4.4.2-7) -Copyright (C) 2009 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:4392: $? = 0 -configure:4399: g++ -v >&5 -Using built-in specs. -Target: i686-redhat-linux -Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk --disable-dssi --enable-plugin --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre --enable-libgcj-multifile --enable-java-maintainer-mode --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --disable-libjava-multilib --with-ppl --with-cloog --with-tune=generic --with-arch=i686 --build=i686-redhat-linux -Thread model: posix -gcc version 4.4.2 20091027 (Red Hat 4.4.2-7) (GCC) -configure:4403: $? = 0 -configure:4410: g++ -V >&5 -g++: '-V' option must have argument -configure:4414: $? = 1 -configure:4417: checking whether we are using the GNU C++ compiler -configure:4446: g++ -c conftest.cpp >&5 -configure:4453: $? = 0 -configure:4470: result: yes -configure:4479: checking whether g++ accepts -g -configure:4509: g++ -c -g conftest.cpp >&5 -configure:4516: $? = 0 -configure:4617: result: yes -configure:4640: checking for ANSI C header files -configure:4808: result: yes -configure:4832: checking for sys/types.h -configure:4853: gcc -c -g -O2 conftest.c >&5 -configure:4860: $? = 0 -configure:4877: result: yes -configure:4832: checking for sys/stat.h -configure:4853: gcc -c -g -O2 conftest.c >&5 -configure:4860: $? = 0 -configure:4877: result: yes -configure:4832: checking for stdlib.h -configure:4853: gcc -c -g -O2 conftest.c >&5 -configure:4860: $? = 0 -configure:4877: result: yes -configure:4832: checking for string.h -configure:4853: gcc -c -g -O2 conftest.c >&5 -configure:4860: $? = 0 -configure:4877: result: yes -configure:4832: checking for memory.h -configure:4853: gcc -c -g -O2 conftest.c >&5 -configure:4860: $? = 0 -configure:4877: result: yes -configure:4832: checking for strings.h -configure:4853: gcc -c -g -O2 conftest.c >&5 -configure:4860: $? = 0 -configure:4877: result: yes -configure:4832: checking for inttypes.h -configure:4853: gcc -c -g -O2 conftest.c >&5 -configure:4860: $? = 0 -configure:4877: result: yes -configure:4832: checking for stdint.h -configure:4853: gcc -c -g -O2 conftest.c >&5 -configure:4860: $? = 0 -configure:4877: result: yes -configure:4832: checking for unistd.h -configure:4853: gcc -c -g -O2 conftest.c >&5 -configure:4860: $? = 0 -configure:4877: result: yes -configure:4896: checking for string.h -configure:4903: result: yes -configure:5047: checking for main in -lXbsd -configure:5076: gcc -o conftest -g -O2 conftest.c -lXbsd >&5 -/usr/bin/ld: cannot find -lXbsd -collect2: ld returned 1 exit status -configure:5083: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define STDC_HEADERS 1 -| #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 HAVE_STRING_H 1 -| /* end confdefs.h. */ -| -| -| int -| main () -| { -| return main (); -| ; -| return 0; -| } -configure:5104: result: no -configure:5110: checking for socket in -lsocket -configure:5145: gcc -o conftest -g -O2 conftest.c -lsocket >&5 -/usr/bin/ld: cannot find -lsocket -collect2: ld returned 1 exit status -configure:5152: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define STDC_HEADERS 1 -| #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 HAVE_STRING_H 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 socket (); -| int -| main () -| { -| return socket (); -| ; -| return 0; -| } -configure:5173: result: no -configure:5179: checking for gethostbyname in -lnsl -configure:5214: gcc -o conftest -g -O2 conftest.c -lnsl >&5 -configure:5221: $? = 0 -configure:5242: result: yes -configure:5248: checking for dcgettext in -lintl -configure:5283: gcc -o conftest -g -O2 conftest.c -lintl >&5 -conftest.c:27: warning: conflicting types for built-in function 'dcgettext' -/usr/bin/ld: cannot find -lintl -collect2: ld returned 1 exit status -configure:5290: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define STDC_HEADERS 1 -| #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 HAVE_STRING_H 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 dcgettext (); -| int -| main () -| { -| return dcgettext (); -| ; -| return 0; -| } -configure:5311: result: no -configure:5317: checking for getnodebyname in -ldnet_stub -configure:5352: gcc -o conftest -g -O2 conftest.c -ldnet_stub >&5 -/usr/bin/ld: cannot find -ldnet_stub -collect2: ld returned 1 exit status -configure:5359: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define STDC_HEADERS 1 -| #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 HAVE_STRING_H 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 getnodebyname (); -| int -| main () -| { -| return getnodebyname (); -| ; -| return 0; -| } -configure:5380: result: no -configure:5426: checking that g++ can handle -O2 -configure:5457: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:26: error: 'error' undeclared (first use in this function) -conftest.c:26: error: (Each undeclared identifier is reported only once -conftest.c:26: error: for each function it appears in.) -conftest.c:30: error: expected ';' before 'int' -configure:5464: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define STDC_HEADERS 1 -| #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 HAVE_STRING_H 1 -| /* end confdefs.h. */ -| -| int -| main () -| { -| #if __GNUC__ < 2 || __GNUC_MINOR__ < 8 -| /* gcc */ -| error -| #endif -| #if __GNUC_MINOR__ < 92 -| /* egcs */ -| int error; -| #endif -| -| ; -| return 0; -| } -configure:5477: result: no -configure:5743: checking for zlib.h -configure:5796: result: -I/usr/include -configure:5802: checking for libz1.2.3 -configure:5866: result: -L/usr/lib -lz -configure:5962: gcc -E conftest.c -configure:5969: $? = 0 -configure:6003: checking for XOpenDisplay in -lX11 -configure:6038: gcc -o conftest -g -O2 conftest.c -lX11 >&5 -configure:6045: $? = 0 -configure:6066: result: yes -configure:6092: checking for XShmAttach in -lXext -configure:6127: gcc -o conftest -g -O2 conftest.c -lXext -lX11 >&5 -configure:6134: $? = 0 -configure:6155: result: yes -configure:6401: checking for tcl.h -configure:6454: result: -I/usr/include -configure:6460: checking for tclInt.h -configure:6513: result: -I/usr/include/tcl-private/generic -configure:6519: checking for libtcl8.5 -configure:6583: result: -L/usr/lib -ltcl8.5 -configure:6589: checking for init.tcl -configure:6628: result: /usr/share/tcl8.5 -configure:6646: checking for http.tcl -configure:6685: result: /usr/share/tcl8.5/http1.0 -configure:6690: checking Tcl http.tcl library -configure:6694: result: yes -configure:6717: checking for tclsh8.5.7 -configure:6750: result: no -configure:6717: checking for tclsh8.5 -configure:6735: found /usr/bin/tclsh8.5 -configure:6747: result: /usr/bin/tclsh8.5 -configure:6989: checking for tk.h -configure:7042: result: -I/usr/include -configure:7048: checking for libtk8.5 -configure:7112: result: -L/usr/lib -ltk8.5 -configure:7118: checking for tk.tcl -configure:7157: result: /usr/share/tk8.5 -configure:7250: checking for libtcldbg -configure:7295: result: no -configure:7427: checking for otcl.h -configure:7480: result: -I../otcl -configure:7486: checking for libotcl1.13 -configure:7550: result: -L../otcl -lotcl -configure:7677: checking for tclcl.h -configure:7730: result: -I../tclcl -configure:7736: checking for libtclcl -configure:7800: result: -L../tclcl -ltclcl -configure:7806: checking for tcl2c++ -configure:7845: result: ../tclcl -configure:7893: checking return type of random -configure:7923: gcc -o conftest -g -O2 conftest.c >&5 -configure:7927: $? = 0 -configure:7933: ./conftest -configure:7937: $? = 0 -configure:7939: result: long -configure:7966: checking for int8_t -configure:7994: gcc -c -g -O2 conftest.c >&5 -configure:8001: $? = 0 -configure:8028: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:68: error: expected expression before ')' token -configure:8035: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define STDC_HEADERS 1 -| #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 HAVE_STRING_H 1 -| #define HAVE_ZLIB_H 1 -| #define HAVE_LIBZ1_2_3 1 -| #define HAVE_TCL_H 1 -| #define HAVE_TCLINT_H 1 -| #define HAVE_LIBTCL8_5 1 -| #define HAVE_TK_H 1 -| #define HAVE_LIBTK8_5 1 -| #define HAVE_OTCL_H 1 -| #define HAVE_LIBOTCL1_13 1 -| #define HAVE_TCLCL_H 1 -| #define HAVE_LIBTCLCL 1 -| #define RANDOM_RETURN_TYPE long -| /* 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 ((int8_t))) -| return 0; -| ; -| return 0; -| } -configure:8058: result: yes -configure:8070: checking for int16_t -configure:8098: gcc -c -g -O2 conftest.c >&5 -configure:8105: $? = 0 -configure:8132: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:68: error: expected expression before ')' token -configure:8139: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define STDC_HEADERS 1 -| #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 HAVE_STRING_H 1 -| #define HAVE_ZLIB_H 1 -| #define HAVE_LIBZ1_2_3 1 -| #define HAVE_TCL_H 1 -| #define HAVE_TCLINT_H 1 -| #define HAVE_LIBTCL8_5 1 -| #define HAVE_TK_H 1 -| #define HAVE_LIBTK8_5 1 -| #define HAVE_OTCL_H 1 -| #define HAVE_LIBOTCL1_13 1 -| #define HAVE_TCLCL_H 1 -| #define HAVE_LIBTCLCL 1 -| #define RANDOM_RETURN_TYPE long -| /* 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 ((int16_t))) -| return 0; -| ; -| return 0; -| } -configure:8162: result: yes -configure:8174: checking for int32_t -configure:8202: gcc -c -g -O2 conftest.c >&5 -configure:8209: $? = 0 -configure:8236: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:68: error: expected expression before ')' token -configure:8243: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define STDC_HEADERS 1 -| #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 HAVE_STRING_H 1 -| #define HAVE_ZLIB_H 1 -| #define HAVE_LIBZ1_2_3 1 -| #define HAVE_TCL_H 1 -| #define HAVE_TCLINT_H 1 -| #define HAVE_LIBTCL8_5 1 -| #define HAVE_TK_H 1 -| #define HAVE_LIBTK8_5 1 -| #define HAVE_OTCL_H 1 -| #define HAVE_LIBOTCL1_13 1 -| #define HAVE_TCLCL_H 1 -| #define HAVE_LIBTCLCL 1 -| #define RANDOM_RETURN_TYPE long -| /* 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 ((int32_t))) -| return 0; -| ; -| return 0; -| } -configure:8266: result: yes -configure:8278: checking for u_int8_t -configure:8306: gcc -c -g -O2 conftest.c >&5 -configure:8313: $? = 0 -configure:8340: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:68: error: expected expression before ')' token -configure:8347: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define STDC_HEADERS 1 -| #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 HAVE_STRING_H 1 -| #define HAVE_ZLIB_H 1 -| #define HAVE_LIBZ1_2_3 1 -| #define HAVE_TCL_H 1 -| #define HAVE_TCLINT_H 1 -| #define HAVE_LIBTCL8_5 1 -| #define HAVE_TK_H 1 -| #define HAVE_LIBTK8_5 1 -| #define HAVE_OTCL_H 1 -| #define HAVE_LIBOTCL1_13 1 -| #define HAVE_TCLCL_H 1 -| #define HAVE_LIBTCLCL 1 -| #define RANDOM_RETURN_TYPE long -| /* 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 ((u_int8_t))) -| return 0; -| ; -| return 0; -| } -configure:8370: result: yes -configure:8382: checking for u_int16_t -configure:8410: gcc -c -g -O2 conftest.c >&5 -configure:8417: $? = 0 -configure:8444: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:68: error: expected expression before ')' token -configure:8451: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define STDC_HEADERS 1 -| #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 HAVE_STRING_H 1 -| #define HAVE_ZLIB_H 1 -| #define HAVE_LIBZ1_2_3 1 -| #define HAVE_TCL_H 1 -| #define HAVE_TCLINT_H 1 -| #define HAVE_LIBTCL8_5 1 -| #define HAVE_TK_H 1 -| #define HAVE_LIBTK8_5 1 -| #define HAVE_OTCL_H 1 -| #define HAVE_LIBOTCL1_13 1 -| #define HAVE_TCLCL_H 1 -| #define HAVE_LIBTCLCL 1 -| #define RANDOM_RETURN_TYPE long -| /* 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 ((u_int16_t))) -| return 0; -| ; -| return 0; -| } -configure:8474: result: yes -configure:8486: checking for u_int32_t -configure:8514: gcc -c -g -O2 conftest.c >&5 -configure:8521: $? = 0 -configure:8548: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:68: error: expected expression before ')' token -configure:8555: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define STDC_HEADERS 1 -| #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 HAVE_STRING_H 1 -| #define HAVE_ZLIB_H 1 -| #define HAVE_LIBZ1_2_3 1 -| #define HAVE_TCL_H 1 -| #define HAVE_TCLINT_H 1 -| #define HAVE_LIBTCL8_5 1 -| #define HAVE_TK_H 1 -| #define HAVE_LIBTK8_5 1 -| #define HAVE_OTCL_H 1 -| #define HAVE_LIBOTCL1_13 1 -| #define HAVE_TCLCL_H 1 -| #define HAVE_LIBTCLCL 1 -| #define RANDOM_RETURN_TYPE long -| /* 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 ((u_int32_t))) -| return 0; -| ; -| return 0; -| } -configure:8578: result: yes -configure:8597: checking for strtoq -configure:8653: gcc -o conftest -g -O2 conftest.c >&5 -configure:8660: $? = 0 -configure:8682: result: yes -configure:8597: checking for strtoll -configure:8653: gcc -o conftest -g -O2 conftest.c >&5 -configure:8660: $? = 0 -configure:8682: result: yes -configure:8703: checking size of long -configure:9008: gcc -o conftest -g -O2 conftest.c >&5 -configure:9012: $? = 0 -configure:9018: ./conftest -configure:9022: $? = 0 -configure:9048: result: 4 -configure:9149: checking for __int64_t -configure:9174: gcc -o conftest -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:36: error: '__int64_t' undeclared (first use in this function) -conftest.c:36: error: (Each undeclared identifier is reported only once -conftest.c:36: error: for each function it appears in.) -conftest.c:36: error: expected ';' before 'x' -conftest.c:36: warning: incompatible implicit declaration of built-in function 'exit' -conftest.c:36: error: 'x' undeclared (first use in this function) -configure:9178: $? = 1 -configure: program exited with status 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define STDC_HEADERS 1 -| #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 HAVE_STRING_H 1 -| #define HAVE_ZLIB_H 1 -| #define HAVE_LIBZ1_2_3 1 -| #define HAVE_TCL_H 1 -| #define HAVE_TCLINT_H 1 -| #define HAVE_LIBTCL8_5 1 -| #define HAVE_TK_H 1 -| #define HAVE_LIBTK8_5 1 -| #define HAVE_OTCL_H 1 -| #define HAVE_LIBOTCL1_13 1 -| #define HAVE_TCLCL_H 1 -| #define HAVE_LIBTCLCL 1 -| #define RANDOM_RETURN_TYPE long -| #define HAVE_STRTOQ 1 -| #define HAVE_STRTOLL 1 -| #define SIZEOF_LONG 4 -| /* end confdefs.h. */ -| -| main() { __int64_t x; exit (sizeof(x) >= 8 ? 0 : 1); } -| -configure:9205: result: no -configure:9211: checking for long long -configure:9236: gcc -o conftest -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:36: warning: incompatible implicit declaration of built-in function 'exit' -configure:9240: $? = 0 -configure:9246: ./conftest -configure:9250: $? = 0 -configure:9267: result: yes -configure:9275: checking for int64_t -configure:9301: result: yes -configure:9312: checking which kind of 64-bit int to use -configure:9325: result: int64_t -configure:9347: checking for snprintf -configure:9403: gcc -o conftest -g -O2 conftest.c >&5 -conftest.c:59: warning: conflicting types for built-in function 'snprintf' -configure:9410: $? = 0 -configure:9432: result: yes -configure:9487: checking for dlopen in -ldl -configure:9522: gcc -o conftest -g -O2 conftest.c -ldl >&5 -configure:9529: $? = 0 -configure:9550: result: yes -configure:9751: checking for a BSD-compatible install -configure:9819: result: /usr/bin/install -c -configure:9936: creating ./config.status - -## ---------------------- ## -## Running config.status. ## -## ---------------------- ## - -This file was extended by config.status, which was -generated by GNU Autoconf 2.63. Invocation command line was - - CONFIG_FILES = - CONFIG_HEADERS = - CONFIG_LINKS = - CONFIG_COMMANDS = - $ ./config.status - -on ns-fedora-core-12 - -config.status:794: creating Makefile -config.status:941: WARNING: 'Makefile.in' seems to ignore the --datarootdir setting -config.status:794: creating autoconf.h - -## ---------------- ## -## Cache variables. ## -## ---------------- ## - -ac_cv_build=i686-pc-linux-gnu -ac_cv_c_compiler_gnu=yes -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_snprintf=yes -ac_cv_func_strtoll=yes -ac_cv_func_strtoq=yes -ac_cv_header_inttypes_h=yes -ac_cv_header_memory_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_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_X11_XOpenDisplay=yes -ac_cv_lib_Xbsd_main=no -ac_cv_lib_Xext_XShmAttach=yes -ac_cv_lib_dl_dlopen=yes -ac_cv_lib_dnet_stub_getnodebyname=no -ac_cv_lib_intl_dcgettext=no -ac_cv_lib_nsl_gethostbyname=yes -ac_cv_lib_socket_socket=no -ac_cv_objext=o -ac_cv_path_EGREP='/bin/grep -E' -ac_cv_path_GREP=/bin/grep -ac_cv_path_V_TCLSH=/usr/bin/tclsh8.5 -ac_cv_path_install='/usr/bin/install -c' -ac_cv_prog_CPP='gcc -E' -ac_cv_prog_ac_ct_CC=gcc -ac_cv_prog_ac_ct_CXX=g++ -ac_cv_prog_cc_c89= -ac_cv_prog_cc_g=yes -ac_cv_prog_cxx_g=yes -ac_cv_sizeof_long=4 -ac_cv_target=i686-pc-linux-gnu -ac_cv_type_int16_t=yes -ac_cv_type_int32_t=yes -ac_cv_type_int64_t=yes -ac_cv_type_int8_t=yes -ac_cv_type_u_int16_t=yes -ac_cv_type_u_int32_t=yes -ac_cv_type_u_int8_t=yes -nsnam_cv_int64_t_HAVE_LONG_LONG=yes -nsnam_cv_int64_t_HAVE___INT64_T=no - -## ----------------- ## -## Output variables. ## -## ----------------- ## - -CC='gcc' -CFLAGS='-g -O2' -CPP='gcc -E' -CPPFLAGS='' -CXX='g++' -CXXFLAGS='-g -O2' -DEFS='-DHAVE_CONFIG_H' -ECHO_C='' -ECHO_N='-n' -ECHO_T='' -EGREP='/bin/grep -E' -EXEEXT='' -GREP='/bin/grep' -INSTALL_DATA='${INSTALL} -m 644' -INSTALL_PROGRAM='${INSTALL}' -INSTALL_SCRIPT='${INSTALL}' -LDFLAGS='' -LIBOBJS='' -LIBS='' -LTLIBOBJS='' -OBJEXT='o' -PACKAGE_BUGREPORT='' -PACKAGE_NAME='' -PACKAGE_STRING='' -PACKAGE_TARNAME='' -PACKAGE_VERSION='' -PATH_SEPARATOR=':' -SHELL='/bin/sh' -V_ALL='nam' -V_AR='ar cr' -V_BROKEN_OBJ='' -V_CCOPT=' -Wall -Wno-write-strings' -V_DEFINE=' -DNDEBUG -DUSE_SHM' -V_DEFINES='-DHAVE_LIBTCLCL -DHAVE_TCLCL_H -DHAVE_LIBOTCL1_13 -DHAVE_OTCL_H -DHAVE_LIBTK8_5 -DHAVE_TK_H -DHAVE_LIBTCL8_5 -DHAVE_TCLINT_H -DHAVE_TCL_H -DHAVE_LIBZ1_2_3 -DHAVE_ZLIB_H ' -V_INCLUDE='' -V_INCLUDES='-I/home/tomh/cvs/tclcl -I/home/tomh/cvs/otcl -I/usr/include -I/usr/include/tcl-private/generic -I/usr/include -I/usr/include' -V_INCLUDE_X11='' -V_LIB=' -lnsl -ldl' -V_LIBRARY_TCL='/usr/share/tcl8.5' -V_LIBRARY_TK='/usr/share/tk8.5' -V_LIBS='-L/home/tomh/cvs/tclcl -ltclcl -L/home/tomh/cvs/otcl -lotcl -L/usr/lib -ltk8.5 -L/usr/lib -ltcl8.5 -L/usr/lib -lz' -V_LIB_OTCL='-L/home/tomh/cvs/otcl -lotcl' -V_LIB_TCL='-L/usr/lib -ltcl8.5' -V_LIB_TCLCL='-L/home/tomh/cvs/tclcl -ltclcl' -V_LIB_TK='-L/usr/lib -ltk8.5' -V_LIB_X11='-lXext -lX11' -V_LSSCRIPT='' -V_NS_TCL_LIB_STL='' -V_OBJ='' -V_OBJ_CRYPT='' -V_RANLIB='ranlib' -V_SHELL='' -V_SIGRET='void' -V_STATIC='' -V_STLOBJ='' -V_TARCMD='tar cfh' -V_TAR_EXTRA='' -V_TAR_TARGET='linux-gnu' -V_TCL2CPP='../tclcl/tcl2c++' -V_TCLSH='/usr/bin/tclsh8.5' -V_TCL_LIBRARY_FILES='$(TCL_BASE_LIBRARY_FILES) /usr/share/tcl8.5/http1.0/http.tcl' -V_TKDOSNAMES='$(LIBRARY_TK)/optMenu.tcl $(LIBRARY_TK)/scrlbar.tcl' -ac_ct_CC='gcc' -ac_ct_CXX='g++' -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}' -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' -libdir='${exec_prefix}/lib' -libexecdir='${exec_prefix}/libexec' -localedir='${datarootdir}/locale' -localstatedir='${prefix}/var' -mandir='${datarootdir}/man' -oldincludedir='/usr/include' -pdfdir='${docdir}' -prefix='/usr/local' -program_transform_name='s,x,x,' -psdir='${docdir}' -sbindir='${exec_prefix}/sbin' -sharedstatedir='${prefix}/com' -sysconfdir='${prefix}/etc' -target='i686-pc-linux-gnu' -target_alias='' -target_cpu='i686' -target_os='linux-gnu' -target_vendor='pc' - -## ----------- ## -## confdefs.h. ## -## ----------- ## - -#define PACKAGE_NAME "" -#define PACKAGE_TARNAME "" -#define PACKAGE_VERSION "" -#define PACKAGE_STRING "" -#define PACKAGE_BUGREPORT "" -#define STDC_HEADERS 1 -#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 HAVE_STRING_H 1 -#define HAVE_ZLIB_H 1 -#define HAVE_LIBZ1_2_3 1 -#define HAVE_TCL_H 1 -#define HAVE_TCLINT_H 1 -#define HAVE_LIBTCL8_5 1 -#define HAVE_TK_H 1 -#define HAVE_LIBTK8_5 1 -#define HAVE_OTCL_H 1 -#define HAVE_LIBOTCL1_13 1 -#define HAVE_TCLCL_H 1 -#define HAVE_LIBTCLCL 1 -#define RANDOM_RETURN_TYPE long -#define HAVE_STRTOQ 1 -#define HAVE_STRTOLL 1 -#define SIZEOF_LONG 4 -#define HAVE_INT64 1 -#define HAVE_SNPRINTF 1 - -configure: exit 0 diff -Nru nam-1.15~RC4/config.status nam-1.15/config.status --- nam-1.15~RC4/config.status 2010-09-05 23:23:19.000000000 +0000 +++ nam-1.15/config.status 1970-01-01 00:00:00.000000000 +0000 @@ -1,1034 +0,0 @@ -#! /bin/sh -# Generated by configure. -# 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-/bin/sh} -## --------------------- ## -## 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=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# 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 - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\$.*\$"' - as_echo_n_body='eval - arg=$1; - case $arg in - *"$as_nl"*) - expr "X$arg" : "X\$.*\$$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;; - esac; - expr "X$arg" : "X\$.*\$" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - -# 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.) -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 - $as_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. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# 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 || -$as_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" || - { $as_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 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -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 -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 $as_me, which was -generated by GNU Autoconf 2.63. 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` -" - -# Files that config.status was made for. -config_files=" Makefile" -config_headers=" autoconf.h" - -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTION]... [FILE]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - -q, --quiet, --silent - 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 - -Report bugs to ." - -ac_cs_version="\ -config.status -configured by ./configure, generated by GNU Autoconf 2.63, - with options \"\" - -Copyright (C) 2008 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='/home/tomh/cvs/nam-1' -srcdir='.' -INSTALL='/usr/bin/install -c' -test -n "$AWK" || AWK=awk -# The default lists apply if the user does not specify any file. -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 ) - $as_echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header - { $as_echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - $as_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. - -*) { $as_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 - -if $ac_cs_recheck; then - set X '/bin/sh' './configure' $ac_configure_extra_args --no-create --no-recursion - shift - $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6 - CONFIG_SHELL='/bin/sh' - export CONFIG_SHELL - exec "$@" -fi - -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - $as_echo "$ac_log" -} >&5 - - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "autoconf.h") CONFIG_HEADERS="$CONFIG_HEADERS autoconf.h" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_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 -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") -} || -{ - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. -if test -n "$CONFIG_FILES"; then - - -ac_cr=' ' -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr -fi - -echo 'BEGIN {' >"$tmp/subs1.awk" && -cat >>"$tmp/subs1.awk" <<\_ACAWK && -S["LTLIBOBJS"]="" -S["LIBOBJS"]="" -S["INSTALL_DATA"]="${INSTALL} -m 644" -S["INSTALL_SCRIPT"]="${INSTALL}" -S["INSTALL_PROGRAM"]="${INSTALL}" -S["V_LSSCRIPT"]="" -S["V_NS_TCL_LIB_STL"]="" -S["V_STLOBJ"]="" -S["V_AR"]="ar cr" -S["V_RANLIB"]="ranlib" -S["V_OBJ_CRYPT"]="" -S["V_BROKEN_OBJ"]="" -S["V_OBJ"]="" -S["V_INCLUDE"]="" -S["V_TARCMD"]="tar cfh" -S["V_SHELL"]="" -S["V_SIGRET"]="void" -S["V_DEFINE"]=" -DNDEBUG -DUSE_SHM" -S["V_LIB"]=" -lnsl -ldl" -S["V_TAR_EXTRA"]="" -S["V_CCOPT"]=" -Wall -Wno-write-strings" -S["V_ALL"]="nam" -S["V_LIB_TK"]="-L/usr/lib -ltk8.5" -S["V_LIB_TCL"]="-L/usr/lib -ltcl8.5" -S["V_LIB_OTCL"]="-L/home/tomh/cvs/otcl -lotcl" -S["V_LIB_TCLCL"]="-L/home/tomh/cvs/tclcl -ltclcl" -S["V_TAR_TARGET"]="linux-gnu" -S["V_STATIC"]="" -S["V_DEFINES"]="-DHAVE_LIBTCLCL -DHAVE_TCLCL_H -DHAVE_LIBOTCL1_13 -DHAVE_OTCL_H -DHAVE_LIBTK8_5 -DHAVE_TK_H -DHAVE_LIBTCL8_5 -DHAVE_TCLINT_H -DHAVE_TCL_H -DHAVE_LIB"\ -"Z1_2_3 -DHAVE_ZLIB_H " -S["V_LIBS"]="-L/home/tomh/cvs/tclcl -ltclcl -L/home/tomh/cvs/otcl -lotcl -L/usr/lib -ltk8.5 -L/usr/lib -ltcl8.5 -L/usr/lib -lz" -S["V_INCLUDES"]="-I/home/tomh/cvs/tclcl -I/home/tomh/cvs/otcl -I/usr/include -I/usr/include/tcl-private/generic -I/usr/include -I/usr/include" -S["V_TCL2CPP"]="../tclcl/tcl2c++" -S["V_LIBRARY_TK"]="/usr/share/tk8.5" -S["V_TKDOSNAMES"]="$(LIBRARY_TK)/optMenu.tcl $(LIBRARY_TK)/scrlbar.tcl" -S["V_LIBRARY_TCL"]="/usr/share/tcl8.5" -S["V_TCLSH"]="/usr/bin/tclsh8.5" -S["V_TCL_LIBRARY_FILES"]="$(TCL_BASE_LIBRARY_FILES) /usr/share/tcl8.5/http1.0/http.tcl" -S["V_LIB_X11"]="-lXext -lX11" -S["V_INCLUDE_X11"]="" -S["ac_ct_CXX"]="g++" -S["CXXFLAGS"]="-g -O2" -S["CXX"]="g++" -S["target_os"]="linux-gnu" -S["target_vendor"]="pc" -S["target_cpu"]="i686" -S["target"]="i686-pc-linux-gnu" -S["host_os"]="linux-gnu" -S["host_vendor"]="pc" -S["host_cpu"]="i686" -S["host"]="i686-pc-linux-gnu" -S["build_os"]="linux-gnu" -S["build_vendor"]="pc" -S["build_cpu"]="i686" -S["build"]="i686-pc-linux-gnu" -S["EGREP"]="/bin/grep -E" -S["GREP"]="/bin/grep" -S["CPP"]="gcc -E" -S["OBJEXT"]="o" -S["EXEEXT"]="" -S["ac_ct_CC"]="gcc" -S["CPPFLAGS"]="" -S["LDFLAGS"]="" -S["CFLAGS"]="-g -O2" -S["CC"]="gcc" -S["target_alias"]="" -S["host_alias"]="" -S["build_alias"]="" -S["LIBS"]="" -S["ECHO_T"]="" -S["ECHO_N"]="-n" -S["ECHO_C"]="" -S["DEFS"]="-DHAVE_CONFIG_H" -S["mandir"]="${datarootdir}/man" -S["localedir"]="${datarootdir}/locale" -S["libdir"]="${exec_prefix}/lib" -S["psdir"]="${docdir}" -S["pdfdir"]="${docdir}" -S["dvidir"]="${docdir}" -S["htmldir"]="${docdir}" -S["infodir"]="${datarootdir}/info" -S["docdir"]="${datarootdir}/doc/${PACKAGE}" -S["oldincludedir"]="/usr/include" -S["includedir"]="${prefix}/include" -S["localstatedir"]="${prefix}/var" -S["sharedstatedir"]="${prefix}/com" -S["sysconfdir"]="${prefix}/etc" -S["datadir"]="${datarootdir}" -S["datarootdir"]="${prefix}/share" -S["libexecdir"]="${exec_prefix}/libexec" -S["sbindir"]="${exec_prefix}/sbin" -S["bindir"]="${exec_prefix}/bin" -S["program_transform_name"]="s,x,x," -S["prefix"]="/usr/local" -S["exec_prefix"]="${prefix}" -S["PACKAGE_BUGREPORT"]="" -S["PACKAGE_STRING"]="" -S["PACKAGE_VERSION"]="" -S["PACKAGE_TARNAME"]="" -S["PACKAGE_NAME"]="" -S["PATH_SEPARATOR"]=":" -S["SHELL"]="/bin/sh" -_ACAWK -cat >>"$tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -} -{ - line = $ 0 - nfields = split(line, field, "@") - substed = 0 - len = length(field[1]) - for (i = 2; i < nfields; i++) { - key = field[i] - keylen = length(key) - if (S_is_set[key]) { - value = S[key] - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) - len += length(value) + length(field[++i]) - substed = 1 - } else - len += 1 + keylen - } - - print line -} - -_ACAWK -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -else - cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } -fi # test -n "$CONFIG_FILES" - -# Set up the scripts for CONFIG_HEADERS section. -# No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. -if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || -BEGIN { -D["PACKAGE_NAME"]=" \"\"" -D["PACKAGE_TARNAME"]=" \"\"" -D["PACKAGE_VERSION"]=" \"\"" -D["PACKAGE_STRING"]=" \"\"" -D["PACKAGE_BUGREPORT"]=" \"\"" -D["STDC_HEADERS"]=" 1" -D["STDC_HEADERS"]=" 1" -D["HAVE_SYS_TYPES_H"]=" 1" -D["HAVE_SYS_STAT_H"]=" 1" -D["HAVE_STDLIB_H"]=" 1" -D["HAVE_STRING_H"]=" 1" -D["HAVE_MEMORY_H"]=" 1" -D["HAVE_STRINGS_H"]=" 1" -D["HAVE_INTTYPES_H"]=" 1" -D["HAVE_STDINT_H"]=" 1" -D["HAVE_UNISTD_H"]=" 1" -D["HAVE_STRING_H"]=" 1" -D["HAVE_ZLIB_H"]=" 1" -D["HAVE_LIBZ1_2_3"]=" 1" -D["HAVE_TCL_H"]=" 1" -D["HAVE_TCLINT_H"]=" 1" -D["HAVE_LIBTCL8_5"]=" 1" -D["HAVE_TK_H"]=" 1" -D["HAVE_LIBTK8_5"]=" 1" -D["HAVE_OTCL_H"]=" 1" -D["HAVE_LIBOTCL1_13"]=" 1" -D["HAVE_TCLCL_H"]=" 1" -D["HAVE_LIBTCLCL"]=" 1" -D["RANDOM_RETURN_TYPE"]=" long" -D["HAVE_STRTOQ"]=" 1" -D["HAVE_STRTOLL"]=" 1" -D["SIZEOF_LONG"]=" 4" -D["HAVE_INT64"]=" 1" -D["HAVE_SNPRINTF"]=" 1" - for (key in D) D_is_set[key] = 1 - FS = "" -} -/^[\t ]*#[\t ]*(define|undef)[\t ]+[_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ][_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]*([\t (]|$)/ { - line = $ 0 - split(line, arg, " ") - if (arg[1] == "#") { - defundef = arg[2] - mac1 = arg[3] - } else { - defundef = substr(arg[1], 2) - mac1 = arg[2] - } - split(mac1, mac2, "(") #) - macro = mac2[1] - prefix = substr(line, 1, index(line, defundef) - 1) - if (D_is_set[macro]) { - # Preserve the white space surrounding the "#". - print prefix "define", macro P[macro] D[macro] - next - } else { - # 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. - if (defundef == "undef") { - print "/*", prefix defundef, macro, "*/" - next - } - } -} -{ print } -_ACAWK - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } -fi # test -n "$CONFIG_HEADERS" - - -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " -shift -for ac_tag -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_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 || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; 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 '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} - fi - # Neutralize special characters interpreted by sed in replacement strings. - case $configure_input in #( - *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | - sed 's/[\\\\&|]/\\\\&/g'`;; #( - *) ac_sed_conf_input=$configure_input;; - esac - - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; - 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 || -$as_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=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X$//$[^/]' \| \ - X"$as_dir" : 'X$//$$' \| \ - X"$as_dir" : 'X$/$' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X$\/\/$[^/].*/{ - s//\1/ - q - } - /^X$\/\/$$/{ - s//\1/ - q - } - /^X$\/$.*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_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=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_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 -# 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= - -ac_sed_dataroot=' -/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p -' -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - ac_datarootdir_hack=' - s&@datadir@&${datarootdir}&g - s&@docdir@&${datarootdir}/doc/${PACKAGE}&g - s&@infodir@&${datarootdir}/info&g - s&@localedir@&${datarootdir}/locale&g - s&@mandir@&${datarootdir}/man&g - s&\${datarootdir}&${prefix}/share&g' ;; -esac -ac_sed_extra="/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^$[^=]*=[ ]*$:*/\1/ -s/:*$// -s/^[^=]*=[ ]*$// -} - -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s|@configure_input@|$ac_sed_conf_input|;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@top_build_prefix@&$ac_top_build_prefix&;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 -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - -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"; } && - { $as_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 -$as_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 \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - ;; - :H) - # - # CONFIG_HEADER - # - if test x"$ac_file" != x-; then - { - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - fi - else - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } - fi - ;; - - - esac - -done # for ac_tag - - -{ (exit 0); exit 0; } diff -Nru nam-1.15~RC4/configure nam-1.15/configure --- nam-1.15~RC4/configure 2010-09-05 23:23:21.000000000 +0000 +++ nam-1.15/configure 2011-11-04 17:18:42.000000000 +0000 @@ -1,18 +1,22 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63. +# Generated by GNU Autoconf 2.68. +# # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. +# +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -20,23 +24,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + 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 - as_nl=' ' export as_nl @@ -44,7 +40,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -55,7 +57,7 @@ as_echo_body='eval expr "X$1" : "X\$.*\$"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\$.*\$$as_nl"; arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;; @@ -78,13 +80,6 @@ } 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 @@ -94,15 +89,16 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +as_myself= +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -114,12 +110,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); 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 +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -131,330 +131,306 @@ LANGUAGE=C export LANGUAGE -# 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 || -$as_echo X/"$0" | - sed '/^.*\/$[^/][^/]*$\/*$/{ - s//\1/ - q - } - /^X\/$\/\/$$/{ - s//\1/ - q - } - /^X\/$\/$.*/{ - s//\1/ - q - } - s/.*/./; q'` - # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac 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 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } exitcode=0 -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 - : +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -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 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } IFS=$as_save_IFS - 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=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_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=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_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. + 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+"$@"} 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 + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 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 +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ - 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 - + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X$//$[^/]' \| \ + X"$as_dir" : 'X$//$$' \| \ + X"$as_dir" : 'X$/$' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X$\/\/$[^/].*/{ + s//\1/ + q + } + /^X$\/\/$$/{ + s//\1/ + q + } + /^X$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -fi -fi +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -(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 -} +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error -exitcode=0 -if as_func_success; then - : +if expr a : '$a$' >/dev/null 2>&1 && + test "X`expr 00001 : '.*$...$'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. + as_expr=false fi -if as_func_ret_success; then - : +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \ + X"$0" : 'X$//$$' \| \ + X"$0" : 'X$/$' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/$[^/][^/]*$\/*$/{ + s//\1/ + q + } + /^X\/$\/\/$$/{ + s//\1/ + q + } + /^X\/$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` +# 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 - 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. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -471,8 +447,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_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 @@ -482,29 +457,18 @@ 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 +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; 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 @@ -534,7 +498,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -553,10 +517,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -570,11 +534,11 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -589,7 +553,6 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME= @@ -597,6 +560,7 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= +PACKAGE_URL= ac_unique_file="main.cc" # Factoring default headers for most tests. @@ -729,6 +693,7 @@ program_transform_name prefix exec_prefix +PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -829,8 +794,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=$.*$'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=$.*$'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -875,8 +841,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -902,8 +867,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1107,8 +1071,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1124,8 +1087,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1155,17 +1117,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) 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 && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1174,7 +1136,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1182,15 +1144,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1213,8 +1173,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1228,8 +1187,8 @@ 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 + $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 @@ -1244,11 +1203,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1287,13 +1244,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1333,7 +1288,7 @@ --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 + -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 @@ -1417,7 +1372,7 @@ 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 + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor CXX C++ compiler command @@ -1426,6 +1381,7 @@ 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 the package provider. _ACEOF ac_status=$? fi @@ -1489,311 +1445,935 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.63 +generated by GNU Autoconf 2.68 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 2010 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 $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - $ $0 $@ + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## +} # ac_fn_c_try_compile -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` +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval -/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` +} # ac_fn_c_try_cpp -_ASUNAME +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done -IFS=$as_save_IFS + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval -} >&5 +} # ac_fn_c_try_run -cat >&5 <<_ACEOF +# ac_fn_cxx_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval -## ----------- ## -## Core tests. ## -## ----------- ## +} # ac_fn_cxx_try_compile +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -# 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=`$as_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; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -# 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 +} # ac_fn_c_check_header_mongrel - 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_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $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 +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - 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=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo +} # ac_fn_c_check_header_compile - 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=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_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 && - $as_echo "$as_me: caught signal $ac_signal" - $as_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 +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval -# Predefined preprocessor variables. +} # ac_fn_c_try_link -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : +else + eval "$3=yes" +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 +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +} # ac_fn_c_check_type +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* 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 $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} _ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +} # ac_fn_c_check_func -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +# -------------------------------------------- +# Tries to find the compile-time value of EXPR in a program that includes +# INCLUDES, setting VAR accordingly. Returns whether the value could be +# computed +ac_fn_c_compute_int () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid; break +else + as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) < 0)]; +test_array [0] = 0 -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" + ; + return 0; +} _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=$ac_mid; break +else + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + ac_lo= ac_hi= +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 -# Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE -if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" -do - test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done +case $ac_lo in #(( +?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +'') ac_retval=1 ;; +esac + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +static long int longval () { return $2; } +static unsigned long int ulongval () { return $2; } +#include +#include +int +main () +{ -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 - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (($2) < 0) + { + long int i = longval (); + if (i != ($2)) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ($2)) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + echo >>conftest.val; read $3 &5 -$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file + ac_retval=1 fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f conftest.val -# 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 + fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_compute_int +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 $as_me, which was +generated by GNU Autoconf 2.68. 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=. + $as_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=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append 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 + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset 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 + + $as_echo "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + 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_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; 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 + + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + $as_echo "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_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'; as_fn_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 + +$as_echo "/* confdefs.h */" > 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 + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + 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. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_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,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; @@ -1803,17 +2383,17 @@ ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac @@ -1825,35 +2405,20 @@ esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi - - - - - - - - - - - - - - - - +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1880,9 +2445,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -1893,24 +2458,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -1920,9 +2485,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -1933,24 +2498,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -1959,7 +2524,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -1973,9 +2538,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -1986,24 +2551,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2013,9 +2578,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2027,18 +2592,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2057,10 +2622,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2072,9 +2637,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2085,24 +2650,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2116,9 +2681,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2129,24 +2694,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2159,7 +2724,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2170,57 +2735,37 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2236,8 +2781,8 @@ # 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. -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -2253,17 +2798,17 @@ done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; 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, @@ -2280,7 +2825,7 @@ # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'` fi @@ -2299,84 +2844,41 @@ else ac_file='' fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } 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. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_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 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_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 -$as_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 -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - rm -f -r a.out a.out.dSYM 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. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } -if { (ac_try="$ac_link" +if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; 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 @@ -2391,32 +2893,83 @@ esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi - -rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2428,17 +2981,17 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -2451,31 +3004,23 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 $as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2489,37 +3034,16 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + 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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -2528,20 +3052,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2552,35 +3072,11 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_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 + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2591,36 +3087,12 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2631,42 +3103,17 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -2683,18 +3130,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&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 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -2751,32 +3194,9 @@ -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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_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 @@ -2787,17 +3207,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2811,14 +3233,14 @@ 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 -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 $as_echo_n "checking how to run the C preprocessor... " >&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 + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -2833,11 +3255,7 @@ # 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -2846,78 +3264,34 @@ #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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_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 +rm -f conftest.err conftest.i 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 +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi @@ -2929,7 +3303,7 @@ else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2940,11 +3314,7 @@ # 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -2953,87 +3323,40 @@ #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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_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 +rm -f conftest.err conftest.i 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 - : +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -3043,9 +3366,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -3056,7 +3379,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; 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 @@ -3076,7 +3399,7 @@ $as_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` + as_fn_arith $ac_count + 1 && ac_count=$as_val 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" @@ -3091,26 +3414,24 @@ $ac_path_GREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 $as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -3124,7 +3445,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; 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 @@ -3144,7 +3465,7 @@ $as_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` + as_fn_arith $ac_count + 1 && ac_count=$as_val 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" @@ -3159,12 +3480,10 @@ $ac_path_EGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -3172,21 +3491,17 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 $as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -3201,48 +3516,23 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -3252,18 +3542,14 @@ 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -3273,14 +3559,10 @@ 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 + 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -3307,51 +3589,22 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 $as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi @@ -3389,7 +3642,7 @@ # Check whether --with-defaultoptions was given. -if test "${with_defaultoptions+set}" = set; then +if test "${with_defaultoptions+set}" = set; then : withval=$with_defaultoptions; else with_defaultoptions=".configure" @@ -3441,9 +3694,7 @@ fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -3457,35 +3708,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&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 && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -3501,28 +3744,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&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` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -3538,28 +3777,24 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking target system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 $as_echo_n "checking target system type... " >&6; } -if test "${ac_cv_target+set}" = set; then +if ${ac_cv_target+:} false; then : $as_echo_n "(cached) " >&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` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 $as_echo "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -$as_echo "$as_me: error: invalid value of canonical target" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -3582,6 +3817,7 @@ NONENONEs,x,x, && program_prefix=${target_alias}- + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3590,9 +3826,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3603,24 +3839,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3630,9 +3866,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3643,24 +3879,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3669,7 +3905,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -3683,9 +3919,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3696,24 +3932,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3723,9 +3959,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3737,18 +3973,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -3767,10 +4003,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3782,9 +4018,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3795,24 +4031,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3826,9 +4062,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3839,24 +4075,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3869,7 +4105,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -3880,62 +4116,42 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3949,37 +4165,16 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + 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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -3988,20 +4183,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4012,35 +4203,11 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_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 + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4051,36 +4218,12 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4091,42 +4234,17 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -4143,18 +4261,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&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 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4211,32 +4325,9 @@ -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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_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 @@ -4247,17 +4338,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4279,9 +4372,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then +if ${ac_cv_prog_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then @@ -4292,24 +4385,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 $as_echo "$CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4323,9 +4416,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +if ${ac_cv_prog_ac_ct_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then @@ -4336,24 +4429,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 $as_echo "$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4366,7 +4459,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -4377,53 +4470,36 @@ fi fi # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then +if ${ac_cv_cxx_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4437,37 +4513,16 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 +if ac_fn_cxx_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + 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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GXX=yes @@ -4476,20 +4531,16 @@ fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 $as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then +if ${ac_cv_prog_cxx_g+:} false; then : $as_echo_n "(cached) " >&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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4500,35 +4551,11 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes else - $as_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 + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4539,36 +4566,12 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cxx_werror_flag=$ac_save_cxx_werror_flag +else + 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4579,42 +4582,17 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes -else - $as_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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 $as_echo "$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS @@ -4637,16 +4615,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4661,48 +4635,23 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4712,18 +4661,14 @@ 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4733,14 +4678,10 @@ 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 + 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4767,267 +4708,48 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 $as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h 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=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF +fi - - - - - - - -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=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_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 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - +done for ac_header in string.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" +if test "x$ac_cv_header_string_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_STRING_H 1 _ACEOF fi @@ -5044,18 +4766,14 @@ V_TARCMD="tar cfh" V_SIGRET="void" -{ $as_echo "$as_me:$LINENO: checking for main in -lXbsd" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXbsd" >&5 $as_echo_n "checking for main in -lXbsd... " >&6; } -if test "${ac_cv_lib_Xbsd_main+set}" = set; then +if ${ac_cv_lib_Xbsd_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5067,58 +4785,29 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_Xbsd_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xbsd_main=no + ac_cv_lib_Xbsd_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xbsd_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xbsd_main" >&5 $as_echo "$ac_cv_lib_Xbsd_main" >&6; } -if test "x$ac_cv_lib_Xbsd_main" = x""yes; then +if test "x$ac_cv_lib_Xbsd_main" = xyes; then : V_LIB="$V_LIB -lXbsd" fi -{ $as_echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 $as_echo_n "checking for socket in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_socket+set}" = set; then +if ${ac_cv_lib_socket_socket+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -5136,58 +4825,29 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_socket_socket=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_socket_socket=no + ac_cv_lib_socket_socket=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 $as_echo "$ac_cv_lib_socket_socket" >&6; } -if test "x$ac_cv_lib_socket_socket" = x""yes; then +if test "x$ac_cv_lib_socket_socket" = xyes; then : V_LIB="$V_LIB -lsocket" fi -{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then +if ${ac_cv_lib_nsl_gethostbyname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -5205,58 +4865,29 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_nsl_gethostbyname=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_nsl_gethostbyname=no + ac_cv_lib_nsl_gethostbyname=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : V_LIB="$V_LIB -lnsl" fi -{ $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 $as_echo_n "checking for dcgettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_dcgettext+set}" = set; then +if ${ac_cv_lib_intl_dcgettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -5274,58 +4905,29 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_dcgettext=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dcgettext=no + ac_cv_lib_intl_dcgettext=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; } -if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then +if test "x$ac_cv_lib_intl_dcgettext" = xyes; then : V_LIB="$V_LIB -lintl" fi -{ $as_echo "$as_me:$LINENO: checking for getnodebyname in -ldnet_stub" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnodebyname in -ldnet_stub" >&5 $as_echo_n "checking for getnodebyname in -ldnet_stub... " >&6; } -if test "${ac_cv_lib_dnet_stub_getnodebyname+set}" = set; then +if ${ac_cv_lib_dnet_stub_getnodebyname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -5343,43 +4945,18 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dnet_stub_getnodebyname=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dnet_stub_getnodebyname=no + ac_cv_lib_dnet_stub_getnodebyname=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_getnodebyname" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_getnodebyname" >&5 $as_echo "$ac_cv_lib_dnet_stub_getnodebyname" >&6; } -if test "x$ac_cv_lib_dnet_stub_getnodebyname" = x""yes; then +if test "x$ac_cv_lib_dnet_stub_getnodebyname" = xyes; then : V_LIB="$V_LIB -ldnet_stub" fi @@ -5394,21 +4971,21 @@ V_SHM="-DUSE_SHM" # Check whether --enable-release was given. -if test "${enable_release+set}" = set; then +if test "${enable_release+set}" = set; then : enableval=$enable_release; else enable_release="no" fi # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then +if test "${enable_debug+set}" = set; then : enableval=$enable_debug; else enable_debug="no" fi # Check whether --enable-devel was given. -if test "${enable_devel+set}" = set; then +if test "${enable_devel+set}" = set; then : enableval=$enable_devel; else enable_devel="no" @@ -5423,13 +5000,9 @@ OonS="" else if test "$CC" = gcc ; then - { $as_echo "$as_me:$LINENO: checking that $CXX can handle -O2" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking that $CXX can handle -O2" >&5 $as_echo_n "checking that $CXX can handle -O2... " >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5448,36 +5021,15 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - { $as_echo "$as_me:$LINENO: result: yes" >&5 +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } OonS="-O2" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Optimize on Steroids - { $as_echo "$as_me:$LINENO: result: no" >&5 + # Optimize on Steroids + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi fi @@ -5530,7 +5082,7 @@ # the linux release build # # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then +if test "${enable_static+set}" = set; then : enableval=$enable_static; else enable_static="" @@ -5579,9 +5131,7 @@ case "$target" in *-dec-*) V_DEFINE="$V_DEFINE -D_XOPEN_SOURCE_EXTENDED" - cat >>confdefs.h <<\_ACEOF -#define _XOPEN_SOURCE_EXTENDED 1 -_ACEOF + $as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h ;; sparc-sun-solaris*) @@ -5652,13 +5202,9 @@ V_LIB="$V_LIB -L/usr/local/lib" ;; *-*-hpux*) - cat >>confdefs.h <<\_ACEOF -#define random lrand48 -_ACEOF + $as_echo "#define random lrand48" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define srandom srand -_ACEOF + $as_echo "#define srandom srand" >>confdefs.h V_CCOPT="-O" ;; @@ -5691,7 +5237,7 @@ # Check whether --with-zlib was given. -if test "${with_zlib+set}" = set; then +if test "${with_zlib+set}" = set; then : withval=$with_zlib; d=$withval else d="" @@ -5699,7 +5245,7 @@ # Check whether --with-zlib-ver was given. -if test "${with_zlib_ver+set}" = set; then +if test "${with_zlib_ver+set}" = set; then : withval=$with_zlib_ver; ZLIB_VER=$withval else ZLIB_VER=1.2.3 @@ -5740,7 +5286,7 @@ NS_PACKAGE_zlib_COMPLETE=true -{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib.h" >&5 $as_echo_n "checking for zlib.h... " >&6; } if test "x$d" = "xno"; then : disable header @@ -5748,16 +5294,14 @@ NS_PACKAGE_zlib_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else places="$ZLIB_H_PLACES" if test "x$d" != "x" -a "x$d" != xyes; then if test ! -d $d; then - { { $as_echo "$as_me:$LINENO: error: $d is not a directory" >&5 -$as_echo "$as_me: error: $d is not a directory" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$d is not a directory" "$LINENO" 5 fi places="$ZLIB_H_PLACES_D" fi @@ -5778,7 +5322,7 @@ NS_PACKAGE_zlib_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else @@ -5793,13 +5337,13 @@ NS_PACKAGE_zlib_UNDERWAY=true - { $as_echo "$as_me:$LINENO: result: $V_INCLUDE_ZLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_INCLUDE_ZLIB" >&5 $as_echo "$V_INCLUDE_ZLIB" >&6; } fi fi -{ $as_echo "$as_me:$LINENO: checking for libz$ZLIB_VER" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libz$ZLIB_VER" >&5 $as_echo_n "checking for libz$ZLIB_VER... " >&6; } if test "x$d" = "xno"; then : disable library @@ -5807,16 +5351,14 @@ NS_PACKAGE_zlib_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else places="$ZLIB_LIB_PLACES" if test "x$d" != "x" -a "x$d" != xyes; then if test ! -d $d; then - { { $as_echo "$as_me:$LINENO: error: $d is not a directory" >&5 -$as_echo "$as_me: error: $d is not a directory" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$d is not a directory" "$LINENO" 5 fi places="$ZLIB_LIB_PLACES_D" fi @@ -5844,7 +5386,7 @@ NS_PACKAGE_zlib_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else if test "$solaris"; then @@ -5863,7 +5405,7 @@ NS_PACKAGE_zlib_UNDERWAY=true - { $as_echo "$as_me:$LINENO: result: $V_LIB_ZLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_LIB_ZLIB" >&5 $as_echo "$V_LIB_ZLIB" >&6; } fi fi @@ -5878,32 +5420,21 @@ : All components of zlib found. NS_PACKAGE_zlib_VALID=true else - { { $as_echo "$as_me:$LINENO: error: Installation of zlib seems incomplete or can't be found automatically. -Please correct the problem by telling configure where zlib is -using the argument --with-zlib=/path/to/package -(perhaps after installing it), -or the package is not required, disable it with --with-zlib=no." >&5 -$as_echo "$as_me: error: Installation of zlib seems incomplete or can't be found automatically. + as_fn_error $? "Installation of zlib seems incomplete or can't be found automatically. Please correct the problem by telling configure where zlib is using the argument --with-zlib=/path/to/package (perhaps after installing it), -or the package is not required, disable it with --with-zlib=no." >&2;} - { (exit 1); exit 1; }; } +or the package is not required, disable it with --with-zlib=no." "$LINENO" 5 fi fi if test "xno" = xyes; then if $NS_PACKAGE_zlib_VALID; then : else - { { $as_echo "$as_me:$LINENO: error: zlib is required but could not be completely found. + as_fn_error $? "zlib is required but could not be completely found. Please correct the problem by telling configure where zlib is using the argument --with-zlib=/path/to/package, -or the package is not required, disable it with --with-zlib=no." >&5 -$as_echo "$as_me: error: zlib is required but could not be completely found. -Please correct the problem by telling configure where zlib is -using the argument --with-zlib=/path/to/package, -or the package is not required, disable it with --with-zlib=no." >&2;} - { (exit 1); exit 1; }; } +or the package is not required, disable it with --with-zlib=no." "$LINENO" 5 fi fi @@ -5950,40 +5481,16 @@ echo "checking for X11 header files" if test "$x_includes" = NONE ; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 +if ac_fn_c_try_cpp "$LINENO"; then : x_includes="" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - x_includes=NONE fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext if test "$x_includes" = NONE ; then for i in $xincdirs ; do if test -r $i/X11/Intrinsic.h; then @@ -6004,18 +5511,14 @@ echo "checking for X11 library archive" if test "$x_libraries" = NONE ; then - { $as_echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5 $as_echo_n "checking for XOpenDisplay in -lX11... " >&6; } -if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then +if ${ac_cv_lib_X11_XOpenDisplay+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -6033,43 +5536,18 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_X11_XOpenDisplay=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_X11_XOpenDisplay=no + ac_cv_lib_X11_XOpenDisplay=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5 $as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; } -if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then +if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes; then : x_libraries="" else x_libraries=NONE @@ -6093,18 +5571,14 @@ if test -n "$V_SHM" ; then if test -z "$x_libraries" ; then - { $as_echo "$as_me:$LINENO: checking for XShmAttach in -lXext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShmAttach in -lXext" >&5 $as_echo_n "checking for XShmAttach in -lXext... " >&6; } -if test "${ac_cv_lib_Xext_XShmAttach+set}" = set; then +if ${ac_cv_lib_Xext_XShmAttach+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXext -lX11 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -6122,43 +5596,18 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_Xext_XShmAttach=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xext_XShmAttach=no + ac_cv_lib_Xext_XShmAttach=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShmAttach" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShmAttach" >&5 $as_echo "$ac_cv_lib_Xext_XShmAttach" >&6; } -if test "x$ac_cv_lib_Xext_XShmAttach" = x""yes; then +if test "x$ac_cv_lib_Xext_XShmAttach" = xyes; then : V_Xext="-lXext" else V_Xext=NONE @@ -6190,7 +5639,7 @@ # Check whether --with-tcl was given. -if test "${with_tcl+set}" = set; then +if test "${with_tcl+set}" = set; then : withval=$with_tcl; d=$withval else d="" @@ -6199,7 +5648,7 @@ # Check whether --with-tcl-ver was given. -if test "${with_tcl_ver+set}" = set; then +if test "${with_tcl_ver+set}" = set; then : withval=$with_tcl_ver; TCL_VERS=$withval else TCL_VERS=`echo "puts [info patchlevel]" | tclsh` @@ -6376,703 +5825,168 @@ /usr/lib64/tcl$TCL_VERS \ /usr/lib64/tcl$TCL_HI_VERS \ /usr/lib64/tcl$TCL_ALT_VERS \ - /usr/lib/tcl$TCL_VERS \ - /usr/lib/tcl$TCL_HI_VERS \ - /usr/lib/tcl$TCL_ALT_VERS \ - ../tcl$TCL_OLD_VERS/unix \ - ../tcl$TCL_OLD_ALT_VERS/unix \ - /usr/src/local/tcl$TCL_OLD_VERS/unix \ - /usr/src/local/tcl$TCL_OLD_ALT_VERS/unix \ - /usr/local/lib/tcl$TCL_OLD_VERS \ - /usr/local/lib/tcl$TCL_OLD_ALT_VERS \ - /usr/lib/tcl$TCL_OLD_VERS \ - /usr/lib/tcl$TCL_OLD_ALT_VERS \ - /usr/local/lib \ - $prefix/lib \ - $x_libs/tk \ - $x_libs \ - /usr/lib64 \ - /usr/lib \ - " - - - - -NS_PACKAGE_tcl_UNDERWAY=false -NS_PACKAGE_tcl_COMPLETE=true - - -{ $as_echo "$as_me:$LINENO: checking for tcl.h" >&5 -$as_echo_n "checking for tcl.h... " >&6; } -if test "x$d" = "xno"; then - : disable header - V_INCLUDE_TCL=FAIL - -NS_PACKAGE_tcl_COMPLETE=false - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - -else - places="$TCL_H_PLACES" - if test "x$d" != "x" -a "x$d" != xyes; then - if test ! -d $d; then - { { $as_echo "$as_me:$LINENO: error: $d is not a directory" >&5 -$as_echo "$as_me: error: $d is not a directory" >&2;} - { (exit 1); exit 1; }; } - fi - places="$TCL_H_PLACES_D" - fi - - V_INCLUDE_TCL="" - found="" - for dir in $places; do - if test -r $dir/tcl.h; then - found="$dir" - if test "$CC" != "icc" || - test "$dir" != "/usr/include"; then - V_INCLUDE_TCL="-I$dir" - fi - break - fi - done - if test "FAIL$found" = "FAIL" ; then - -NS_PACKAGE_tcl_COMPLETE=false - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - else - - ac_tr_hdr=HAVE_`echo tcl.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >>confdefs.h <<_ACEOF -#define $ac_tr_hdr 1 -_ACEOF - - - V_INCLUDES="$V_INCLUDE_TCL $V_INCLUDES" - V_DEFINES="-D$ac_tr_hdr $V_DEFINES" - - NS_PACKAGE_tcl_UNDERWAY=true - - { $as_echo "$as_me:$LINENO: result: $V_INCLUDE_TCL" >&5 -$as_echo "$V_INCLUDE_TCL" >&6; } - fi -fi - - -{ $as_echo "$as_me:$LINENO: checking for tclInt.h" >&5 -$as_echo_n "checking for tclInt.h... " >&6; } -if test "x$d" = "xno"; then - : disable header - V_INCLUDE_TCL=FAIL - -NS_PACKAGE_tcl_COMPLETE=false - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - -else - places="$TCL_H_PLACES" - if test "x$d" != "x" -a "x$d" != xyes; then - if test ! -d $d; then - { { $as_echo "$as_me:$LINENO: error: $d is not a directory" >&5 -$as_echo "$as_me: error: $d is not a directory" >&2;} - { (exit 1); exit 1; }; } - fi - places="$TCL_H_PLACES_D" - fi - - V_INCLUDE_TCL="" - found="" - for dir in $places; do - if test -r $dir/tclInt.h; then - found="$dir" - if test "$CC" != "icc" || - test "$dir" != "/usr/include"; then - V_INCLUDE_TCL="-I$dir" - fi - break - fi - done - if test "FAIL$found" = "FAIL" ; then - -NS_PACKAGE_tcl_COMPLETE=false - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - else - - ac_tr_hdr=HAVE_`echo tclInt.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >>confdefs.h <<_ACEOF -#define $ac_tr_hdr 1 -_ACEOF - - - V_INCLUDES="$V_INCLUDE_TCL $V_INCLUDES" - V_DEFINES="-D$ac_tr_hdr $V_DEFINES" - - NS_PACKAGE_tcl_UNDERWAY=true - - { $as_echo "$as_me:$LINENO: result: $V_INCLUDE_TCL" >&5 -$as_echo "$V_INCLUDE_TCL" >&6; } - fi -fi - - -{ $as_echo "$as_me:$LINENO: checking for libtcl$TCL_HI_VERS" >&5 -$as_echo_n "checking for libtcl$TCL_HI_VERS... " >&6; } -if test "x$d" = "xno"; then - : disable library - V_LIB_TCL=FAIL - -NS_PACKAGE_tcl_COMPLETE=false - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - -else - places="$TCL_LIB_PLACES" - if test "x$d" != "x" -a "x$d" != xyes; then - if test ! -d $d; then - { { $as_echo "$as_me:$LINENO: error: $d is not a directory" >&5 -$as_echo "$as_me: error: $d is not a directory" >&2;} - { (exit 1); exit 1; }; } - fi - places="$TCL_LIB_PLACES_D" - fi - - V_LIB_TCL="" - full_lib_name="tcl$TCL_HI_VERS" - simple_lib_name=`echo $full_lib_name | sed -e 's/\.//'` - other_simple_lib_name=`echo $full_lib_name | sed -e 's/\./_/'` - simpler_lib_name=`echo $simple_lib_name | sed -e 'y/0123456789/ /'` - double_break=false - for dir in $places; do - for file in $full_lib_name $simple_lib_name $other_simple_lib_name $simpler_lib_name - do - if test -r $dir/lib$file.so -o -r $dir/lib$file.a -o -r $dir/lib$file.dylib; then - V_LIB_TCL="-L$dir -l$file" - double_break=true - break - fi - done - if $double_break; then - break - fi - done - if test "FAIL$V_LIB_TCL" = "FAIL" ; then - -NS_PACKAGE_tcl_COMPLETE=false - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - else - if test "$solaris"; then - V_LIB_TCL="-R$dir $V_LIB_TCL" - fi - - ac_tr_lib=HAVE_LIB`echo tcl$TCL_HI_VERS | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >>confdefs.h <<_ACEOF -#define $ac_tr_lib 1 -_ACEOF - - - V_LIBS="$V_LIB_TCL $V_LIBS" - V_DEFINES="-D$ac_tr_lib $V_DEFINES" - - NS_PACKAGE_tcl_UNDERWAY=true - - { $as_echo "$as_me:$LINENO: result: $V_LIB_TCL" >&5 -$as_echo "$V_LIB_TCL" >&6; } - fi -fi - - -{ $as_echo "$as_me:$LINENO: checking for init.tcl" >&5 -$as_echo_n "checking for init.tcl... " >&6; } -if test "x$d" = "xno"; then - : disable header - V_LIBRARY_TCL=FAIL - -NS_PACKAGE_tcl_COMPLETE=false - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - -else - places="$TCL_TCL_PLACES" - if test "x$d" != "x" -a "x$d" != xyes; then - if test ! -d $d; then - { { $as_echo "$as_me:$LINENO: error: $d is not a directory" >&5 -$as_echo "$as_me: error: $d is not a directory" >&2;} - { (exit 1); exit 1; }; } - fi - places="$TCL_TCL_PLACES_D" - fi - - V_LIBRARY_TCL="" - for dir in $places; do - if test -r $dir/init.tcl; then - V_LIBRARY_TCL="$dir" - break - fi - done - if test "FAIL$V_LIBRARY_TCL" = "FAIL" ; then - -NS_PACKAGE_tcl_COMPLETE=false - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - else - - NS_PACKAGE_tcl_UNDERWAY=true - - { $as_echo "$as_me:$LINENO: result: $V_LIBRARY_TCL" >&5 -$as_echo "$V_LIBRARY_TCL" >&6; } - fi -fi - - -tcl_http_library_dir=/dev/null -tcl_http_places=" \ - $V_LIBRARY_TCL \ - $V_LIBRARY_TCL/http \ - $V_LIBRARY_TCL/http2.5 \ - $V_LIBRARY_TCL/http2.4 \ - $V_LIBRARY_TCL/http2.3 \ - $V_LIBRARY_TCL/http2.1 \ - $V_LIBRARY_TCL/http2.0 \ - $V_LIBRARY_TCL/http1.0 \ - " - -{ $as_echo "$as_me:$LINENO: checking for http.tcl" >&5 -$as_echo_n "checking for http.tcl... " >&6; } -if test "x""" = "xno"; then - : disable header - tcl_http_library_dir=FAIL - -NS_PACKAGE_tcl_COMPLETE=false - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - -else - places="$tcl_http_places" - if test "x""" != "x" -a "x""" != xyes; then - if test ! -d ""; then - { { $as_echo "$as_me:$LINENO: error: \"\" is not a directory" >&5 -$as_echo "$as_me: error: \"\" is not a directory" >&2;} - { (exit 1); exit 1; }; } - fi - places="""" - fi - - tcl_http_library_dir="" - for dir in $places; do - if test -r $dir/http.tcl; then - tcl_http_library_dir="$dir" - break - fi - done - if test "FAIL$tcl_http_library_dir" = "FAIL" ; then - -NS_PACKAGE_tcl_COMPLETE=false - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - else - - NS_PACKAGE_tcl_UNDERWAY=true - - { $as_echo "$as_me:$LINENO: result: $tcl_http_library_dir" >&5 -$as_echo "$tcl_http_library_dir" >&6; } - fi -fi - -{ $as_echo "$as_me:$LINENO: checking Tcl http.tcl library" >&5 -$as_echo_n "checking Tcl http.tcl library... " >&6; } -if test -f $tcl_http_library_dir/http.tcl -then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -else - { { $as_echo "$as_me:$LINENO: error: Couldn't find http.tcl in $tcl_http_places" >&5 -$as_echo "$as_me: error: Couldn't find http.tcl in $tcl_http_places" >&2;} - { (exit 1); exit 1; }; } -fi - - -V_TCL_LIBRARY_FILES="\$(TCL_BASE_LIBRARY_FILES) $tcl_http_library_dir/http.tcl" - - -# -# check for tclsh -# -oldpath=$PATH -# $d/unix works if $d is the 8.0 distribution -# $d/bin is for the ns-allinone distribution (kind of hacky, isn't it?) -PATH=../bin:../tcl$TCL_HI_VERS/unix:../tcl$TCL_VERS/unix:$d/unix:$d/bin:$PATH -for ac_prog in tclsh$TCL_VERS tclsh$TCL_HI_VERS tclsh tclsh$TCL_OLD_VERS -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_V_TCLSH+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $V_TCLSH in - [\\/]* | ?:[\\/]*) - ac_cv_path_V_TCLSH="$V_TCLSH" # 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_V_TCLSH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -V_TCLSH=$ac_cv_path_V_TCLSH -if test -n "$V_TCLSH"; then - { $as_echo "$as_me:$LINENO: result: $V_TCLSH" >&5 -$as_echo "$V_TCLSH" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$V_TCLSH" && break -done -test -n "$V_TCLSH" || V_TCLSH="no" - -if test x"$V_TCLSH" = xno -then - # out of luck - -NS_PACKAGE_tcl_COMPLETE=false - -fi -# absolutize it -V_TCLSH=`absolutize $V_TCLSH` -PATH=$oldpath - + /usr/lib/tcl$TCL_VERS \ + /usr/lib/tcl$TCL_HI_VERS \ + /usr/lib/tcl$TCL_ALT_VERS \ + ../tcl$TCL_OLD_VERS/unix \ + ../tcl$TCL_OLD_ALT_VERS/unix \ + /usr/src/local/tcl$TCL_OLD_VERS/unix \ + /usr/src/local/tcl$TCL_OLD_ALT_VERS/unix \ + /usr/local/lib/tcl$TCL_OLD_VERS \ + /usr/local/lib/tcl$TCL_OLD_ALT_VERS \ + /usr/lib/tcl$TCL_OLD_VERS \ + /usr/lib/tcl$TCL_OLD_ALT_VERS \ + /usr/local/lib \ + $prefix/lib \ + $x_libs/tk \ + $x_libs \ + /usr/lib64 \ + /usr/lib \ + " -NS_PACKAGE_tcl_VALID=false -if $NS_PACKAGE_tcl_UNDERWAY; then - if $NS_PACKAGE_tcl_COMPLETE; then - : All components of tcl found. - NS_PACKAGE_tcl_VALID=true - else - { { $as_echo "$as_me:$LINENO: error: Installation of tcl seems incomplete or can't be found automatically. -Please correct the problem by telling configure where tcl is -using the argument --with-tcl=/path/to/package -(perhaps after installing it), -or the package is not required, disable it with --with-tcl=no." >&5 -$as_echo "$as_me: error: Installation of tcl seems incomplete or can't be found automatically. -Please correct the problem by telling configure where tcl is -using the argument --with-tcl=/path/to/package -(perhaps after installing it), -or the package is not required, disable it with --with-tcl=no." >&2;} - { (exit 1); exit 1; }; } - fi -fi -if test "xyes" = xyes; then - if $NS_PACKAGE_tcl_VALID; then - : - else - { { $as_echo "$as_me:$LINENO: error: tcl is required but could not be completely found. -Please correct the problem by telling configure where tcl is -using the argument --with-tcl=/path/to/package, -or the package is not required, disable it with --with-tcl=no." >&5 -$as_echo "$as_me: error: tcl is required but could not be completely found. -Please correct the problem by telling configure where tcl is -using the argument --with-tcl=/path/to/package, -or the package is not required, disable it with --with-tcl=no." >&2;} - { (exit 1); exit 1; }; } - fi -fi +NS_PACKAGE_tcl_UNDERWAY=false +NS_PACKAGE_tcl_COMPLETE=true +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcl.h" >&5 +$as_echo_n "checking for tcl.h... " >&6; } +if test "x$d" = "xno"; then + : disable header + V_INCLUDE_TCL=FAIL +NS_PACKAGE_tcl_COMPLETE=false + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -# Check whether --with-tk was given. -if test "${with_tk+set}" = set; then - withval=$with_tk; d=$withval else - d="" -fi - - + places="$TCL_H_PLACES" + if test "x$d" != "x" -a "x$d" != xyes; then + if test ! -d $d; then + as_fn_error $? "$d is not a directory" "$LINENO" 5 + fi + places="$TCL_H_PLACES_D" + fi -# Check whether --with-tk-ver was given. -if test "${with_tk_ver+set}" = set; then - withval=$with_tk_ver; TK_VERS=$withval -else - TK_VERS=$TCL_VERS -fi + V_INCLUDE_TCL="" + found="" + for dir in $places; do + if test -r $dir/tcl.h; then + found="$dir" + if test "$CC" != "icc" || + test "$dir" != "/usr/include"; then + V_INCLUDE_TCL="-I$dir" + fi + break + fi + done + if test "FAIL$found" = "FAIL" ; then +NS_PACKAGE_tcl_COMPLETE=false + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + else -TK_HI_VERS=`echo $TK_VERS | sed 's/$[0-9]*$\.$[0-9]*$\.$[0-9]*$/\1.\2/'` -TK_MAJOR_VERS=`echo $TK_VERS | sed 's/$[0-9]*$\.$[0-9]*$\.$[0-9]*$/\1/'` -TK_ALT_VERS=8.5 + ac_tr_hdr=HAVE_`echo tcl.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >>confdefs.h <<_ACEOF +#define $ac_tr_hdr 1 +_ACEOF -TK_OLD_VERS=8.4 -TK_OLD_ALT_VERS=`echo $TK_OLD_VERS | sed 's/\.//'` -TK_TCL_PLACES_D="$d \ - $d/lib64/tk$TK_VERS \ - $d/lib64/tk$TK_ALT_VERS \ - $d/lib64/tk$TK_VERS \ - $d/lib/tk$TK_ALT_VERS \ - $d/lib/tk$TK_HI_VERS \ - $d/library \ - $d/lib/tk \ - $d/../lib/tk$TK_VERS \ - $d/../lib/tk$TK_ALT_VERS \ - $d/../lib/tk$TK_HI_VERS \ - $d/../lib/tk \ - $d/lib/tk$TK_OLD_VERS \ - $d/lib/tk$TK_OLD_ALT_VERS \ - $d/../lib/tk$TK_OLD_VERS \ - $d/../lib/tk$TK_OLD_ALT_VERS \ - $d/../lib/tk \ - $d/lib \ - $d/library" -TK_TCL_PLACES=" \ - ../lib/tk$TK_HI_VERS \ - ../lib/tk$TK_VERS \ - ../lib/tk$TK_ALT_VERS \ - ../tk$TK_VERS/library \ - ../tk$TK_ALT_VERS/library \ - ../tk$TK_HI_VERS/library \ - ../tk/library \ - /usr/src/local/tk$TK_VERS/library \ - /usr/src/local/tk$TK_ALT_VERS/library \ - /usr/src/local/tk$TK_HI_VERS/library \ - /usr/contrib/include \ - /usr/local/lib/tk$TK_VERS \ - /usr/local/lib/tk$TK_ALT_VERS \ - /usr/local/lib/tk$TK_HI_VERS \ - /usr/local/include/tk$TK_VERS \ - /usr/local/include/tk$TK_ALT_VERS \ - /usr/local/include/tk$TK_HI_VERS \ - /usr/local/include \ - /usr/lib64/tk$TK_VERS \ - /usr/lib64/tk$TK_ALT_VERS \ - /usr/lib64/tk$TK_HI_VERS \ - /usr/lib64/tk \ - /usr/lib/tk$TK_VERS \ - /usr/lib/tk$TK_ALT_VERS \ - /usr/lib/tk$TK_HI_VERS \ - /usr/lib/tk \ - /usr/share/tk$TK_VERS \ - /usr/share/tk$TK_ALT_VERS \ - /usr/share/tk$TK_HI_VERS \ - /usr/share/tcltk/k$TK_VERS \ - /usr/share/tcltk/tk$TK_ALT_VERS \ - /usr/share/tcltk/tk$TK_HI_VERS \ - /usr/share/tk \ - ../tk$TK_OLD_VERS/library \ - ../tk$TK_OLD_ALT_VERS/library \ - /usr/src/local/tk$TK_OLD_VERS/library \ - /usr/src/local/tk$TK_OLD_ALT_VERS/library \ - /usr/local/lib/tk$TK_OLD_VERS \ - /usr/local/lib/tk$TK_OLD_ALT_VERS \ - /usr/local/include/tk$TK_OLD_VERS \ - /usr/local/include/tk$TK_OLD_ALT_VERS \ - /usr/lib/tk$TK_OLD_VERS \ - /usr/lib/tk$TK_OLD_ALT_VERS \ - $prefix/include \ - $prefix/lib/tk \ - $x_includes/tk \ - $x_includes \ - /usr/include" -TK_H_PLACES_D="$d \ - $d/generic \ - $d/../include/tk$TK_VERS \ - $d/../include/tk$TK_HI_VERS \ - $d/../include/tk$TK_OLD_VERS \ - $d/include/tk$TK_VERS \ - $d/include/tk$TK_HI_VERS \ - $d/include/tk$TK_OLD_VERS \ - $d/include" -TK_H_PLACES=" \ - ../include \ - ../tk$TK_VERS/generic \ - ../tk$TK_ALT_VERS/generic \ - ../tk$TK_HI_VERS/generic \ - /usr/src/local/tk$TK_VERS/generic \ - /usr/src/local/tk$TK_ALT_VERS/generic \ - /usr/src/local/tk$TK_HI_VERS/generic \ - /usr/contrib/include \ - /usr/local/lib/tk$TK_VERS \ - /usr/local/lib/tk$TK_ALT_VERS \ - /usr/local/lib/tk$TK_HI_VERS \ - /usr/local/include/tk$TK_VERS \ - /usr/local/include/tk$TK_ALT_VERS \ - /usr/local/include/tk$TK_HI_VERS \ - /usr/local/include \ - /import/tk/include/tk$TK_VERS \ - /import/tk/include/tk$TK_ALT_VERS \ - /import/tk/include/tk$TK_HI_VERS \ - ../tk$TK_OLD_VERS/generic \ - ../tk$TK_OLD_ALT_VERS/generic \ - /usr/src/local/tk$TK_OLD_VERS/generic \ - /usr/src/local/tk$TK_OLD_ALT_VERS/generic \ - /usr/local/lib/tk$TK_OLD_VERS \ - /usr/local/lib/tk$TK_OLD_ALT_VERS \ - /usr/local/include/tk$TK_OLD_VERS \ - /usr/local/include/tk$TK_OLD_ALT_VERS \ - /import/tk/include/tk$TK_OLD_VERS \ - /import/tk/include/tk$TK_OLD_ALT_VERS \ - $prefix/include \ - $x_includes/tk \ - $x_includes \ - /usr/include \ - /usr/include/tcl \ - /usr/include/tcl$TK_VERS \ - /usr/include/tcl$TK_ALT_VERS \ - /usr/include/tcl$TK_HI_VERS \ - " -TK_LIB_PLACES_D="$d \ - $d/lib \ - $d/unix" -TK_LIB_PLACES=" \ - ../lib \ - ../lib/tk$TK_HI_VERS \ - ../lib/tk$TK_VERS \ - ../lib/tk$TK_ALT_VERS \ - ../tk$TK_VERS/unix \ - ../tk$TK_ALT_VERS/unix \ - ../tk$TK_HI_VERS/unix \ - /usr/src/local/tk$TK_VERS/unix \ - /usr/src/local/tk$TK_ALT_VERS/unix \ - /usr/src/local/tk$TK_HI_VERS/unix \ - /usr/contrib/lib \ - /usr/local/lib/tk$TK_VERS \ - /usr/local/lib/tk$TK_ALT_VERS \ - /usr/local/lib/tk$TK_HI_VERS \ - ../tk$TK_OLD_VERS/unix \ - ../tk$TK_OLD_ALT_VERS/unix \ - /usr/src/local/tk$TK_OLD_VERS/unix \ - /usr/src/local/tk$TK_OLD_ALT_VERS/unix \ - /usr/local/lib/tk$TK_OLD_VERS \ - /usr/local/lib/tk$TK_OLD_ALT_VERS \ - /usr/local/lib \ - $prefix/lib \ - $x_libs/tk \ - $x_libs \ - /usr/lib64 \ - /usr/lib" + V_INCLUDES="$V_INCLUDE_TCL $V_INCLUDES" + V_DEFINES="-D$ac_tr_hdr $V_DEFINES" + NS_PACKAGE_tcl_UNDERWAY=true -NS_PACKAGE_tk_UNDERWAY=false -NS_PACKAGE_tk_COMPLETE=true + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_INCLUDE_TCL" >&5 +$as_echo "$V_INCLUDE_TCL" >&6; } + fi +fi -{ $as_echo "$as_me:$LINENO: checking for tk.h" >&5 -$as_echo_n "checking for tk.h... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclInt.h" >&5 +$as_echo_n "checking for tclInt.h... " >&6; } if test "x$d" = "xno"; then : disable header - V_INCLUDE_TK=FAIL + V_INCLUDE_TCL=FAIL -NS_PACKAGE_tk_COMPLETE=false +NS_PACKAGE_tcl_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - places="$TK_H_PLACES" + places="$TCL_H_PLACES" if test "x$d" != "x" -a "x$d" != xyes; then if test ! -d $d; then - { { $as_echo "$as_me:$LINENO: error: $d is not a directory" >&5 -$as_echo "$as_me: error: $d is not a directory" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$d is not a directory" "$LINENO" 5 fi - places="$TK_H_PLACES_D" + places="$TCL_H_PLACES_D" fi - V_INCLUDE_TK="" + V_INCLUDE_TCL="" found="" for dir in $places; do - if test -r $dir/tk.h; then + if test -r $dir/tclInt.h; then found="$dir" if test "$CC" != "icc" || test "$dir" != "/usr/include"; then - V_INCLUDE_TK="-I$dir" + V_INCLUDE_TCL="-I$dir" fi break fi done if test "FAIL$found" = "FAIL" ; then -NS_PACKAGE_tk_COMPLETE=false +NS_PACKAGE_tcl_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - ac_tr_hdr=HAVE_`echo tk.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + ac_tr_hdr=HAVE_`echo tclInt.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` cat >>confdefs.h <<_ACEOF #define $ac_tr_hdr 1 _ACEOF - V_INCLUDES="$V_INCLUDE_TK $V_INCLUDES" + V_INCLUDES="$V_INCLUDE_TCL $V_INCLUDES" V_DEFINES="-D$ac_tr_hdr $V_DEFINES" - NS_PACKAGE_tk_UNDERWAY=true + NS_PACKAGE_tcl_UNDERWAY=true - { $as_echo "$as_me:$LINENO: result: $V_INCLUDE_TK" >&5 -$as_echo "$V_INCLUDE_TK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_INCLUDE_TCL" >&5 +$as_echo "$V_INCLUDE_TCL" >&6; } fi fi -{ $as_echo "$as_me:$LINENO: checking for libtk$TK_HI_VERS" >&5 -$as_echo_n "checking for libtk$TK_HI_VERS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtcl$TCL_HI_VERS" >&5 +$as_echo_n "checking for libtcl$TCL_HI_VERS... " >&6; } if test "x$d" = "xno"; then : disable library - V_LIB_TK=FAIL + V_LIB_TCL=FAIL -NS_PACKAGE_tk_COMPLETE=false +NS_PACKAGE_tcl_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - places="$TK_LIB_PLACES" + places="$TCL_LIB_PLACES" if test "x$d" != "x" -a "x$d" != xyes; then if test ! -d $d; then - { { $as_echo "$as_me:$LINENO: error: $d is not a directory" >&5 -$as_echo "$as_me: error: $d is not a directory" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$d is not a directory" "$LINENO" 5 fi - places="$TK_LIB_PLACES_D" + places="$TCL_LIB_PLACES_D" fi - V_LIB_TK="" - full_lib_name="tk$TK_HI_VERS" + V_LIB_TCL="" + full_lib_name="tcl$TCL_HI_VERS" simple_lib_name=`echo $full_lib_name | sed -e 's/\.//'` other_simple_lib_name=`echo $full_lib_name | sed -e 's/\./_/'` simpler_lib_name=`echo $simple_lib_name | sed -e 'y/0123456789/ /'` @@ -7081,7 +5995,7 @@ for file in $full_lib_name $simple_lib_name $other_simple_lib_name $simpler_lib_name do if test -r $dir/lib$file.so -o -r $dir/lib$file.a -o -r $dir/lib$file.dylib; then - V_LIB_TK="-L$dir -l$file" + V_LIB_TCL="-L$dir -l$file" double_break=true break fi @@ -7090,427 +6004,497 @@ break fi done - if test "FAIL$V_LIB_TK" = "FAIL" ; then + if test "FAIL$V_LIB_TCL" = "FAIL" ; then -NS_PACKAGE_tk_COMPLETE=false +NS_PACKAGE_tcl_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else if test "$solaris"; then - V_LIB_TK="-R$dir $V_LIB_TK" + V_LIB_TCL="-R$dir $V_LIB_TCL" fi - ac_tr_lib=HAVE_LIB`echo tk$TK_HI_VERS | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo tcl$TCL_HI_VERS | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >>confdefs.h <<_ACEOF #define $ac_tr_lib 1 _ACEOF - V_LIBS="$V_LIB_TK $V_LIBS" + V_LIBS="$V_LIB_TCL $V_LIBS" V_DEFINES="-D$ac_tr_lib $V_DEFINES" - NS_PACKAGE_tk_UNDERWAY=true + NS_PACKAGE_tcl_UNDERWAY=true - { $as_echo "$as_me:$LINENO: result: $V_LIB_TK" >&5 -$as_echo "$V_LIB_TK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_LIB_TCL" >&5 +$as_echo "$V_LIB_TCL" >&6; } fi fi -{ $as_echo "$as_me:$LINENO: checking for tk.tcl" >&5 -$as_echo_n "checking for tk.tcl... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for init.tcl" >&5 +$as_echo_n "checking for init.tcl... " >&6; } if test "x$d" = "xno"; then : disable header - V_LIBRARY_TK=FAIL + V_LIBRARY_TCL=FAIL -NS_PACKAGE_tk_COMPLETE=false +NS_PACKAGE_tcl_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - places="$TK_TCL_PLACES" + places="$TCL_TCL_PLACES" if test "x$d" != "x" -a "x$d" != xyes; then if test ! -d $d; then - { { $as_echo "$as_me:$LINENO: error: $d is not a directory" >&5 -$as_echo "$as_me: error: $d is not a directory" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$d is not a directory" "$LINENO" 5 fi - places="$TK_TCL_PLACES_D" + places="$TCL_TCL_PLACES_D" fi - V_LIBRARY_TK="" + V_LIBRARY_TCL="" for dir in $places; do - if test -r $dir/tk.tcl; then - V_LIBRARY_TK="$dir" + if test -r $dir/init.tcl; then + V_LIBRARY_TCL="$dir" break fi done - if test "FAIL$V_LIBRARY_TK" = "FAIL" ; then + if test "FAIL$V_LIBRARY_TCL" = "FAIL" ; then -NS_PACKAGE_tk_COMPLETE=false +NS_PACKAGE_tcl_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - NS_PACKAGE_tk_UNDERWAY=true - - { $as_echo "$as_me:$LINENO: result: $V_LIBRARY_TK" >&5 -$as_echo "$V_LIBRARY_TK" >&6; } - fi -fi - + NS_PACKAGE_tcl_UNDERWAY=true -NS_PACKAGE_tk_VALID=false -if $NS_PACKAGE_tk_UNDERWAY; then - if $NS_PACKAGE_tk_COMPLETE; then - : All components of tk found. - NS_PACKAGE_tk_VALID=true - else - { { $as_echo "$as_me:$LINENO: error: Installation of tk seems incomplete or can't be found automatically. -Please correct the problem by telling configure where tk is -using the argument --with-tk=/path/to/package -(perhaps after installing it), -or the package is not required, disable it with --with-tk=no." >&5 -$as_echo "$as_me: error: Installation of tk seems incomplete or can't be found automatically. -Please correct the problem by telling configure where tk is -using the argument --with-tk=/path/to/package -(perhaps after installing it), -or the package is not required, disable it with --with-tk=no." >&2;} - { (exit 1); exit 1; }; } - fi -fi -if test "xno" = xyes; then - if $NS_PACKAGE_tk_VALID; then - : - else - { { $as_echo "$as_me:$LINENO: error: tk is required but could not be completely found. -Please correct the problem by telling configure where tk is -using the argument --with-tk=/path/to/package, -or the package is not required, disable it with --with-tk=no." >&5 -$as_echo "$as_me: error: tk is required but could not be completely found. -Please correct the problem by telling configure where tk is -using the argument --with-tk=/path/to/package, -or the package is not required, disable it with --with-tk=no." >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_LIBRARY_TCL" >&5 +$as_echo "$V_LIBRARY_TCL" >&6; } fi fi -if test -r $V_LIBRARY_TK/optionMenu.tcl ; then - V_TKDOSNAMES='$(LIBRARY_TK)/optionMenu.tcl $(LIBRARY_TK)/scrollbar.tcl' - V_NEED_DL="" -else - V_TKDOSNAMES='$(LIBRARY_TK)/optMenu.tcl $(LIBRARY_TK)/scrlbar.tcl' - V_NEED_DL=YES -fi - - - - - - -# Check whether --with-tcldebug was given. -if test "${with_tcldebug+set}" = set; then - withval=$with_tcldebug; d=$withval -else - d="" -fi - - -#xxx: Don't know anything about 1.8 -# 2.0 = tcl 8.3 -# 1.9 = tcl 7.5, 7.6, 8.0 -TCLDEBUG_VERS="2.0 1.9 1.8 1.7" -pwd_vers="" -local_vers="" -for vers in $TCLDEBUG_VERS; do - pwd_vers="$pwd_vers $PWD/../tcl-debug-$vers" - local_vers="$local_vers /usr/src/local/otcl-debug-$vers" -done -TCLDEBUG_PATH="\ - $PWD/../tcl-debug \ - $pwd_vers - /usr/contrib/lib \ - /usr/local/lib \ - /usr/lib \ - /usr/src/local/tcl-debug \ - $local_vers \ - " -TCLDEBUG_PATH_D="$d \ - $d/lib \ - $d/../lib \ - " - - -NS_PACKAGE_tcldebug_UNDERWAY=false -NS_PACKAGE_tcldebug_COMPLETE=true - - +tcl_http_library_dir=/dev/null +tcl_http_places=" \ + $V_LIBRARY_TCL \ + $V_LIBRARY_TCL/http \ + $V_LIBRARY_TCL/http2.5 \ + $V_LIBRARY_TCL/http2.4 \ + $V_LIBRARY_TCL/http2.3 \ + $V_LIBRARY_TCL/http2.1 \ + $V_LIBRARY_TCL/http2.0 \ + $V_LIBRARY_TCL/http1.0 \ + " -{ $as_echo "$as_me:$LINENO: checking for libtcldbg" >&5 -$as_echo_n "checking for libtcldbg... " >&6; } -if test "x$d" = "xno"; then - : disable library - V_LIB_TCLDEBUG=FAIL +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for http.tcl" >&5 +$as_echo_n "checking for http.tcl... " >&6; } +if test "x""" = "xno"; then + : disable header + tcl_http_library_dir=FAIL -NS_PACKAGE_tcldebug_COMPLETE=false +NS_PACKAGE_tcl_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - places="$TCLDEBUG_PATH" - if test "x$d" != "x" -a "x$d" != xyes; then - if test ! -d $d; then - { { $as_echo "$as_me:$LINENO: error: $d is not a directory" >&5 -$as_echo "$as_me: error: $d is not a directory" >&2;} - { (exit 1); exit 1; }; } + places="$tcl_http_places" + if test "x""" != "x" -a "x""" != xyes; then + if test ! -d ""; then + as_fn_error $? "\"\" is not a directory" "$LINENO" 5 fi - places="$TCLDEBUG_PATH_D" + places="""" fi - V_LIB_TCLDEBUG="" - full_lib_name="tcldbg" - simple_lib_name=`echo $full_lib_name | sed -e 's/\.//'` - other_simple_lib_name=`echo $full_lib_name | sed -e 's/\./_/'` - simpler_lib_name=`echo $simple_lib_name | sed -e 'y/0123456789/ /'` - double_break=false + tcl_http_library_dir="" for dir in $places; do - for file in $full_lib_name $simple_lib_name $other_simple_lib_name $simpler_lib_name - do - if test -r $dir/lib$file.so -o -r $dir/lib$file.a -o -r $dir/lib$file.dylib; then - V_LIB_TCLDEBUG="-L$dir -l$file" - double_break=true - break - fi - done - if $double_break; then + if test -r $dir/http.tcl; then + tcl_http_library_dir="$dir" break fi done - if test "FAIL$V_LIB_TCLDEBUG" = "FAIL" ; then + if test "FAIL$tcl_http_library_dir" = "FAIL" ; then -NS_PACKAGE_tcldebug_COMPLETE=false +NS_PACKAGE_tcl_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - if test "$solaris"; then - V_LIB_TCLDEBUG="-R$dir $V_LIB_TCLDEBUG" - fi - ac_tr_lib=HAVE_LIB`echo tcldbg | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >>confdefs.h <<_ACEOF -#define $ac_tr_lib 1 -_ACEOF + NS_PACKAGE_tcl_UNDERWAY=true + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_http_library_dir" >&5 +$as_echo "$tcl_http_library_dir" >&6; } + fi +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Tcl http.tcl library" >&5 +$as_echo_n "checking Tcl http.tcl library... " >&6; } +if test -f $tcl_http_library_dir/http.tcl +then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + as_fn_error $? "Couldn't find http.tcl in $tcl_http_places" "$LINENO" 5 +fi + + +V_TCL_LIBRARY_FILES="\$(TCL_BASE_LIBRARY_FILES) $tcl_http_library_dir/http.tcl" + + +# +# check for tclsh +# +oldpath=$PATH +# $d/unix works if $d is the 8.0 distribution +# $d/bin is for the ns-allinone distribution (kind of hacky, isn't it?) +PATH=../bin:../tcl$TCL_HI_VERS/unix:../tcl$TCL_VERS/unix:$d/unix:$d/bin:$PATH +for ac_prog in tclsh$TCL_VERS tclsh$TCL_HI_VERS tclsh tclsh$TCL_OLD_VERS +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_V_TCLSH+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $V_TCLSH in + [\\/]* | ?:[\\/]*) + ac_cv_path_V_TCLSH="$V_TCLSH" # 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_V_TCLSH="$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 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +V_TCLSH=$ac_cv_path_V_TCLSH +if test -n "$V_TCLSH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_TCLSH" >&5 +$as_echo "$V_TCLSH" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + test -n "$V_TCLSH" && break +done +test -n "$V_TCLSH" || V_TCLSH="no" - V_LIBS="$V_LIB_TCLDEBUG $V_LIBS" - V_DEFINES="-D$ac_tr_lib $V_DEFINES" +if test x"$V_TCLSH" = xno +then + # out of luck - NS_PACKAGE_tcldebug_UNDERWAY=true +NS_PACKAGE_tcl_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: $V_LIB_TCLDEBUG" >&5 -$as_echo "$V_LIB_TCLDEBUG" >&6; } - fi fi +# absolutize it +V_TCLSH=`absolutize $V_TCLSH` +PATH=$oldpath -#if $NS_PACKAGE_tcldebug_COMPLETE; then - # look for debugger entry point function - #tmpLIBS=$LIBS - #LIBS="$V_LIB_TCL $V_LIB_TCLDEBUG" - - # the following two may be needed for linking during tcldbg CHECK_LIB - #AC_CHECK_LIB(m, main) - #AC_CHECK_LIB(dl, dlopen) - - #notfound=false - #AC_CHECK_LIB(tcldbg, Dbg_Init, V_DEFINES="-DHAVE_Dbg_Init $V_DEFINES",notfound=true) - #if $notfound; then - # notfound=false - # AC_CHECK_LIB(tcldbg, Tcldbg_Init, V_DEFINES="-DHAVE_Tcldbg_Init $V_DEFINES",notfound=true) - #fi - #LIBS=$tmpLIBS - #if $notfound; then - # echo "configure: warning: Tcl debugger init point is not found. You \ -#will not be able to use Tcl debugger." 1>&2 - # NS_PACKAGE_tcldebug_COMPLETE=false - #fi -#fi - -if $NS_PACKAGE_tcldebug_COMPLETE; then -NS_PACKAGE_tcldebug_VALID=false -if $NS_PACKAGE_tcldebug_UNDERWAY; then - if $NS_PACKAGE_tcldebug_COMPLETE; then - : All components of tcldebug found. - NS_PACKAGE_tcldebug_VALID=true +NS_PACKAGE_tcl_VALID=false +if $NS_PACKAGE_tcl_UNDERWAY; then + if $NS_PACKAGE_tcl_COMPLETE; then + : All components of tcl found. + NS_PACKAGE_tcl_VALID=true else - { { $as_echo "$as_me:$LINENO: error: Installation of tcldebug seems incomplete or can't be found automatically. -Please correct the problem by telling configure where tcldebug is -using the argument --with-tcldebug=/path/to/package -(perhaps after installing it), -or the package is not required, disable it with --with-tcldebug=no." >&5 -$as_echo "$as_me: error: Installation of tcldebug seems incomplete or can't be found automatically. -Please correct the problem by telling configure where tcldebug is -using the argument --with-tcldebug=/path/to/package + as_fn_error $? "Installation of tcl seems incomplete or can't be found automatically. +Please correct the problem by telling configure where tcl is +using the argument --with-tcl=/path/to/package (perhaps after installing it), -or the package is not required, disable it with --with-tcldebug=no." >&2;} - { (exit 1); exit 1; }; } +or the package is not required, disable it with --with-tcl=no." "$LINENO" 5 fi fi -if test "xno" = xyes; then - if $NS_PACKAGE_tcldebug_VALID; then +if test "xyes" = xyes; then + if $NS_PACKAGE_tcl_VALID; then : else - { { $as_echo "$as_me:$LINENO: error: tcldebug is required but could not be completely found. -Please correct the problem by telling configure where tcldebug is -using the argument --with-tcldebug=/path/to/package, -or the package is not required, disable it with --with-tcldebug=no." >&5 -$as_echo "$as_me: error: tcldebug is required but could not be completely found. -Please correct the problem by telling configure where tcldebug is -using the argument --with-tcldebug=/path/to/package, -or the package is not required, disable it with --with-tcldebug=no." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "tcl is required but could not be completely found. +Please correct the problem by telling configure where tcl is +using the argument --with-tcl=/path/to/package, +or the package is not required, disable it with --with-tcl=no." "$LINENO" 5 fi fi -fi -# Check whether --with-otcl was given. -if test "${with_otcl+set}" = set; then - withval=$with_otcl; d=$withval + + + + +# Check whether --with-tk was given. +if test "${with_tk+set}" = set; then : + withval=$with_tk; d=$withval else d="" fi -OTCL_VERS=1.14 -OTCL_ALT_VERS=1.0 -OTCL_H_PLACES_D="$d \ - $d/include" -OTCL_H_PLACES="../otcl \ - /usr/src/local/otcl \ - ../otcl-$OTCL_VERS \ - /import/otcl/include \ - /usr/src/local/otcl-$OTCL_VERS \ - /usr/src/local/otcl-$OTCL_ALT_VERS \ - $prefix/include \ - /usr/local/include \ - /usr/contrib/include \ - /usr/include" -OTCL_LIB_PLACES_D="$d \ - $d/lib \ - " -OTCL_LIB_PLACES="../otcl \ - ../otcl-$OTCL_VERS \ - ../otcl-$OTCL_ALT_VERS \ - $prefix/lib \ - $x_libraries \ - /usr/contrib/lib \ - /usr/local/lib \ - /usr/lib \ - /usr/src/local/otcl \ - /usr/src/local/otcl-$OTCL_VERS \ - /usr/src/local/otcl-$OTCL_ALT_VERS \ - " +# Check whether --with-tk-ver was given. +if test "${with_tk_ver+set}" = set; then : + withval=$with_tk_ver; TK_VERS=$withval +else + TK_VERS=$TCL_VERS +fi + + + +TK_HI_VERS=`echo $TK_VERS | sed 's/$[0-9]*$\.$[0-9]*$\.$[0-9]*$/\1.\2/'` +TK_MAJOR_VERS=`echo $TK_VERS | sed 's/$[0-9]*$\.$[0-9]*$\.$[0-9]*$/\1/'` +TK_ALT_VERS=8.5 + +TK_OLD_VERS=8.4 +TK_OLD_ALT_VERS=`echo $TK_OLD_VERS | sed 's/\.//'` + +TK_TCL_PLACES_D="$d \ + $d/lib64/tk$TK_VERS \ + $d/lib64/tk$TK_ALT_VERS \ + $d/lib64/tk$TK_VERS \ + $d/lib/tk$TK_ALT_VERS \ + $d/lib/tk$TK_HI_VERS \ + $d/library \ + $d/lib/tk \ + $d/../lib/tk$TK_VERS \ + $d/../lib/tk$TK_ALT_VERS \ + $d/../lib/tk$TK_HI_VERS \ + $d/../lib/tk \ + $d/lib/tk$TK_OLD_VERS \ + $d/lib/tk$TK_OLD_ALT_VERS \ + $d/../lib/tk$TK_OLD_VERS \ + $d/../lib/tk$TK_OLD_ALT_VERS \ + $d/../lib/tk \ + $d/lib \ + $d/library" +TK_TCL_PLACES=" \ + ../lib/tk$TK_HI_VERS \ + ../lib/tk$TK_VERS \ + ../lib/tk$TK_ALT_VERS \ + ../tk$TK_VERS/library \ + ../tk$TK_ALT_VERS/library \ + ../tk$TK_HI_VERS/library \ + ../tk/library \ + /usr/src/local/tk$TK_VERS/library \ + /usr/src/local/tk$TK_ALT_VERS/library \ + /usr/src/local/tk$TK_HI_VERS/library \ + /usr/contrib/include \ + /usr/local/lib/tk$TK_VERS \ + /usr/local/lib/tk$TK_ALT_VERS \ + /usr/local/lib/tk$TK_HI_VERS \ + /usr/local/include/tk$TK_VERS \ + /usr/local/include/tk$TK_ALT_VERS \ + /usr/local/include/tk$TK_HI_VERS \ + /usr/local/include \ + /usr/lib64/tk$TK_VERS \ + /usr/lib64/tk$TK_ALT_VERS \ + /usr/lib64/tk$TK_HI_VERS \ + /usr/lib64/tk \ + /usr/lib/tk$TK_VERS \ + /usr/lib/tk$TK_ALT_VERS \ + /usr/lib/tk$TK_HI_VERS \ + /usr/lib/tk \ + /usr/share/tk$TK_VERS \ + /usr/share/tk$TK_ALT_VERS \ + /usr/share/tk$TK_HI_VERS \ + /usr/share/tcltk/k$TK_VERS \ + /usr/share/tcltk/tk$TK_ALT_VERS \ + /usr/share/tcltk/tk$TK_HI_VERS \ + /usr/share/tk \ + ../tk$TK_OLD_VERS/library \ + ../tk$TK_OLD_ALT_VERS/library \ + /usr/src/local/tk$TK_OLD_VERS/library \ + /usr/src/local/tk$TK_OLD_ALT_VERS/library \ + /usr/local/lib/tk$TK_OLD_VERS \ + /usr/local/lib/tk$TK_OLD_ALT_VERS \ + /usr/local/include/tk$TK_OLD_VERS \ + /usr/local/include/tk$TK_OLD_ALT_VERS \ + /usr/lib/tk$TK_OLD_VERS \ + /usr/lib/tk$TK_OLD_ALT_VERS \ + $prefix/include \ + $prefix/lib/tk \ + $x_includes/tk \ + $x_includes \ + /usr/include" +TK_H_PLACES_D="$d \ + $d/generic \ + $d/../include/tk$TK_VERS \ + $d/../include/tk$TK_HI_VERS \ + $d/../include/tk$TK_OLD_VERS \ + $d/include/tk$TK_VERS \ + $d/include/tk$TK_HI_VERS \ + $d/include/tk$TK_OLD_VERS \ + $d/include" +TK_H_PLACES=" \ + ../include \ + ../tk$TK_VERS/generic \ + ../tk$TK_ALT_VERS/generic \ + ../tk$TK_HI_VERS/generic \ + /usr/src/local/tk$TK_VERS/generic \ + /usr/src/local/tk$TK_ALT_VERS/generic \ + /usr/src/local/tk$TK_HI_VERS/generic \ + /usr/contrib/include \ + /usr/local/lib/tk$TK_VERS \ + /usr/local/lib/tk$TK_ALT_VERS \ + /usr/local/lib/tk$TK_HI_VERS \ + /usr/local/include/tk$TK_VERS \ + /usr/local/include/tk$TK_ALT_VERS \ + /usr/local/include/tk$TK_HI_VERS \ + /usr/local/include \ + /import/tk/include/tk$TK_VERS \ + /import/tk/include/tk$TK_ALT_VERS \ + /import/tk/include/tk$TK_HI_VERS \ + ../tk$TK_OLD_VERS/generic \ + ../tk$TK_OLD_ALT_VERS/generic \ + /usr/src/local/tk$TK_OLD_VERS/generic \ + /usr/src/local/tk$TK_OLD_ALT_VERS/generic \ + /usr/local/lib/tk$TK_OLD_VERS \ + /usr/local/lib/tk$TK_OLD_ALT_VERS \ + /usr/local/include/tk$TK_OLD_VERS \ + /usr/local/include/tk$TK_OLD_ALT_VERS \ + /import/tk/include/tk$TK_OLD_VERS \ + /import/tk/include/tk$TK_OLD_ALT_VERS \ + $prefix/include \ + $x_includes/tk \ + $x_includes \ + /usr/include \ + /usr/include/tcl \ + /usr/include/tcl$TK_VERS \ + /usr/include/tcl$TK_ALT_VERS \ + /usr/include/tcl$TK_HI_VERS \ + " +TK_LIB_PLACES_D="$d \ + $d/lib \ + $d/unix" +TK_LIB_PLACES=" \ + ../lib \ + ../lib/tk$TK_HI_VERS \ + ../lib/tk$TK_VERS \ + ../lib/tk$TK_ALT_VERS \ + ../tk$TK_VERS/unix \ + ../tk$TK_ALT_VERS/unix \ + ../tk$TK_HI_VERS/unix \ + /usr/src/local/tk$TK_VERS/unix \ + /usr/src/local/tk$TK_ALT_VERS/unix \ + /usr/src/local/tk$TK_HI_VERS/unix \ + /usr/contrib/lib \ + /usr/local/lib/tk$TK_VERS \ + /usr/local/lib/tk$TK_ALT_VERS \ + /usr/local/lib/tk$TK_HI_VERS \ + ../tk$TK_OLD_VERS/unix \ + ../tk$TK_OLD_ALT_VERS/unix \ + /usr/src/local/tk$TK_OLD_VERS/unix \ + /usr/src/local/tk$TK_OLD_ALT_VERS/unix \ + /usr/local/lib/tk$TK_OLD_VERS \ + /usr/local/lib/tk$TK_OLD_ALT_VERS \ + /usr/local/lib \ + $prefix/lib \ + $x_libs/tk \ + $x_libs \ + /usr/lib64 \ + /usr/lib" -NS_PACKAGE_otcl_UNDERWAY=false -NS_PACKAGE_otcl_COMPLETE=true +NS_PACKAGE_tk_UNDERWAY=false +NS_PACKAGE_tk_COMPLETE=true -{ $as_echo "$as_me:$LINENO: checking for otcl.h" >&5 -$as_echo_n "checking for otcl.h... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tk.h" >&5 +$as_echo_n "checking for tk.h... " >&6; } if test "x$d" = "xno"; then : disable header - V_INCLUDE_OTCL=FAIL + V_INCLUDE_TK=FAIL -NS_PACKAGE_otcl_COMPLETE=false +NS_PACKAGE_tk_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - places="$OTCL_H_PLACES" + places="$TK_H_PLACES" if test "x$d" != "x" -a "x$d" != xyes; then if test ! -d $d; then - { { $as_echo "$as_me:$LINENO: error: $d is not a directory" >&5 -$as_echo "$as_me: error: $d is not a directory" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$d is not a directory" "$LINENO" 5 fi - places="$OTCL_H_PLACES_D" + places="$TK_H_PLACES_D" fi - V_INCLUDE_OTCL="" + V_INCLUDE_TK="" found="" for dir in $places; do - if test -r $dir/otcl.h; then + if test -r $dir/tk.h; then found="$dir" if test "$CC" != "icc" || test "$dir" != "/usr/include"; then - V_INCLUDE_OTCL="-I$dir" + V_INCLUDE_TK="-I$dir" fi break fi done if test "FAIL$found" = "FAIL" ; then -NS_PACKAGE_otcl_COMPLETE=false +NS_PACKAGE_tk_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - ac_tr_hdr=HAVE_`echo otcl.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + ac_tr_hdr=HAVE_`echo tk.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` cat >>confdefs.h <<_ACEOF #define $ac_tr_hdr 1 _ACEOF - V_INCLUDES="$V_INCLUDE_OTCL $V_INCLUDES" + V_INCLUDES="$V_INCLUDE_TK $V_INCLUDES" V_DEFINES="-D$ac_tr_hdr $V_DEFINES" - NS_PACKAGE_otcl_UNDERWAY=true + NS_PACKAGE_tk_UNDERWAY=true - { $as_echo "$as_me:$LINENO: result: $V_INCLUDE_OTCL" >&5 -$as_echo "$V_INCLUDE_OTCL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_INCLUDE_TK" >&5 +$as_echo "$V_INCLUDE_TK" >&6; } fi fi -{ $as_echo "$as_me:$LINENO: checking for libotcl$OTCL_VERS" >&5 -$as_echo_n "checking for libotcl$OTCL_VERS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtk$TK_HI_VERS" >&5 +$as_echo_n "checking for libtk$TK_HI_VERS... " >&6; } if test "x$d" = "xno"; then : disable library - V_LIB_OTCL=FAIL + V_LIB_TK=FAIL -NS_PACKAGE_otcl_COMPLETE=false +NS_PACKAGE_tk_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - places="$OTCL_LIB_PLACES" + places="$TK_LIB_PLACES" if test "x$d" != "x" -a "x$d" != xyes; then if test ! -d $d; then - { { $as_echo "$as_me:$LINENO: error: $d is not a directory" >&5 -$as_echo "$as_me: error: $d is not a directory" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$d is not a directory" "$LINENO" 5 fi - places="$OTCL_LIB_PLACES_D" + places="$TK_LIB_PLACES_D" fi - V_LIB_OTCL="" - full_lib_name="otcl$OTCL_VERS" + V_LIB_TK="" + full_lib_name="tk$TK_HI_VERS" simple_lib_name=`echo $full_lib_name | sed -e 's/\.//'` other_simple_lib_name=`echo $full_lib_name | sed -e 's/\./_/'` simpler_lib_name=`echo $simple_lib_name | sed -e 'y/0123456789/ /'` @@ -7519,7 +6503,7 @@ for file in $full_lib_name $simple_lib_name $other_simple_lib_name $simpler_lib_name do if test -r $dir/lib$file.so -o -r $dir/lib$file.a -o -r $dir/lib$file.dylib; then - V_LIB_OTCL="-L$dir -l$file" + V_LIB_TK="-L$dir -l$file" double_break=true break fi @@ -7528,239 +6512,176 @@ break fi done - if test "FAIL$V_LIB_OTCL" = "FAIL" ; then + if test "FAIL$V_LIB_TK" = "FAIL" ; then -NS_PACKAGE_otcl_COMPLETE=false +NS_PACKAGE_tk_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else if test "$solaris"; then - V_LIB_OTCL="-R$dir $V_LIB_OTCL" + V_LIB_TK="-R$dir $V_LIB_TK" fi - ac_tr_lib=HAVE_LIB`echo otcl$OTCL_VERS | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo tk$TK_HI_VERS | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >>confdefs.h <<_ACEOF #define $ac_tr_lib 1 _ACEOF - V_LIBS="$V_LIB_OTCL $V_LIBS" + V_LIBS="$V_LIB_TK $V_LIBS" V_DEFINES="-D$ac_tr_lib $V_DEFINES" - NS_PACKAGE_otcl_UNDERWAY=true - - { $as_echo "$as_me:$LINENO: result: $V_LIB_OTCL" >&5 -$as_echo "$V_LIB_OTCL" >&6; } - fi -fi - + NS_PACKAGE_tk_UNDERWAY=true -NS_PACKAGE_otcl_VALID=false -if $NS_PACKAGE_otcl_UNDERWAY; then - if $NS_PACKAGE_otcl_COMPLETE; then - : All components of otcl found. - NS_PACKAGE_otcl_VALID=true - else - { { $as_echo "$as_me:$LINENO: error: Installation of otcl seems incomplete or can't be found automatically. -Please correct the problem by telling configure where otcl is -using the argument --with-otcl=/path/to/package -(perhaps after installing it), -or the package is not required, disable it with --with-otcl=no." >&5 -$as_echo "$as_me: error: Installation of otcl seems incomplete or can't be found automatically. -Please correct the problem by telling configure where otcl is -using the argument --with-otcl=/path/to/package -(perhaps after installing it), -or the package is not required, disable it with --with-otcl=no." >&2;} - { (exit 1); exit 1; }; } - fi -fi -if test "xyes" = xyes; then - if $NS_PACKAGE_otcl_VALID; then - : - else - { { $as_echo "$as_me:$LINENO: error: otcl is required but could not be completely found. -Please correct the problem by telling configure where otcl is -using the argument --with-otcl=/path/to/package, -or the package is not required, disable it with --with-otcl=no." >&5 -$as_echo "$as_me: error: otcl is required but could not be completely found. -Please correct the problem by telling configure where otcl is -using the argument --with-otcl=/path/to/package, -or the package is not required, disable it with --with-otcl=no." >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_LIB_TK" >&5 +$as_echo "$V_LIB_TK" >&6; } fi fi - - - -# Check whether --with-Tcl was given. -if test "${with_Tcl+set}" = set; then - withval=$with_Tcl; { { $as_echo "$as_me:$LINENO: error: The --with-Tcl option has been replaced with --with-tclcl. -Please insure you have an up-to-date copy of TclCL and re-run your configuration." >&5 -$as_echo "$as_me: error: The --with-Tcl option has been replaced with --with-tclcl. -Please insure you have an up-to-date copy of TclCL and re-run your configuration." >&2;} - { (exit 1); exit 1; }; } -fi - - - -# Check whether --with-tclcl was given. -if test "${with_tclcl+set}" = set; then - withval=$with_tclcl; d=$withval -else - d="" -fi - - -TCLCL_VERS=1.20 -TCLCL_ALT_VERS=1.0 - -TCLCL_H_PLACES="\ - ../tclcl-$TCLCL_VERS \ - ../tclcl-$TCLCL_ALT_VERS \ - ../tclcl \ - ../TclCL \ - ../Tcl-$TCLCL_VERS \ - ../Tcl-$TCLCL_ALT_VERS \ - ../Tcl \ - /usr/src/local/Tcl \ - /usr/src/local/Tcl-1.0 \ - /import/Tcl/include \ - /usr/local/include \ - /usr/contrib/include \ - /usr/include" -TCLCL_H_PLACES_D="$d \ - $d/include" -TCLCL_LIB_PLACES="\ - ../tclcl-$TCLCL_VERS \ - ../tclcl-$TCLCL_ALT_VERS \ - ../tclcl \ - ../TclCL \ - ../Tcl-$TCLCL_VERS \ - ../Tcl-$TCLCL_ALT_VERS \ - ../Tcl \ - $x_libraries \ - /usr/contrib/lib \ - /usr/local/lib \ - /usr/lib \ - /usr/src/local/Tcl \ - /usr/src/local/Tcl-1.0" -TCLCL_LIB_PLACES_D="\ - $d \ - $d/lib \ - $d/bin" -TCLCL_PROG_PLACES="\ - ../tclcl-$TCLCL_VERS \ - ../tclcl-$TCLCL_ALT_VERS \ - ../tclcl \ - ../TclCL \ - ../Tcl-$TCLCL_VERS \ - ../Tcl-$TCLCL_ALT_VERS \ - ../Tcl \ - $prefix/bin \ - $x_libraries \ - /usr/contrib/bin \ - /usr/local/bin \ - /usr/bin \ - /usr/src/local/Tcl \ - /usr/src/local/Tcl-1.0 \ - " -TCLCL_PROG_PLACES_D=" - $d \ - $d/bin" - - - -NS_PACKAGE_tclcl_UNDERWAY=false -NS_PACKAGE_tclcl_COMPLETE=true - - -{ $as_echo "$as_me:$LINENO: checking for tclcl.h" >&5 -$as_echo_n "checking for tclcl.h... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tk.tcl" >&5 +$as_echo_n "checking for tk.tcl... " >&6; } if test "x$d" = "xno"; then : disable header - V_INCLUDE_TCLCL=FAIL + V_LIBRARY_TK=FAIL -NS_PACKAGE_tclcl_COMPLETE=false +NS_PACKAGE_tk_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - places="$TCLCL_H_PLACES" + places="$TK_TCL_PLACES" if test "x$d" != "x" -a "x$d" != xyes; then if test ! -d $d; then - { { $as_echo "$as_me:$LINENO: error: $d is not a directory" >&5 -$as_echo "$as_me: error: $d is not a directory" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$d is not a directory" "$LINENO" 5 fi - places="$TCLCL_H_PLACES_D" + places="$TK_TCL_PLACES_D" fi - V_INCLUDE_TCLCL="" - found="" + V_LIBRARY_TK="" for dir in $places; do - if test -r $dir/tclcl.h; then - found="$dir" - if test "$CC" != "icc" || - test "$dir" != "/usr/include"; then - V_INCLUDE_TCLCL="-I$dir" - fi + if test -r $dir/tk.tcl; then + V_LIBRARY_TK="$dir" break fi done - if test "FAIL$found" = "FAIL" ; then + if test "FAIL$V_LIBRARY_TK" = "FAIL" ; then -NS_PACKAGE_tclcl_COMPLETE=false +NS_PACKAGE_tk_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - ac_tr_hdr=HAVE_`echo tclcl.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >>confdefs.h <<_ACEOF -#define $ac_tr_hdr 1 -_ACEOF + NS_PACKAGE_tk_UNDERWAY=true + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_LIBRARY_TK" >&5 +$as_echo "$V_LIBRARY_TK" >&6; } + fi +fi + + +NS_PACKAGE_tk_VALID=false +if $NS_PACKAGE_tk_UNDERWAY; then + if $NS_PACKAGE_tk_COMPLETE; then + : All components of tk found. + NS_PACKAGE_tk_VALID=true + else + as_fn_error $? "Installation of tk seems incomplete or can't be found automatically. +Please correct the problem by telling configure where tk is +using the argument --with-tk=/path/to/package +(perhaps after installing it), +or the package is not required, disable it with --with-tk=no." "$LINENO" 5 + fi +fi +if test "xno" = xyes; then + if $NS_PACKAGE_tk_VALID; then + : + else + as_fn_error $? "tk is required but could not be completely found. +Please correct the problem by telling configure where tk is +using the argument --with-tk=/path/to/package, +or the package is not required, disable it with --with-tk=no." "$LINENO" 5 + fi +fi + + +if test -r $V_LIBRARY_TK/optionMenu.tcl ; then + V_TKDOSNAMES='$(LIBRARY_TK)/optionMenu.tcl $(LIBRARY_TK)/scrollbar.tcl' + V_NEED_DL="" +else + V_TKDOSNAMES='$(LIBRARY_TK)/optMenu.tcl $(LIBRARY_TK)/scrlbar.tcl' + V_NEED_DL=YES +fi + + + + + +# Check whether --with-tcldebug was given. +if test "${with_tcldebug+set}" = set; then : + withval=$with_tcldebug; d=$withval +else + d="" +fi + + +#xxx: Don't know anything about 1.8 +# 2.0 = tcl 8.3 +# 1.9 = tcl 7.5, 7.6, 8.0 +TCLDEBUG_VERS="2.0 1.9 1.8 1.7" +pwd_vers="" +local_vers="" +for vers in $TCLDEBUG_VERS; do + pwd_vers="$pwd_vers $PWD/../tcl-debug-$vers" + local_vers="$local_vers /usr/src/local/otcl-debug-$vers" +done +TCLDEBUG_PATH="\ + $PWD/../tcl-debug \ + $pwd_vers + /usr/contrib/lib \ + /usr/local/lib \ + /usr/lib \ + /usr/src/local/tcl-debug \ + $local_vers \ + " +TCLDEBUG_PATH_D="$d \ + $d/lib \ + $d/../lib \ + " - V_INCLUDES="$V_INCLUDE_TCLCL $V_INCLUDES" - V_DEFINES="-D$ac_tr_hdr $V_DEFINES" - NS_PACKAGE_tclcl_UNDERWAY=true +NS_PACKAGE_tcldebug_UNDERWAY=false +NS_PACKAGE_tcldebug_COMPLETE=true - { $as_echo "$as_me:$LINENO: result: $V_INCLUDE_TCLCL" >&5 -$as_echo "$V_INCLUDE_TCLCL" >&6; } - fi -fi -{ $as_echo "$as_me:$LINENO: checking for libtclcl$tclcl_VERS" >&5 -$as_echo_n "checking for libtclcl$tclcl_VERS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtcldbg" >&5 +$as_echo_n "checking for libtcldbg... " >&6; } if test "x$d" = "xno"; then : disable library - V_LIB_TCLCL=FAIL + V_LIB_TCLDEBUG=FAIL -NS_PACKAGE_tclcl_COMPLETE=false +NS_PACKAGE_tcldebug_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - places="$TCLCL_LIB_PLACES" + places="$TCLDEBUG_PATH" if test "x$d" != "x" -a "x$d" != xyes; then if test ! -d $d; then - { { $as_echo "$as_me:$LINENO: error: $d is not a directory" >&5 -$as_echo "$as_me: error: $d is not a directory" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$d is not a directory" "$LINENO" 5 fi - places="$TCLCL_LIB_PLACES_D" + places="$TCLDEBUG_PATH_D" fi - V_LIB_TCLCL="" - full_lib_name="tclcl$tclcl_VERS" + V_LIB_TCLDEBUG="" + full_lib_name="tcldbg" simple_lib_name=`echo $full_lib_name | sed -e 's/\.//'` other_simple_lib_name=`echo $full_lib_name | sed -e 's/\./_/'` simpler_lib_name=`echo $simple_lib_name | sed -e 'y/0123456789/ /'` @@ -7769,7 +6690,7 @@ for file in $full_lib_name $simple_lib_name $other_simple_lib_name $simpler_lib_name do if test -r $dir/lib$file.so -o -r $dir/lib$file.a -o -r $dir/lib$file.dylib; then - V_LIB_TCLCL="-L$dir -l$file" + V_LIB_TCLDEBUG="-L$dir -l$file" double_break=true break fi @@ -7778,1278 +6699,707 @@ break fi done - if test "FAIL$V_LIB_TCLCL" = "FAIL" ; then + if test "FAIL$V_LIB_TCLDEBUG" = "FAIL" ; then -NS_PACKAGE_tclcl_COMPLETE=false +NS_PACKAGE_tcldebug_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else if test "$solaris"; then - V_LIB_TCLCL="-R$dir $V_LIB_TCLCL" + V_LIB_TCLDEBUG="-R$dir $V_LIB_TCLDEBUG" fi - ac_tr_lib=HAVE_LIB`echo tclcl$tclcl_VERS | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo tcldbg | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >>confdefs.h <<_ACEOF #define $ac_tr_lib 1 _ACEOF - V_LIBS="$V_LIB_TCLCL $V_LIBS" + V_LIBS="$V_LIB_TCLDEBUG $V_LIBS" V_DEFINES="-D$ac_tr_lib $V_DEFINES" - NS_PACKAGE_tclcl_UNDERWAY=true + NS_PACKAGE_tcldebug_UNDERWAY=true - { $as_echo "$as_me:$LINENO: result: $V_LIB_TCLCL" >&5 -$as_echo "$V_LIB_TCLCL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_LIB_TCLDEBUG" >&5 +$as_echo "$V_LIB_TCLDEBUG" >&6; } + fi +fi + +#if $NS_PACKAGE_tcldebug_COMPLETE; then + # look for debugger entry point function + #tmpLIBS=$LIBS + #LIBS="$V_LIB_TCL $V_LIB_TCLDEBUG" + + # the following two may be needed for linking during tcldbg CHECK_LIB + #AC_CHECK_LIB(m, main) + #AC_CHECK_LIB(dl, dlopen) + + #notfound=false + #AC_CHECK_LIB(tcldbg, Dbg_Init, V_DEFINES="-DHAVE_Dbg_Init $V_DEFINES",notfound=true) + #if $notfound; then + # notfound=false + # AC_CHECK_LIB(tcldbg, Tcldbg_Init, V_DEFINES="-DHAVE_Tcldbg_Init $V_DEFINES",notfound=true) + #fi + #LIBS=$tmpLIBS + #if $notfound; then + # echo "configure: warning: Tcl debugger init point is not found. You \ +#will not be able to use Tcl debugger." 1>&2 + # NS_PACKAGE_tcldebug_COMPLETE=false + #fi +#fi + +if $NS_PACKAGE_tcldebug_COMPLETE; then + +NS_PACKAGE_tcldebug_VALID=false +if $NS_PACKAGE_tcldebug_UNDERWAY; then + if $NS_PACKAGE_tcldebug_COMPLETE; then + : All components of tcldebug found. + NS_PACKAGE_tcldebug_VALID=true + else + as_fn_error $? "Installation of tcldebug seems incomplete or can't be found automatically. +Please correct the problem by telling configure where tcldebug is +using the argument --with-tcldebug=/path/to/package +(perhaps after installing it), +or the package is not required, disable it with --with-tcldebug=no." "$LINENO" 5 + fi +fi +if test "xno" = xyes; then + if $NS_PACKAGE_tcldebug_VALID; then + : + else + as_fn_error $? "tcldebug is required but could not be completely found. +Please correct the problem by telling configure where tcldebug is +using the argument --with-tcldebug=/path/to/package, +or the package is not required, disable it with --with-tcldebug=no." "$LINENO" 5 fi fi +fi + -{ $as_echo "$as_me:$LINENO: checking for tcl2c++" >&5 -$as_echo_n "checking for tcl2c++... " >&6; } + +# Check whether --with-otcl was given. +if test "${with_otcl+set}" = set; then : + withval=$with_otcl; d=$withval +else + d="" +fi + + +OTCL_VERS=1.14 +OTCL_ALT_VERS=1.0 + +OTCL_H_PLACES_D="$d \ + $d/include" +OTCL_H_PLACES="../otcl \ + /usr/src/local/otcl \ + ../otcl-$OTCL_VERS \ + /import/otcl/include \ + /usr/src/local/otcl-$OTCL_VERS \ + /usr/src/local/otcl-$OTCL_ALT_VERS \ + $prefix/include \ + /usr/local/include \ + /usr/contrib/include \ + /usr/include" +OTCL_LIB_PLACES_D="$d \ + $d/lib \ + " +OTCL_LIB_PLACES="../otcl \ + ../otcl-$OTCL_VERS \ + ../otcl-$OTCL_ALT_VERS \ + $prefix/lib \ + $x_libraries \ + /usr/contrib/lib \ + /usr/local/lib \ + /usr/lib \ + /usr/src/local/otcl \ + /usr/src/local/otcl-$OTCL_VERS \ + /usr/src/local/otcl-$OTCL_ALT_VERS \ + " + + +NS_PACKAGE_otcl_UNDERWAY=false +NS_PACKAGE_otcl_COMPLETE=true + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for otcl.h" >&5 +$as_echo_n "checking for otcl.h... " >&6; } if test "x$d" = "xno"; then : disable header - V_TCL2CPP_DIR=FAIL + V_INCLUDE_OTCL=FAIL -NS_PACKAGE_tclcl_COMPLETE=false +NS_PACKAGE_otcl_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - places="$TCLCL_PROG_PLACES" + places="$OTCL_H_PLACES" if test "x$d" != "x" -a "x$d" != xyes; then if test ! -d $d; then - { { $as_echo "$as_me:$LINENO: error: $d is not a directory" >&5 -$as_echo "$as_me: error: $d is not a directory" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$d is not a directory" "$LINENO" 5 fi - places="$TCLCL_PROG_PLACES_D" + places="$OTCL_H_PLACES_D" fi - V_TCL2CPP_DIR="" + V_INCLUDE_OTCL="" + found="" for dir in $places; do - if test -r $dir/tcl2c++; then - V_TCL2CPP_DIR="$dir" + if test -r $dir/otcl.h; then + found="$dir" + if test "$CC" != "icc" || + test "$dir" != "/usr/include"; then + V_INCLUDE_OTCL="-I$dir" + fi break fi done - if test "FAIL$V_TCL2CPP_DIR" = "FAIL" ; then + if test "FAIL$found" = "FAIL" ; then -NS_PACKAGE_tclcl_COMPLETE=false +NS_PACKAGE_otcl_COMPLETE=false - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - NS_PACKAGE_tclcl_UNDERWAY=true - - { $as_echo "$as_me:$LINENO: result: $V_TCL2CPP_DIR" >&5 -$as_echo "$V_TCL2CPP_DIR" >&6; } - fi -fi - + ac_tr_hdr=HAVE_`echo otcl.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >>confdefs.h <<_ACEOF +#define $ac_tr_hdr 1 +_ACEOF -V_TCL2CPP=$V_TCL2CPP_DIR/tcl2c++ + V_INCLUDES="$V_INCLUDE_OTCL $V_INCLUDES" + V_DEFINES="-D$ac_tr_hdr $V_DEFINES" + NS_PACKAGE_otcl_UNDERWAY=true -NS_PACKAGE_tclcl_VALID=false -if $NS_PACKAGE_tclcl_UNDERWAY; then - if $NS_PACKAGE_tclcl_COMPLETE; then - : All components of tclcl found. - NS_PACKAGE_tclcl_VALID=true - else - { { $as_echo "$as_me:$LINENO: error: Installation of tclcl seems incomplete or can't be found automatically. -Please correct the problem by telling configure where tclcl is -using the argument --with-tclcl=/path/to/package -(perhaps after installing it), -or the package is not required, disable it with --with-tclcl=no." >&5 -$as_echo "$as_me: error: Installation of tclcl seems incomplete or can't be found automatically. -Please correct the problem by telling configure where tclcl is -using the argument --with-tclcl=/path/to/package -(perhaps after installing it), -or the package is not required, disable it with --with-tclcl=no." >&2;} - { (exit 1); exit 1; }; } - fi -fi -if test "xyes" = xyes; then - if $NS_PACKAGE_tclcl_VALID; then - : - else - { { $as_echo "$as_me:$LINENO: error: tclcl is required but could not be completely found. -Please correct the problem by telling configure where tclcl is -using the argument --with-tclcl=/path/to/package, -or the package is not required, disable it with --with-tclcl=no." >&5 -$as_echo "$as_me: error: tclcl is required but could not be completely found. -Please correct the problem by telling configure where tclcl is -using the argument --with-tclcl=/path/to/package, -or the package is not required, disable it with --with-tclcl=no." >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_INCLUDE_OTCL" >&5 +$as_echo "$V_INCLUDE_OTCL" >&6; } fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libotcl$OTCL_VERS" >&5 +$as_echo_n "checking for libotcl$OTCL_VERS... " >&6; } +if test "x$d" = "xno"; then + : disable library + V_LIB_OTCL=FAIL +NS_PACKAGE_otcl_COMPLETE=false -{ $as_echo "$as_me:$LINENO: checking return type of random" >&5 -$as_echo_n "checking return type of random... " >&6; } -touch confdefs.h -if test "$cross_compiling" = yes; then - { $as_echo "$as_me:$LINENO: result: cross compiling--guessing int" >&5 -$as_echo "cross compiling--guessing int" >&6; } -cat >>confdefs.h <<\_ACEOF -#define RANDOM_RETURN_TYPE int -_ACEOF - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&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 "confdefs.h" -long random() { return 1; } -main() { exit(0); } + places="$OTCL_LIB_PLACES" + if test "x$d" != "x" -a "x$d" != xyes; then + if test ! -d $d; then + as_fn_error $? "$d is not a directory" "$LINENO" 5 + fi + places="$OTCL_LIB_PLACES_D" + fi -_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: long" >&5 -$as_echo "long" >&6; } -cat >>confdefs.h <<\_ACEOF -#define RANDOM_RETURN_TYPE long -_ACEOF + V_LIB_OTCL="" + full_lib_name="otcl$OTCL_VERS" + simple_lib_name=`echo $full_lib_name | sed -e 's/\.//'` + other_simple_lib_name=`echo $full_lib_name | sed -e 's/\./_/'` + simpler_lib_name=`echo $simple_lib_name | sed -e 'y/0123456789/ /'` + double_break=false + for dir in $places; do + for file in $full_lib_name $simple_lib_name $other_simple_lib_name $simpler_lib_name + do + if test -r $dir/lib$file.so -o -r $dir/lib$file.a -o -r $dir/lib$file.dylib; then + V_LIB_OTCL="-L$dir -l$file" + double_break=true + break + fi + done + if $double_break; then + break + fi + done + if test "FAIL$V_LIB_OTCL" = "FAIL" ; then +NS_PACKAGE_otcl_COMPLETE=false -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + else + if test "$solaris"; then + V_LIB_OTCL="-R$dir $V_LIB_OTCL" + fi -( exit $ac_status ) -{ $as_echo "$as_me:$LINENO: result: int" >&5 -$as_echo "int" >&6; } -cat >>confdefs.h <<\_ACEOF -#define RANDOM_RETURN_TYPE int + ac_tr_lib=HAVE_LIB`echo otcl$OTCL_VERS | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >>confdefs.h <<_ACEOF +#define $ac_tr_lib 1 _ACEOF -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - + V_LIBS="$V_LIB_OTCL $V_LIBS" + V_DEFINES="-D$ac_tr_lib $V_DEFINES" -{ $as_echo "$as_me:$LINENO: checking for int8_t" >&5 -$as_echo_n "checking for int8_t... " >&6; } -if test "${ac_cv_type_int8_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_int8_t=no -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 () -{ -if (sizeof (int8_t)) - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - 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 () -{ -if (sizeof ((int8_t))) - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + NS_PACKAGE_otcl_UNDERWAY=true - ac_cv_type_int8_t=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_LIB_OTCL" >&5 +$as_echo "$V_LIB_OTCL" >&6; } + fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +NS_PACKAGE_otcl_VALID=false +if $NS_PACKAGE_otcl_UNDERWAY; then + if $NS_PACKAGE_otcl_COMPLETE; then + : All components of otcl found. + NS_PACKAGE_otcl_VALID=true + else + as_fn_error $? "Installation of otcl seems incomplete or can't be found automatically. +Please correct the problem by telling configure where otcl is +using the argument --with-otcl=/path/to/package +(perhaps after installing it), +or the package is not required, disable it with --with-otcl=no." "$LINENO" 5 + fi fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +if test "xyes" = xyes; then + if $NS_PACKAGE_otcl_VALID; then + : + else + as_fn_error $? "otcl is required but could not be completely found. +Please correct the problem by telling configure where otcl is +using the argument --with-otcl=/path/to/package, +or the package is not required, disable it with --with-otcl=no." "$LINENO" 5 + fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int8_t" >&5 -$as_echo "$ac_cv_type_int8_t" >&6; } -if test "x$ac_cv_type_int8_t" = x""yes; then - : -else -cat >>confdefs.h <<_ACEOF -#define int8_t signed char -_ACEOF -fi -{ $as_echo "$as_me:$LINENO: checking for int16_t" >&5 -$as_echo_n "checking for int16_t... " >&6; } -if test "${ac_cv_type_int16_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_int16_t=no -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 () -{ -if (sizeof (int16_t)) - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - 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 () -{ -if (sizeof ((int16_t))) - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_int16_t=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Check whether --with-Tcl was given. +if test "${with_Tcl+set}" = set; then : + withval=$with_Tcl; as_fn_error $? "The --with-Tcl option has been replaced with --with-tclcl. +Please insure you have an up-to-date copy of TclCL and re-run your configuration." "$LINENO" 5 +fi -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5 -$as_echo "$ac_cv_type_int16_t" >&6; } -if test "x$ac_cv_type_int16_t" = x""yes; then - : +# Check whether --with-tclcl was given. +if test "${with_tclcl+set}" = set; then : + withval=$with_tclcl; d=$withval else + d="" +fi -cat >>confdefs.h <<_ACEOF -#define int16_t short -_ACEOF -fi +TCLCL_VERS=1.20 +TCLCL_ALT_VERS=1.0 -{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5 -$as_echo_n "checking for int32_t... " >&6; } -if test "${ac_cv_type_int32_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_int32_t=no -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 () -{ -if (sizeof (int32_t)) - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - 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 () -{ -if (sizeof ((int32_t))) - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +TCLCL_H_PLACES="\ + ../tclcl-$TCLCL_VERS \ + ../tclcl-$TCLCL_ALT_VERS \ + ../tclcl \ + ../TclCL \ + ../Tcl-$TCLCL_VERS \ + ../Tcl-$TCLCL_ALT_VERS \ + ../Tcl \ + /usr/src/local/Tcl \ + /usr/src/local/Tcl-1.0 \ + /import/Tcl/include \ + /usr/local/include \ + /usr/contrib/include \ + /usr/include" +TCLCL_H_PLACES_D="$d \ + $d/include" +TCLCL_LIB_PLACES="\ + ../tclcl-$TCLCL_VERS \ + ../tclcl-$TCLCL_ALT_VERS \ + ../tclcl \ + ../TclCL \ + ../Tcl-$TCLCL_VERS \ + ../Tcl-$TCLCL_ALT_VERS \ + ../Tcl \ + $x_libraries \ + /usr/contrib/lib \ + /usr/local/lib \ + /usr/lib \ + /usr/src/local/Tcl \ + /usr/src/local/Tcl-1.0" +TCLCL_LIB_PLACES_D="\ + $d \ + $d/lib \ + $d/bin" +TCLCL_PROG_PLACES="\ + ../tclcl-$TCLCL_VERS \ + ../tclcl-$TCLCL_ALT_VERS \ + ../tclcl \ + ../TclCL \ + ../Tcl-$TCLCL_VERS \ + ../Tcl-$TCLCL_ALT_VERS \ + ../Tcl \ + $prefix/bin \ + $x_libraries \ + /usr/contrib/bin \ + /usr/local/bin \ + /usr/bin \ + /usr/src/local/Tcl \ + /usr/src/local/Tcl-1.0 \ + " +TCLCL_PROG_PLACES_D=" + $d \ + $d/bin" - ac_cv_type_int32_t=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +NS_PACKAGE_tclcl_UNDERWAY=false +NS_PACKAGE_tclcl_COMPLETE=true -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5 -$as_echo "$ac_cv_type_int32_t" >&6; } -if test "x$ac_cv_type_int32_t" = x""yes; then - : -else +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclcl.h" >&5 +$as_echo_n "checking for tclcl.h... " >&6; } +if test "x$d" = "xno"; then + : disable header + V_INCLUDE_TCLCL=FAIL -cat >>confdefs.h <<_ACEOF -#define int32_t int -_ACEOF +NS_PACKAGE_tclcl_COMPLETE=false -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -{ $as_echo "$as_me:$LINENO: checking for u_int8_t" >&5 -$as_echo_n "checking for u_int8_t... " >&6; } -if test "${ac_cv_type_u_int8_t+set}" = set; then - $as_echo_n "(cached) " >&6 else - ac_cv_type_u_int8_t=no -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 () -{ -if (sizeof (u_int8_t)) - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - 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 () -{ -if (sizeof ((u_int8_t))) - return 0; - ; - return 0; -} + places="$TCLCL_H_PLACES" + if test "x$d" != "x" -a "x$d" != xyes; then + if test ! -d $d; then + as_fn_error $? "$d is not a directory" "$LINENO" 5 + fi + places="$TCLCL_H_PLACES_D" + fi + + V_INCLUDE_TCLCL="" + found="" + for dir in $places; do + if test -r $dir/tclcl.h; then + found="$dir" + if test "$CC" != "icc" || + test "$dir" != "/usr/include"; then + V_INCLUDE_TCLCL="-I$dir" + fi + break + fi + done + if test "FAIL$found" = "FAIL" ; then + +NS_PACKAGE_tclcl_COMPLETE=false + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + else + + ac_tr_hdr=HAVE_`echo tclcl.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >>confdefs.h <<_ACEOF +#define $ac_tr_hdr 1 _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_u_int8_t=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + V_INCLUDES="$V_INCLUDE_TCLCL $V_INCLUDES" + V_DEFINES="-D$ac_tr_hdr $V_DEFINES" + NS_PACKAGE_tclcl_UNDERWAY=true + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_INCLUDE_TCLCL" >&5 +$as_echo "$V_INCLUDE_TCLCL" >&6; } + fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int8_t" >&5 -$as_echo "$ac_cv_type_u_int8_t" >&6; } -if test "x$ac_cv_type_u_int8_t" = x""yes; then - : -else -cat >>confdefs.h <<_ACEOF -#define u_int8_t unsigned char -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtclcl$tclcl_VERS" >&5 +$as_echo_n "checking for libtclcl$tclcl_VERS... " >&6; } +if test "x$d" = "xno"; then + : disable library + V_LIB_TCLCL=FAIL -fi +NS_PACKAGE_tclcl_COMPLETE=false + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -{ $as_echo "$as_me:$LINENO: checking for u_int16_t" >&5 -$as_echo_n "checking for u_int16_t... " >&6; } -if test "${ac_cv_type_u_int16_t+set}" = set; then - $as_echo_n "(cached) " >&6 else - ac_cv_type_u_int16_t=no -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 () -{ -if (sizeof (u_int16_t)) - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - 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 () -{ -if (sizeof ((u_int16_t))) - return 0; - ; - return 0; -} + places="$TCLCL_LIB_PLACES" + if test "x$d" != "x" -a "x$d" != xyes; then + if test ! -d $d; then + as_fn_error $? "$d is not a directory" "$LINENO" 5 + fi + places="$TCLCL_LIB_PLACES_D" + fi + + V_LIB_TCLCL="" + full_lib_name="tclcl$tclcl_VERS" + simple_lib_name=`echo $full_lib_name | sed -e 's/\.//'` + other_simple_lib_name=`echo $full_lib_name | sed -e 's/\./_/'` + simpler_lib_name=`echo $simple_lib_name | sed -e 'y/0123456789/ /'` + double_break=false + for dir in $places; do + for file in $full_lib_name $simple_lib_name $other_simple_lib_name $simpler_lib_name + do + if test -r $dir/lib$file.so -o -r $dir/lib$file.a -o -r $dir/lib$file.dylib; then + V_LIB_TCLCL="-L$dir -l$file" + double_break=true + break + fi + done + if $double_break; then + break + fi + done + if test "FAIL$V_LIB_TCLCL" = "FAIL" ; then + +NS_PACKAGE_tclcl_COMPLETE=false + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + else + if test "$solaris"; then + V_LIB_TCLCL="-R$dir $V_LIB_TCLCL" + fi + + ac_tr_lib=HAVE_LIB`echo tclcl$tclcl_VERS | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >>confdefs.h <<_ACEOF +#define $ac_tr_lib 1 _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_u_int16_t=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + V_LIBS="$V_LIB_TCLCL $V_LIBS" + V_DEFINES="-D$ac_tr_lib $V_DEFINES" + NS_PACKAGE_tclcl_UNDERWAY=true + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_LIB_TCLCL" >&5 +$as_echo "$V_LIB_TCLCL" >&6; } + fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int16_t" >&5 -$as_echo "$ac_cv_type_u_int16_t" >&6; } -if test "x$ac_cv_type_u_int16_t" = x""yes; then - : -else -cat >>confdefs.h <<_ACEOF -#define u_int16_t unsigned short -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcl2c++" >&5 +$as_echo_n "checking for tcl2c++... " >&6; } +if test "x$d" = "xno"; then + : disable header + V_TCL2CPP_DIR=FAIL -fi +NS_PACKAGE_tclcl_COMPLETE=false + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -{ $as_echo "$as_me:$LINENO: checking for u_int32_t" >&5 -$as_echo_n "checking for u_int32_t... " >&6; } -if test "${ac_cv_type_u_int32_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_u_int32_t=no -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 () -{ -if (sizeof (u_int32_t)) - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - 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 () -{ -if (sizeof ((u_int32_t))) - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + places="$TCLCL_PROG_PLACES" + if test "x$d" != "x" -a "x$d" != xyes; then + if test ! -d $d; then + as_fn_error $? "$d is not a directory" "$LINENO" 5 + fi + places="$TCLCL_PROG_PLACES_D" + fi - ac_cv_type_u_int32_t=yes -fi + V_TCL2CPP_DIR="" + for dir in $places; do + if test -r $dir/tcl2c++; then + V_TCL2CPP_DIR="$dir" + break + fi + done + if test "FAIL$V_TCL2CPP_DIR" = "FAIL" ; then -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +NS_PACKAGE_tclcl_COMPLETE=false + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + else -fi + NS_PACKAGE_tclcl_UNDERWAY=true -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_TCL2CPP_DIR" >&5 +$as_echo "$V_TCL2CPP_DIR" >&6; } + fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5 -$as_echo "$ac_cv_type_u_int32_t" >&6; } -if test "x$ac_cv_type_u_int32_t" = x""yes; then - : -else -cat >>confdefs.h <<_ACEOF -#define u_int32_t unsigned int -_ACEOF -fi +V_TCL2CPP=$V_TCL2CPP_DIR/tcl2c++ +NS_PACKAGE_tclcl_VALID=false +if $NS_PACKAGE_tclcl_UNDERWAY; then + if $NS_PACKAGE_tclcl_COMPLETE; then + : All components of tclcl found. + NS_PACKAGE_tclcl_VALID=true + else + as_fn_error $? "Installation of tclcl seems incomplete or can't be found automatically. +Please correct the problem by telling configure where tclcl is +using the argument --with-tclcl=/path/to/package +(perhaps after installing it), +or the package is not required, disable it with --with-tclcl=no." "$LINENO" 5 + fi +fi +if test "xyes" = xyes; then + if $NS_PACKAGE_tclcl_VALID; then + : + else + as_fn_error $? "tclcl is required but could not be completely found. +Please correct the problem by telling configure where tclcl is +using the argument --with-tclcl=/path/to/package, +or the package is not required, disable it with --with-tclcl=no." "$LINENO" 5 + fi +fi -for ac_func in strtoq strtoll -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of random" >&5 +$as_echo_n "checking return type of random... " >&6; } +touch confdefs.h +if test "$cross_compiling" = yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross compiling--guessing int" >&5 +$as_echo "cross compiling--guessing int" >&6; } +$as_echo "#define RANDOM_RETURN_TYPE int" >>confdefs.h -#undef $ac_func -/* 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 $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include "confdefs.h" +long random() { return 1; } +main() { exit(0); } -int -main () -{ -return $ac_func (); - ; - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +if ac_fn_c_try_run "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: long" >&5 +$as_echo "long" >&6; } +$as_echo "#define RANDOM_RETURN_TYPE long" >>confdefs.h + + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: int" >&5 +$as_echo "int" >&6; } +$as_echo "#define RANDOM_RETURN_TYPE int" >>confdefs.h - eval "$as_ac_var=no" -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -done - -INT64_T_ALTERNATIVE=none -HAVE_SUPPORTING_FUNC=false +ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "$ac_includes_default" +if test "x$ac_cv_type_int8_t" = xyes; then : -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:$LINENO: checking size of long" >&5 -$as_echo_n "checking size of long... " >&6; } -if test "${ac_cv_sizeof_long+set}" = set; then - $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -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 () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)]; -test_array [0] = 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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_lo=0 ac_mid=0 - while :; do - 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 () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; -test_array [0] = 0 - ; - return 0; -} +cat >>confdefs.h <<_ACEOF +#define int8_t signed char _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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_hi=$ac_mid; break -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done +ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "$ac_includes_default" +if test "x$ac_cv_type_int16_t" = xyes; then : + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat >>confdefs.h <<_ACEOF +#define int16_t short _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)]; -test_array [0] = 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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_hi=-1 ac_mid=-1 - while :; do - 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 () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)]; -test_array [0] = 0 +fi + +ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default" +if test "x$ac_cv_type_int32_t" = xyes; then : - ; - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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_lo=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` +cat >>confdefs.h <<_ACEOF +#define int32_t int +_ACEOF + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done +ac_fn_c_check_type "$LINENO" "u_int8_t" "ac_cv_type_u_int8_t" "$ac_includes_default" +if test "x$ac_cv_type_u_int8_t" = xyes; then : + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= -fi +cat >>confdefs.h <<_ACEOF +#define u_int8_t unsigned char +_ACEOF -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - 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 () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; -test_array [0] = 0 +ac_fn_c_check_type "$LINENO" "u_int16_t" "ac_cv_type_u_int16_t" "$ac_includes_default" +if test "x$ac_cv_type_u_int16_t" = xyes; then : - ; - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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_hi=$ac_mid else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` +cat >>confdefs.h <<_ACEOF +#define u_int16_t unsigned short +_ACEOF + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_long=$ac_lo;; -'') if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (long) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_long=0 - fi ;; -esac +ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default" +if test "x$ac_cv_type_u_int32_t" = xyes; then : + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + +cat >>confdefs.h <<_ACEOF +#define u_int32_t unsigned int _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -static long int longval () { return (long int) (sizeof (long)); } -static unsigned long int ulongval () { return (long int) (sizeof (long)); } -#include -#include -int -main () -{ - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (long))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (long)))) - return 1; - fprintf (f, "%ld", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (long)))) - return 1; - fprintf (f, "%lu", i); - } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; +fi - ; - return 0; -} + + +for ac_func in strtoq strtoll +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_long=`cat conftest.val` + +fi +done + + + +INT64_T_ALTERNATIVE=none +HAVE_SUPPORTING_FUNC=false + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +$as_echo_n "checking size of long... " >&6; } +if ${ac_cv_sizeof_long+:} false; then : + $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : -( exit $ac_status ) -if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +else + if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (long) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } +as_fn_error 77 "cannot compute sizeof (long) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long=0 fi fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 $as_echo "$ac_cv_sizeof_long" >&6; } @@ -9062,213 +7412,70 @@ if test $ac_cv_sizeof_long -ge 8 then INT64_T_ALTERNATIVE=long - { $as_echo "$as_me:$LINENO: checking for strtol" >&5 -$as_echo_n "checking for strtol... " >&6; } -if test "${ac_cv_func_strtol+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define strtol to an innocuous variant, in case declares strtol. - For example, HP-UX 11i declares gettimeofday. */ -#define strtol innocuous_strtol - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char strtol (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef strtol - -/* 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 strtol (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_strtol || defined __stub___strtol -choke me -#endif - -int -main () -{ -return strtol (); - ; - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_strtol=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_strtol=no -fi + ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol" +if test "x$ac_cv_func_strtol" = xyes; then : -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strtol" >&5 -$as_echo "$ac_cv_func_strtol" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking for __int64_t" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __int64_t" >&5 $as_echo_n "checking for __int64_t... " >&6; } -if test "${nsnam_cv_int64_t_HAVE___INT64_T+set}" = set; then +if ${nsnam_cv_int64_t_HAVE___INT64_T+:} false; then : $as_echo_n "(cached) " >&6 else -if test "$cross_compiling" = yes; then +if test "$cross_compiling" = yes; then : nsnam_cv_int64_t_HAVE___INT64_T=cross else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ main() { __int64_t x; exit (sizeof(x) >= 8 ? 0 : 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : nsnam_cv_int64_t_HAVE___INT64_T=yes else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -nsnam_cv_int64_t_HAVE___INT64_T=no + nsnam_cv_int64_t_HAVE___INT64_T=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ $as_echo "$as_me:$LINENO: result: $nsnam_cv_int64_t_HAVE___INT64_T" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $nsnam_cv_int64_t_HAVE___INT64_T" >&5 $as_echo "$nsnam_cv_int64_t_HAVE___INT64_T" >&6; } if test x"$nsnam_cv_int64_t_HAVE___INT64_T" = x"yes" -a "x$INT64_T_ALTERNATIVE" = xnone; then INT64_T_ALTERNATIVE=__int64_t fi -{ $as_echo "$as_me:$LINENO: checking for long long" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long" >&5 $as_echo_n "checking for long long... " >&6; } -if test "${nsnam_cv_int64_t_HAVE_LONG_LONG+set}" = set; then +if ${nsnam_cv_int64_t_HAVE_LONG_LONG+:} false; then : $as_echo_n "(cached) " >&6 else -if test "$cross_compiling" = yes; then +if test "$cross_compiling" = yes; then : nsnam_cv_int64_t_HAVE_LONG_LONG=cross else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ main() { long long x; exit (sizeof(x) >= 8 ? 0 : 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : nsnam_cv_int64_t_HAVE_LONG_LONG=yes else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -nsnam_cv_int64_t_HAVE_LONG_LONG=no + nsnam_cv_int64_t_HAVE_LONG_LONG=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ $as_echo "$as_me:$LINENO: result: $nsnam_cv_int64_t_HAVE_LONG_LONG" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $nsnam_cv_int64_t_HAVE_LONG_LONG" >&5 $as_echo "$nsnam_cv_int64_t_HAVE_LONG_LONG" >&6; } if test x"$nsnam_cv_int64_t_HAVE_LONG_LONG" = x"yes" -a "x$INT64_T_ALTERNATIVE" = xnone; then INT64_T_ALTERNATIVE="long long" @@ -9276,170 +7483,74 @@ -{ $as_echo "$as_me:$LINENO: checking for int64_t" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for int64_t" >&5 $as_echo_n "checking for int64_t... " >&6; } -if test "${ac_cv_type_int64_t+set}" = set; then +if ${ac_cv_type_int64_t+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #if STDC_HEADERS #include #include #endif -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "(^|[^a-zA-Z_0-9])int64_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - ac_cv_type_int64_t=yes -else - ac_cv_type_int64_t=no -fi -rm -f conftest* - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5 -$as_echo "$ac_cv_type_int64_t" >&6; } -if test $ac_cv_type_int64_t = no; then - -cat >>confdefs.h <<_ACEOF -#define int64_t $INT64_T_ALTERNATIVE -_ACEOF - -fi - - -{ $as_echo "$as_me:$LINENO: checking which kind of 64-bit int to use" >&5 -$as_echo_n "checking which kind of 64-bit int to use... " >&6; } -if test $ac_cv_type_int64_t = yes -o "$INT64_T_ALTERNATIVE" != none -then - if test "$INT64_T_ALTERNATIVE" = long -o "$ac_cv_func_strtoq" = yes -o "$ac_cv_func_strtoll" = yes - then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_INT64 1 -_ACEOF - - if test $ac_cv_type_int64_t = yes - then - { $as_echo "$as_me:$LINENO: result: int64_t" >&5 -$as_echo "int64_t" >&6; } - else - { $as_echo "$as_me:$LINENO: result: $INT64_T_ALTERNATIVE" >&5 -$as_echo "$INT64_T_ALTERNATIVE" >&6; } - fi - else - { $as_echo "$as_me:$LINENO: result: missing strto 64-bit-type" >&5 -$as_echo "missing strto 64-bit-type" >&6; } - fi -else - { $as_echo "$as_me:$LINENO: result: none" >&5 -$as_echo "none" >&6; } -fi - - - - - -for ac_func in snprintf -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "(^|[^a-zA-Z_0-9])int64_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then : + ac_cv_type_int64_t=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_int64_t=no +fi +rm -f conftest* - eval "$as_ac_var=no" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_int64_t" >&5 +$as_echo "$ac_cv_type_int64_t" >&6; } +if test $ac_cv_type_int64_t = no; then + +cat >>confdefs.h <<_ACEOF +#define int64_t $INT64_T_ALTERNATIVE +_ACEOF -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which kind of 64-bit int to use" >&5 +$as_echo_n "checking which kind of 64-bit int to use... " >&6; } +if test $ac_cv_type_int64_t = yes -o "$INT64_T_ALTERNATIVE" != none +then + if test "$INT64_T_ALTERNATIVE" = long -o "$ac_cv_func_strtoq" = yes -o "$ac_cv_func_strtoll" = yes + then + +$as_echo "#define HAVE_INT64 1" >>confdefs.h + + if test $ac_cv_type_int64_t = yes + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: int64_t" >&5 +$as_echo "int64_t" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT64_T_ALTERNATIVE" >&5 +$as_echo "$INT64_T_ALTERNATIVE" >&6; } + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: missing strto 64-bit-type" >&5 +$as_echo "missing strto 64-bit-type" >&6; } + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } +fi + + + + +for ac_func in snprintf +do : + ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" +if test "x$ac_cv_func_snprintf" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_SNPRINTF 1 _ACEOF fi @@ -9488,18 +7599,14 @@ V_LIB_DL="dld" ;; *-*-linux*) - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -9517,43 +7624,18 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : V_LIB_DL="dl" else V_LIB_DL="dld" @@ -9569,20 +7651,15 @@ *-*-linux*) ;; *) - -as_ac_Lib=`$as_echo "ac_cv_lib_$V_LIB_DL''_main" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for main in -l$V_LIB_DL" >&5 + as_ac_Lib=`$as_echo "ac_cv_lib_$V_LIB_DL''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$V_LIB_DL" >&5 $as_echo_n "checking for main in -l$V_LIB_DL... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$V_LIB_DL $V_STATIC $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9594,47 +7671,19 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 - $as_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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_LIB$V_LIB_DL" | $as_tr_cpp` 1 _ACEOF @@ -9669,14 +7718,14 @@ # Recheck the system to see if we need to add any system-dependent # libraries -{ $as_echo "$as_me:$LINENO: checking system version (for system-dependent libraries)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking system version (for system-dependent libraries)" >&5 $as_echo_n "checking system version (for system-dependent libraries)... " >&6; } if test -f /usr/lib/NextStep/software_version; then system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` else system=`uname -s`-`uname -r` if test "$?" -ne 0 ; then - { $as_echo "$as_me:$LINENO: result: unknown (can't find uname command)" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown (can't find uname command)" >&5 $as_echo "unknown (can't find uname command)" >&6; } system=unknown else @@ -9689,7 +7738,7 @@ if test "`uname -s`" = "AIX" ; then system=AIX-`uname -v`.`uname -r` fi - { $as_echo "$as_me:$LINENO: result: $system" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $system" >&5 $as_echo "$system" >&6; } fi fi @@ -9784,10 +7833,10 @@ # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9795,11 +7844,11 @@ 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/* | \ + # 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\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -9836,7 +7885,7 @@ ;; esac -done + done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -9852,7 +7901,7 @@ INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -9894,13 +7943,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -9908,8 +7957,8 @@ (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 \). + # `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" @@ -9931,12 +7980,23 @@ :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" && - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi @@ -9950,14 +8010,15 @@ ac_libobjs= ac_ltlibobjs= +U= 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=`$as_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' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -9965,13 +8026,14 @@ -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -9981,17 +8043,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## 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 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -9999,23 +8062,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + 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 - as_nl=' ' export as_nl @@ -10023,7 +8078,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -10034,7 +8095,7 @@ as_echo_body='eval expr "X$1" : "X\$.*\$"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\$.*\$$as_nl"; arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;; @@ -10057,13 +8118,6 @@ } 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 @@ -10073,15 +8127,16 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +as_myself= +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -10093,12 +8148,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); 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 +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -10110,7 +8169,89 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + if expr a : '$a$' >/dev/null 2>&1 && test "X`expr 00001 : '.*$...$'`" = X001; then as_expr=expr @@ -10124,8 +8265,12 @@ as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \ X"$0" : 'X$//$$' \| \ @@ -10145,76 +8290,25 @@ } 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" || - { $as_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 +# 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 ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; 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 @@ -10243,8 +8337,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X$//$[^/]' \| \ + X"$as_dir" : 'X$//$$' \| \ + X"$as_dir" : 'X$/$' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X$\/\/$[^/].*/{ + s//\1/ + q + } + /^X$\/\/$$/{ + s//\1/ + q + } + /^X$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -10263,10 +8405,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -10281,13 +8423,19 @@ exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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 $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -10318,13 +8466,15 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTION]... [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -10340,16 +8490,17 @@ Configuration headers: $config_headers -Report bugs to ." +Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.68, + with options \\"\$ac_cs_config\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -10365,11 +8516,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X$[^=]*$='` ac_optarg=`expr "X$1" : 'X[^=]*=$.*$'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X$[^=]*$='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -10383,27 +8539,29 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { $as_echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -10411,11 +8569,10 @@ ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -10464,9 +8621,7 @@ "autoconf.h") CONFIG_HEADERS="$CONFIG_HEADERS autoconf.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -10488,26 +8643,24 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_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" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -10515,7 +8668,13 @@ if test -n "$CONFIG_FILES"; then -ac_cr=' ' +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ac_cs_awk_cr='\\r' @@ -10523,7 +8682,7 @@ ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -10532,24 +8691,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -10557,7 +8710,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -10571,7 +8724,7 @@ t delim :nl h -s/$.\{148\}$.*/\1/ +s/$.\{148\}$..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -10585,7 +8738,7 @@ t nl :delim h -s/$.\{148\}$.*/\1/ +s/$.\{148\}$..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -10605,7 +8758,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -10637,23 +8790,29 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries 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/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/$=[ ]*$.*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -10665,7 +8824,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -10677,13 +8836,11 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -10768,9 +8925,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -10783,9 +8938,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -10804,7 +8957,7 @@ for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_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 `:'. @@ -10813,12 +8966,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -10829,7 +8980,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. @@ -10841,10 +8992,8 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -10872,47 +9021,7 @@ 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=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X$//$[^/]' \| \ - X"$as_dir" : 'X$//$$' \| \ - X"$as_dir" : 'X$/$' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X$\/\/$[^/].*/{ - s//\1/ - q - } - /^X$\/\/$$/{ - s//\1/ - q - } - /^X$\/$.*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in @@ -10964,7 +9073,6 @@ # 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= - ac_sed_dataroot=' /datarootdir/ { p @@ -10974,12 +9082,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' +/@mandir@/p' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -10989,7 +9096,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -11016,27 +9123,24 @@ s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 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"; } && - { $as_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 + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 $as_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;} +which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -11045,27 +9149,21 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 fi ;; @@ -11075,15 +9173,12 @@ done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -11104,10 +9199,10 @@ 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; } + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff -Nru nam-1.15~RC4/.cvsignore nam-1.15/.cvsignore --- nam-1.15~RC4/.cvsignore 2010-09-05 23:23:21.000000000 +0000 +++ nam-1.15/.cvsignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -config.cache -config.log -config.status -gen -Makefile -nam -nam-src*.tar.gz -autoconf.h diff -Nru nam-1.15~RC4/debian/changelog nam-1.15/debian/changelog --- nam-1.15~RC4/debian/changelog 2011-07-01 07:48:01.000000000 +0000 +++ nam-1.15/debian/changelog 2011-11-24 06:15:45.000000000 +0000 @@ -1,3 +1,11 @@ +nam (1.15-1) unstable; urgency=low + + * New upstream stable release. + * Rewrite build system with CMake. + * New nam-dbg package. + + -- YunQiang Su Thu, 24 Nov 2011 14:14:34 +0800 + nam (1.15~RC4-5) unstable; urgency=low *rebuild for work with a patch of tclsh diff -Nru nam-1.15~RC4/debian/clean nam-1.15/debian/clean --- nam-1.15~RC4/debian/clean 2011-04-15 09:57:45.000000000 +0000 +++ nam-1.15/debian/clean 2011-11-24 15:07:52.000000000 +0000 @@ -1,2 +1,5 @@ tcl/test/test-output-ptp/test-ptp-*.nam.org tcl/test/test-output-ptp/test-ptp-*.nam.test +CMakeLists.txt +config-nam.h.cmake +autoconf.h diff -Nru nam-1.15~RC4/debian/CMakeLists.txt nam-1.15/debian/CMakeLists.txt --- nam-1.15~RC4/debian/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ nam-1.15/debian/CMakeLists.txt 2011-11-27 07:51:13.000000000 +0000 @@ -0,0 +1,149 @@ +project(nam) +cmake_minimum_required(VERSION 2.6) +set(TARNAME nam) + + +# program name, version etc + +set(PACKAGE_VERSION "1.15") +set(PACKAGE_NAME "nam") +set(PACKAGE_TARNAME "${TARNAME}") +set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +set(PACKAGE_BUGREPORT "http://sourceforge.net/projects/nsnam") + +find_package(PkgConfig REQUIRED) + +########################################################################## +if(NOT DEFINED BIN_INSTALL_DIR) + set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin") +endif(NOT DEFINED BIN_INSTALL_DIR) +if(NOT DEFINED DATA_INSTALL_DIR) + set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share") +endif(NOT DEFINED DATA_INSTALL_DIR) +if(NOT DEFINED MAN_INSTALL_DIR) + set(MAN_INSTALL_DIR "${DATA_INSTALL_DIR}/man") +endif(NOT DEFINED MAN_INSTALL_DIR) + +find_package(TCL REQUIRED) +find_package(TclStub REQUIRED) +pkg_check_modules(OTCL REQUIRED otcl) +pkg_check_modules(TCLCL REQUIRED tclcl) + +INCLUDE (CheckFunctionExists) +INCLUDE (CheckIncludeFiles) + +CHECK_INCLUDE_FILES(string.h HAVE_STRING_H) +CHECK_INCLUDE_FILES(strings.h STRINGS_H) + +CHECK_FUNCTION_EXISTS(bcopy HAVE_BCOPY) +CHECK_FUNCTION_EXISTS(bzero HAVE_BZERO) +CHECK_FUNCTION_EXISTS(getrusage HAVE_GETRUSAGE) +CHECK_FUNCTION_EXISTS(sbrk HAVE_SBRK) +CHECK_FUNCTION_EXISTS(strtoll HAVE_STRTOLL) +CHECK_FUNCTION_EXISTS(strtod HAVE_STRTOD) +CHECK_FUNCTION_EXISTS(strtoq HAVE_STRTOQ) +CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF) + +configure_file(config-nam.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/autoconf.h) + +set(NAM_TCL_LIB + tcl/nam-lib.tcl + tcl/nam-default.tcl + tcl/balloon.tcl + tcl/snapshot.tcl + tcl/animator.tcl + tcl/anim-ctrl.tcl + tcl/netModel.tcl + tcl/autoNetModel.tcl + tcl/build-ui.tcl + tcl/annotation.tcl + tcl/node.tcl + tcl/monitor.tcl + tcl/stats.tcl + tcl/www.tcl + tcl/menu_file.tcl + tcl/menu_view.tcl + tcl/NamgraphView.tcl + tcl/NamgraphModel.tcl + tcl/TimesliderNamgraphView.tcl + tcl/TimesliderView.tcl + tcl/TimesliderModel.tcl + tcl/observer.tcl + tcl/observable.tcl + tcl/wirelessNetModel.tcl + tcl/editorNetModel.tcl + tcl/Editor.tcl + tcl/Editor-FileParser.tcl +) +STRING(REPLACE ";" " " NAM_TCL_LIB "${NAM_TCL_LIB}") + +add_custom_command(OUTPUT version.c nam_tcl.cc + COMMAND ${TCL_TCLSH} ${CMAKE_CURRENT_SOURCE_DIR}/bin/string2c.tcl version < ${CMAKE_CURRENT_SOURCE_DIR}/VERSION > version.c + COMMAND ${TCL_TCLSH} ${CMAKE_CURRENT_SOURCE_DIR}/bin/tcl-expand.tcl ${CMAKE_CURRENT_SOURCE_DIR}/tcl/nam-lib.tcl | tcl2c++ et_nam > nam_tcl.cc +) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TCL_INCLUDE_PATH} + ${TK_INCLUDE_PATH} + ${OTCL_INCLUDE_DIRS} + ${TCLCL_INCLUDE_DIRS} +) + +set(nam_SRC + version.c + nam_tcl.cc + tkcompat.c + tkUnixInit.c + xwd.c + netview.cc + netmodel.cc + edge.cc + packet.cc + node.cc + main.cc + trace.cc + queue.cc + drop.cc + animation.cc + agent.cc + feature.cc + route.cc + transform.cc + paint.cc + state.cc + monitor.cc + anetmodel.cc + rng.cc + view.cc + graphview.cc + netgraph.cc + tracehook.cc + lan.cc + psview.cc + group.cc + editview.cc + tag.cc + address.cc + animator.cc + wnetmodel.cc + nam_stream.cc + enetmodel.cc + testview.cc + parser.cc + trafficsource.cc + lossmodel.cc + queuehandle.cc +) + +add_executable(nam ${nam_SRC}) +target_link_libraries(nam ${TCL_LIBRARY} ${TCL_STUB_LIBRARY} ${TK_LIBRARY} ${TK_STUB_LIBRARY} ${OTCL_LIBRARIES} ${TCLCL_LIBRARIES}) +install(TARGETS nam RUNTIME DESTINATION ${BIN_INSTALL_DIR}) + +install(FILES nam.1 DESTINATION ${MAN_INSTALL_DIR}/man1) + +#========================================================================================= +### test +enable_testing() +add_test(NAME nam_TEST COMMAND ./validate) diff -Nru nam-1.15~RC4/debian/compat nam-1.15/debian/compat --- nam-1.15~RC4/debian/compat 2011-04-15 09:57:45.000000000 +0000 +++ nam-1.15/debian/compat 2011-11-27 08:23:43.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru nam-1.15~RC4/debian/config-nam.h.cmake nam-1.15/debian/config-nam.h.cmake --- nam-1.15~RC4/debian/config-nam.h.cmake 1970-01-01 00:00:00.000000000 +0000 +++ nam-1.15/debian/config-nam.h.cmake 2011-11-24 14:30:59.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _CONFIG_H_ +#define _CONFIG_H_ +#cmakedefine PACKAGE_BUGREPORT "${PACKAGE_BUGREPORT}" +#cmakedefine PACKAGE_NAME "${PACKAGE_NAME}" +#cmakedefine PACKAGE_STRING "${PACKAGE_STRING}" +#cmakedefine PACKAGE_TARNAME "${PACKAGE_TARNAME}" +#cmakedefine PACKAGE_VERSION "${PACKAGE_VERSION}" +#define RANDOM_RETURN_TYPE long int +#cmakedefine HAVE_BCOPY 1 +#cmakedefine HAVE_BZERO 1 +#cmakedefine HAVE_GETRUSAGE 1 +#cmakedefine HAVE_SBRK 1 +#cmakedefine HAVE_SNPRINTF 1 +#cmakedefine HAVE_STRTOLL 1 +#cmakedefine HAVE_STRTOD 1 +#cmakedefine HAVE_STRTOQ 1 +#cmakedefine HAVE_STRING_H 1 +#cmakedefine HAVE_STRINGS_H 1 +#endif //_CONFIG_H_ diff -Nru nam-1.15~RC4/debian/control nam-1.15/debian/control --- nam-1.15~RC4/debian/control 2011-07-01 07:47:01.000000000 +0000 +++ nam-1.15/debian/control 2011-11-27 07:19:16.000000000 +0000 @@ -1,15 +1,15 @@ Source: nam Section: net Priority: optional -Maintainer: YunQiang Su +Maintainer: Debian Network Simulators Team DM-Upload-Allowed: yes -Uploaders: Debian Network Simulators Team -Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~), autotools-dev, +Uploaders: YunQiang Su +Build-Depends: debhelper (>= 8), quilt (>= 0.46-7~), cmake, tcl-dev, tk-dev, libxt-dev, libxmu-headers, zlib1g-dev, - libotcl1-dev, tclcl, tclcl-dev (>=1.20~RC3-3) + libotcl1-dev (>= 1.14+dfsg), tclcl, libtclcl1-dev (>= 1.20-4) Standards-Version: 3.9.2 Vcs-git: git://git.debian.org/git/pkg-netsim/nam.git -Vcs-Browser: http://git.debian.org/?p=pkg-netsim/tclcl.git +Vcs-Browser: http://git.debian.org/?p=pkg-netsim/nam.git Homepage: http://www.isi.edu/nsnam/nam/ Package: nam @@ -38,3 +38,19 @@ projects. . This package contains examples. + +Package: nam-dbg +Priority: extra +Section: debug +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, nam (= ${binary:Version}) +Description: debug symboles of nam + NAM is a Tcl/TK based animation tool for viewing network simulation + traces and real world packet traces. It supports topology layout, + packet level animation, and various data inspection tools. NAM began + at LBL. It has evolved substantially over the past few years. The NAM + development effort was an ongoing collaboration with the VINT project. + Currently, it is being developed at ISI as part of the SAMAN and Conser + projects. + . + This package contains debug symboles of NAM. diff -Nru nam-1.15~RC4/debian/nam.install nam-1.15/debian/nam.install --- nam-1.15~RC4/debian/nam.install 2011-04-15 09:57:45.000000000 +0000 +++ nam-1.15/debian/nam.install 2011-11-24 06:07:41.000000000 +0000 @@ -1 +1,2 @@ -nam usr/bin +/usr/bin/nam +/usr/share/man/man1 diff -Nru nam-1.15~RC4/debian/nam.manpages nam-1.15/debian/nam.manpages --- nam-1.15~RC4/debian/nam.manpages 2011-04-15 09:57:45.000000000 +0000 +++ nam-1.15/debian/nam.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -nam.1 diff -Nru nam-1.15~RC4/debian/patches/group_cc_void_int.patch nam-1.15/debian/patches/group_cc_void_int.patch --- nam-1.15~RC4/debian/patches/group_cc_void_int.patch 1970-01-01 00:00:00.000000000 +0000 +++ nam-1.15/debian/patches/group_cc_void_int.patch 2011-11-24 14:44:07.000000000 +0000 @@ -0,0 +1,13 @@ +Index: nam/group.cc +=================================================================== +--- nam.orig/group.cc 2011-04-15 17:57:45.000000000 +0800 ++++ nam/group.cc 2011-11-24 22:43:58.039169511 +0800 +@@ -97,7 +97,7 @@ + for (he = Tcl_FirstHashEntry(nodeHash_, &hs); + he != NULL; + he = Tcl_NextHashEntry(&hs), i++) +- mbrs[i] = *Tcl_GetHashValue(he); ++ mbrs[i] = *(int *)Tcl_GetHashValue(he); + } + + void Group::draw(View * nv, double now) { diff -Nru nam-1.15~RC4/debian/patches/missing-libz.patch nam-1.15/debian/patches/missing-libz.patch --- nam-1.15~RC4/debian/patches/missing-libz.patch 2011-06-02 18:02:50.000000000 +0000 +++ nam-1.15/debian/patches/missing-libz.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: build with -lz option to support compress -Forwarded: not-needed -Author: YunQiang Su -Last-Update: 2011-06-03 -Index: nam-1.15~RC4/Makefile.in -=================================================================== ---- nam-1.15~RC4.orig/Makefile.in 2011-03-23 00:26:31.051333117 +0800 -+++ nam-1.15~RC4/Makefile.in 2011-03-23 00:26:53.471366009 +0800 -@@ -55,7 +55,7 @@ - LIB = \ - @V_LIBS@ \ - @V_LIB_X11@ \ -- @V_LIB@ -lm @LIBS@ -+ @V_LIB@ -lm -lz @LIBS@ - INCLUDE = \ - -I. @V_INCLUDES@ \ - @V_INCLUDE_X11@ diff -Nru nam-1.15~RC4/debian/patches/netmodel_cc_void_int.patch nam-1.15/debian/patches/netmodel_cc_void_int.patch --- nam-1.15~RC4/debian/patches/netmodel_cc_void_int.patch 1970-01-01 00:00:00.000000000 +0000 +++ nam-1.15/debian/patches/netmodel_cc_void_int.patch 2011-11-24 14:02:19.000000000 +0000 @@ -0,0 +1,22 @@ +Index: nam/netmodel.cc +=================================================================== +--- nam.orig/netmodel.cc 2011-11-24 22:01:28.778528404 +0800 ++++ nam/netmodel.cc 2011-11-24 22:02:05.954712753 +0800 +@@ -308,7 +308,7 @@ + Tcl_HashEntry *he = Tcl_FindHashEntry(addrHash_, (const char *)addr); + if (he == NULL) + return -1; +- return *Tcl_GetHashValue(he); ++ return *(int *)Tcl_GetHashValue(he); + } + + //---------------------------------------------------------------------- +@@ -2761,7 +2761,7 @@ + Tcl_HashEntry *he = Tcl_FindHashEntry(objnameHash_, n); + if (he == NULL) + return -1; +- return *Tcl_GetHashValue(he); ++ return *(int *)Tcl_GetHashValue(he); + #undef STATIC_NAMELEN + } + diff -Nru nam-1.15~RC4/debian/patches/random-abort.diff nam-1.15/debian/patches/random-abort.diff --- nam-1.15~RC4/debian/patches/random-abort.diff 2011-06-02 18:04:36.000000000 +0000 +++ nam-1.15/debian/patches/random-abort.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Description: abort said: random is not portable -Forwarded: not-needed -Author: YunQiang Su -Last-Update: 2011-06-03 ---- nam-1.15~RC4.orig/random.cc -+++ nam-1.15~RC4/random.cc -@@ -47,11 +47,11 @@ - #define GCC_THROW - #endif - --RANDOM_RETURN_TYPE --random() GCC_THROW --{ -- printf("random() called in nam.\nRandom is not portable, please use Random::uniform() instead.\n"); -- abort(); --} -+//RANDOM_RETURN_TYPE -+//random() GCC_THROW -+//{ -+// printf("random() called in nam.\nRandom is not portable, please use Random::uniform() instead.\n"); -+// abort(); -+//} - - #endif /* !WIN32 */ diff -Nru nam-1.15~RC4/debian/patches/series nam-1.15/debian/patches/series --- nam-1.15~RC4/debian/patches/series 2011-06-30 11:15:08.000000000 +0000 +++ nam-1.15/debian/patches/series 2011-11-27 07:08:44.000000000 +0000 @@ -1,4 +1,3 @@ -missing-libz.patch -tclcl-header-move.patch -random-abort.diff +netmodel_cc_void_int.patch init_tcltk_with_stub.diff +group_cc_void_int.patch diff -Nru nam-1.15~RC4/debian/patches/tclcl-header-move.patch nam-1.15/debian/patches/tclcl-header-move.patch --- nam-1.15~RC4/debian/patches/tclcl-header-move.patch 2011-06-02 18:02:37.000000000 +0000 +++ nam-1.15/debian/patches/tclcl-header-move.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: header files on Debian are put in /usr/include/tclcl -Forwarded: not-needed -Author: YunQiang Su -Last-Update: 2011-06-03 -Index: nam-1.15~RC4/configure -=================================================================== ---- nam-1.15~RC4.orig/configure 2011-03-22 23:18:48.795375052 +0800 -+++ nam-1.15~RC4/configure 2011-03-22 23:24:54.675911684 +0800 -@@ -7631,6 +7631,7 @@ - /import/Tcl/include \ - /usr/local/include \ - /usr/contrib/include \ -+ /usr/include/tclcl \ - /usr/include" - TCLCL_H_PLACES_D="$d \ - $d/include" - diff -Nru nam-1.15~RC4/debian/rules nam-1.15/debian/rules --- nam-1.15~RC4/debian/rules 2011-06-03 11:00:45.000000000 +0000 +++ nam-1.15/debian/rules 2011-11-27 08:23:59.000000000 +0000 @@ -1,37 +1,27 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. +export DH_VERBOSE=1 -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +DPKG_EXPORT_BUILDFLAGS = 1 +-include /usr/share/dpkg/buildflags.mk #./validate test failed,have report it to upstream %: dh $@ -override_dh_auto_clean: - ./configure #Makefile from upstream, need to delete - # workaround it - dh_auto_clean - override_dh_auto_configure: - ./configure - #link against tclstub and tkstub to make it work with multi version of tcl/tk - #bug:#620093 - sed -i "s/-ltk$[0-9].[0-9]$/-ltk\1 -ltkstub\1/" Makefile - sed -i "s/-ltcl$[0-9].[0-9]$/-ltcl\1 -ltclstub\1/" Makefile + cp debian/CMakeLists.txt . + cp debian/config-nam.h.cmake . + dh_auto_configure -Scmake override_dh_auto_test: # ./validate # need display -override_dh_auto_install: - override_dh_installchangelogs: dh_installchangelogs CHANGES.html +override_dh_strip: + dh_strip --dbg-package=nam-dbg + + diff -Nru nam-1.15~RC4/debian/watch nam-1.15/debian/watch --- nam-1.15~RC4/debian/watch 2011-04-15 09:57:45.000000000 +0000 +++ nam-1.15/debian/watch 2011-11-24 05:17:03.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -opts="uversionmangle=s/-RC/~RC/" \ -http://www.isi.edu/nsnam/dist/release/nam-(.*)\.tar\.gz +opts="dversionmangle=s/\.(\d\d)\+dfsg/\.$1/" \ +http://sf.net/nsnam/nam-src-(.+)\.tar\.gz diff -Nru nam-1.15~RC4/edge.cc nam-1.15/edge.cc --- nam-1.15~RC4/edge.cc 2010-09-05 23:23:21.000000000 +0000 +++ nam-1.15/edge.cc 2011-11-04 17:18:42.000000000 +0000 @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /cvsroot/nsnam/nam-1/edge.cc,v 1.54 2003/10/11 22:56:49 xuanc Exp $ (LBL) + * @(#) $Header: /cvsroot/nsnam/nam-1/edge.cc,v 1.55 2011/11/02 16:08:03 tom_henderson Exp $ (LBL) */ @@ -671,8 +671,7 @@ int Edge::writeNsScript(FILE *file) { rgb *color; - double angle,length; - float dx,dy; + double angle; color = Paint::instance()->paint_to_rgb(paint_); @@ -681,9 +680,6 @@ } else { angle = 180 * (angle_ / M_PI); } - dx = x0_ - x1_; - dy = y0_ - y1_; - length = sqrt(dx * dx + dy * dy); // Create the link if (queue_handle_) { diff -Nru nam-1.15~RC4/editview.cc nam-1.15/editview.cc --- nam-1.15~RC4/editview.cc 2010-09-05 23:23:21.000000000 +0000 +++ nam-1.15/editview.cc 2011-11-04 17:18:42.000000000 +0000 @@ -39,7 +39,7 @@ * possible to release a modified version which carries forward this * exception. * - * $Header: /cvsroot/nsnam/nam-1/editview.cc,v 1.36 2007/02/12 07:08:43 tom_henderson Exp $ + * $Header: /cvsroot/nsnam/nam-1/editview.cc,v 1.37 2011/10/31 05:46:16 tom_henderson Exp $ */ #include @@ -82,7 +82,7 @@ } char str[256]; model_ = m; - sprintf(str, "def%-u", (long)this); + sprintf(str, "def%-li", (long)this); defTag_ = new Tag(str); model_->add_tag(defTag_); editing_stage_ = NONE; @@ -105,7 +105,7 @@ } model_ = m; - sprintf(str, "def%-u", (long)this); + sprintf(str, "def%-li", (long)this); defTag_ = new Tag(name); model_->add_tag(defTag_); editing_stage_ = NONE; diff -Nru nam-1.15~RC4/FILES nam-1.15/FILES --- nam-1.15~RC4/FILES 2010-09-05 23:23:21.000000000 +0000 +++ nam-1.15/FILES 2011-11-04 17:18:41.000000000 +0000 @@ -250,7 +250,6 @@ queue.h queuehandle.cc queuehandle.h -random.cc random.h README rng.cc diff -Nru nam-1.15~RC4/gen/.cvsignore nam-1.15/gen/.cvsignore --- nam-1.15~RC4/gen/.cvsignore 2010-09-05 23:23:20.000000000 +0000 +++ nam-1.15/gen/.cvsignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -version.c -nam_tcl.cc diff -Nru nam-1.15~RC4/lossmodel.cc nam-1.15/lossmodel.cc --- nam-1.15~RC4/lossmodel.cc 2010-09-05 23:23:21.000000000 +0000 +++ nam-1.15/lossmodel.cc 2011-11-04 17:18:42.000000000 +0000 @@ -348,11 +348,9 @@ LossModel::property() { static char text[PROPERTY_STRING_LENGTH]; char * property_list; - int total_written = 0; property_list = text; - total_written = sprintf(text, - "{\"Loss Model: %s %d->%d\" title title \"LossModel %d\"} ", + sprintf(text, "{\"Loss Model: %s %d->%d\" title title \"LossModel %d\"} ", name(), edge_->src(), edge_->dst(), number_); if (strcmp(name(), "Periodic") == 0) { diff -Nru nam-1.15~RC4/main.cc nam-1.15/main.cc --- nam-1.15~RC4/main.cc 2010-09-05 23:23:19.000000000 +0000 +++ nam-1.15/main.cc 2011-11-04 17:18:42.000000000 +0000 @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /cvsroot/nsnam/nam-1/main.cc,v 1.58 2010/02/24 05:24:20 tom_henderson Exp $ (LBL) + * @(#) $Header: /cvsroot/nsnam/nam-1/main.cc,v 1.59 2011/11/02 16:08:03 tom_henderson Exp $ (LBL) */ #include @@ -294,7 +294,7 @@ /*ARGSUSED*/ int main(int argc, char **argv) { - const char* script = 0; // configurations to be loaded + //const char* script = 0; // configurations to be loaded const char* optstr = "d:M:j:pG:r:u:X:t:i:P:g:N:c:S:f:asmk:zk:xp"; TraceEvent te; // Used to display parsetable ParseTable pt(&te); // Used to display parsetable @@ -447,7 +447,7 @@ case 'f': case 'u': - script = optarg; + //script = optarg; /* Also pass it to OTcl */ sprintf(buf, "f %s ", optarg); strcat(args, buf); diff -Nru nam-1.15~RC4/Makefile nam-1.15/Makefile --- nam-1.15~RC4/Makefile 2010-09-05 23:23:21.000000000 +0000 +++ nam-1.15/Makefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,202 +0,0 @@ -# -# Copyright (c) 1991,1993 The Regents of the University of California. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by the Computer Systems -# Engineering Group at Lawrence Berkeley Laboratory. -# 4. Neither the name of the University nor of the Laboratory may be used -# to endorse or promote products derived from this software without -# specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# @(#) $Header: /cvsroot/nsnam/nam-1/Makefile.in,v 1.53 2007/03/11 00:07:19 tom_henderson Exp $ -# - -# Top level hierarchy -prefix = /usr/local -exec_prefix = ${prefix} -# Pathname of directory to install the binary -BINDEST = ${exec_prefix}/bin -# Pathname of directory to install the man page -MANDEST = ${prefix}/share/man - -CC = gcc -CPP = g++ -CCOPT = -Wall -Wno-write-strings -MKDEP = ./conf/mkdep -# Have to be the same as that defined in conf/makefile.win -TCL2C = ../tclcl/tcl2c++ -TCLSH = /usr/bin/tclsh8.5 - -# -# Remember to add a dependency if you add any tcl sources here. -# -LIB = \ - -L/home/tomh/cvs/tclcl -ltclcl -L/home/tomh/cvs/otcl -lotcl -L/usr/lib -ltk8.5 -L/usr/lib -ltcl8.5 -L/usr/lib -lz \ - -lXext -lX11 \ - -lnsl -ldl -lm -INCLUDE = \ - -I. -I/home/tomh/cvs/tclcl -I/home/tomh/cvs/otcl -I/usr/include -I/usr/include/tcl-private/generic -I/usr/include -I/usr/include \ - - -STATIC = -DEFINE = -DTCL_TK -DNO_VOID -DNDEBUG -DUSE_SHM -DHAVE_LIBTCLCL -DHAVE_TCLCL_H -DHAVE_LIBOTCL1_13 -DHAVE_OTCL_H -DHAVE_LIBTK8_5 -DHAVE_TK_H -DHAVE_LIBTCL8_5 -DHAVE_TCLINT_H -DHAVE_TCL_H -DHAVE_LIBZ1_2_3 -DHAVE_ZLIB_H -CFLAGS = $(CCOPT) $(DEFINE) $(INCLUDE) - -INSTALL = /usr/bin/install -c -RANLIB = ranlib - -BLANK = # make a blank space. DO NOT add anything to this line -AR = ar rc $(BLANK) -LINK = $(CPP) -LDFLAGS = -LDOUT = -o $(BLANK) -PERL = perl -RM = rm -f - -# Explicitly define compilation rules since SunOS 4's make doesn't like gcc. -# Also, gcc does not remove the .o before forking 'as', which can be a -# problem if you don't own the file but can write to the directory. -.SUFFIXES: .cc $(.SUFFIXES) - -.cc.o: - rm -f $@; $(CPP) -o $@ -c $(CFLAGS) $*.cc - -.c.o: - rm -f $@; $(CC) -o $@ -c $(CFLAGS) $*.c - -GEN_DIR = gen/ -NAM = nam - -# WIN32: uncomment the following line to include specific make for VC++ -# !include - -OBJ_C = tkcompat.o tkUnixInit.o xwd.o - -OBJ_CC = \ - netview.o netmodel.o edge.o packet.o node.o main.o \ - trace.o queue.o drop.o animation.o agent.o feature.o \ - route.o transform.o paint.o state.o monitor.o anetmodel.o \ - random.o rng.o view.o graphview.o netgraph.o tracehook.o\ - lan.o psview.o group.o editview.o tag.o address.o animator.o \ - wnetmodel.o nam_stream.o enetmodel.o testview.o parser.o \ - trafficsource.o lossmodel.o queuehandle.o - -OBJ_GEN = \ - $(GEN_DIR)version.o $(GEN_DIR)nam_tcl.o -SRC_GEN = \ - $(GEN_DIR)version.c $(GEN_DIR)nam_tcl.cc - -OBJ = $(OBJ_C) $(OBJ_CC) $(OBJ_GEN) -SRC = $(OBJ_C:.o=.c) $(OBJ_CC:.o=.cc) - -CLEANFILES = $(NAM) $(OBJ) $(SRC_GEN) core core.nam - -NAM_TCL_LIB = \ - tcl/nam-lib.tcl \ - tcl/nam-default.tcl \ - tcl/balloon.tcl \ - tcl/snapshot.tcl \ - tcl/animator.tcl \ - tcl/anim-ctrl.tcl \ - tcl/netModel.tcl \ - tcl/autoNetModel.tcl \ - tcl/build-ui.tcl \ - tcl/annotation.tcl \ - tcl/node.tcl \ - tcl/monitor.tcl \ - tcl/stats.tcl \ - tcl/www.tcl \ - tcl/menu_file.tcl \ - tcl/menu_view.tcl \ - tcl/NamgraphView.tcl \ - tcl/NamgraphModel.tcl \ - tcl/TimesliderNamgraphView.tcl \ - tcl/TimesliderView.tcl \ - tcl/TimesliderModel.tcl \ - tcl/observer.tcl \ - tcl/observable.tcl \ - tcl/wirelessNetModel.tcl \ - tcl/editorNetModel.tcl \ - tcl/Editor.tcl \ - tcl/Editor-FileParser.tcl - -$(NAM): $(OBJ) $(SCRYOBJ) Makefile - $(RM) $@ - $(LINK) $(STATIC) $(LDFLAGS) $(LDOUT)$@ \ - $(OBJ) $(SCRYOBJ) $(LIB) - -Makefile: Makefile.in - @echo "Makefile.in is newer than Makefile." - @echo "You need to re-run configure." - false - -$(GEN_DIR)nam_tcl.cc: $(NAM_TCL_LIB) - $(RM) $@ - $(TCLSH) bin/tcl-expand.tcl tcl/nam-lib.tcl | $(TCL2C) et_nam > $@ - -$(GEN_DIR)version.c: VERSION - $(RM) $@ - $(TCLSH) bin/string2c.tcl version < VERSION > $@ - -install: force - $(INSTALL) -m 755 nam $(DESTDIR)$(BINDEST) - -clean: - $(RM) $(CLEANFILES) - -distclean: - $(RM) $(CLEANFILES) Makefile config.cache config.log config.status - -tar: force - tar=$(TAR_PREFIX)-nam-`cat VERSION`.tar.gz ; \ - rm -f $$tar ; \ - tar cfhF - $(TAR) | gzip -c > $$tar - -depend: $(SRC) - $(MKDEP) $(CFLAGS) $(SRC) - -srctar: - @cwd=`pwd` ; dir=`basename $$cwd` ; \ - name=nam-`cat VERSION | tr A-Z a-z` ; \ - tar=nam-src-`cat VERSION`.tar.gz ; \ - list="" ; \ - for i in `cat FILES` ; do list="$$list $$name/$$i" ; done; \ - echo \ - "(rm -f $$tar; cd .. ; ln -s $$dir $$name)" ; \ - (rm -f $$tar; cd .. ; ln -s $$dir $$name) ; \ - echo \ - "(cd .. ; tar cfhz $$tar [lots of files])" ; \ - (cd .. ; tar cfhz - $$list) > $$tar ; \ - echo \ - "rm ../$$name; chmod 444 $$tar" ; \ - rm ../$$name; chmod 444 $$tar - -force: - -# Create makefile.vc for Win32 development by replacing: -# "# !include ..." -> "!include ..." -makefile.vc: Makefile.in - $(PERL) bin/gen-vcmake.pl < Makefile.in > makefile.vc -# $(PERL) -pe 's/^# (\!include)/\!include/o' < Makefile.in > makefile.vc diff -Nru nam-1.15~RC4/Makefile.in nam-1.15/Makefile.in --- nam-1.15~RC4/Makefile.in 2010-09-05 23:23:16.000000000 +0000 +++ nam-1.15/Makefile.in 2011-11-04 17:18:41.000000000 +0000 @@ -30,7 +30,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# @(#) $Header: /cvsroot/nsnam/nam-1/Makefile.in,v 1.53 2007/03/11 00:07:19 tom_henderson Exp $ +# @(#) $Header: /cvsroot/nsnam/nam-1/Makefile.in,v 1.54 2011/11/02 16:31:26 tom_henderson Exp $ # # Top level hierarchy @@ -40,6 +40,8 @@ BINDEST = @bindir@ # Pathname of directory to install the man page MANDEST = @mandir@ +# Define datarootdir as of autoconf 2.60 +datarootdir = @datarootdir@ CC = @CC@ CPP = @CXX@ @@ -98,7 +100,7 @@ netview.o netmodel.o edge.o packet.o node.o main.o \ trace.o queue.o drop.o animation.o agent.o feature.o \ route.o transform.o paint.o state.o monitor.o anetmodel.o \ - random.o rng.o view.o graphview.o netgraph.o tracehook.o\ + rng.o view.o graphview.o netgraph.o tracehook.o \ lan.o psview.o group.o editview.o tag.o address.o animator.o \ wnetmodel.o nam_stream.o enetmodel.o testview.o parser.o \ trafficsource.o lossmodel.o queuehandle.o diff -Nru nam-1.15~RC4/node.cc nam-1.15/node.cc --- nam-1.15~RC4/node.cc 2010-09-05 23:23:21.000000000 +0000 +++ nam-1.15/node.cc 2011-11-04 17:18:42.000000000 +0000 @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /cvsroot/nsnam/nam-1/node.cc,v 1.62 2001/08/31 03:18:15 mehringe Exp $ (LBL) + * @(#) $Header: /cvsroot/nsnam/nam-1/node.cc,v 1.63 2011/11/02 16:08:03 tom_henderson Exp $ (LBL) */ #include @@ -223,15 +223,16 @@ //---------------------------------------------------------------------- void MovementList::setList(char * list_string) { - char * run, * next; - double time; + char * run = 0; + char * next = 0; + //double time; // Erase all items on the list clear(); // Run down the list string and add values to the list run = list_string; while (run) { - time = strtod(run, &next); + //time = strtod(run, &next); if (run != next) { //add(time); } else { diff -Nru nam-1.15~RC4/queuehandle.cc nam-1.15/queuehandle.cc --- nam-1.15~RC4/queuehandle.cc 2010-09-05 23:23:19.000000000 +0000 +++ nam-1.15/queuehandle.cc 2011-11-04 17:18:42.000000000 +0000 @@ -418,12 +418,10 @@ QueueHandle::getProperties(char * type) { static char text[PROPERTY_STRING_LENGTH]; char * property_list; - int total_written = 0; // object type, id and header info property_list = text; - total_written = sprintf(text, - "{\"Queue: %s %d->%d\" title title \"QueueHandle %d-%d\"} ", + sprintf(text, "{\"Queue: %s %d->%d\" title title \"QueueHandle %d-%d\"} ", type_, edge_->src(), edge_->dst(), edge_->src(), edge_->dst()); property_list = &text[strlen(text)]; diff -Nru nam-1.15~RC4/random.cc nam-1.15/random.cc --- nam-1.15~RC4/random.cc 2010-09-05 23:23:16.000000000 +0000 +++ nam-1.15/random.cc 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -/* -*- Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */ -/* - * Copyright (c) 1995 Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the Computer Systems - * Engineering Group at Lawrence Berkeley Laboratory. - * 4. Neither the name of the University nor of the Laboratory may be used - * to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * "@(#) $Header: /cvsroot/nsnam/nam-1/random.cc,v 1.5 2001/06/16 01:53:11 mehringe Exp $ (LBL)"; - */ - -#ifndef WIN32 - -#include -#include "config.h" -#include "random.h" - -/* __THROW is new with gcc 2.8.x and egcs (in redhat 7.0beta) */ -#if defined(__GNUC__) && defined(__THROW) -#define GCC_THROW __THROW -#else -#define GCC_THROW -#endif - -RANDOM_RETURN_TYPE -random() GCC_THROW -{ - printf("random() called in nam.\nRandom is not portable, please use Random::uniform() instead.\n"); - abort(); -} - -#endif /* !WIN32 */ diff -Nru nam-1.15~RC4/tcl/animator.tcl nam-1.15/tcl/animator.tcl --- nam-1.15~RC4/tcl/animator.tcl 2010-09-05 23:23:20.000000000 +0000 +++ nam-1.15/tcl/animator.tcl 2011-11-04 17:18:42.000000000 +0000 @@ -15,7 +15,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# $Header: /cvsroot/nsnam/nam-1/tcl/animator.tcl,v 1.49 2009/06/18 00:54:24 tom_henderson Exp $ +# $Header: /cvsroot/nsnam/nam-1/tcl/animator.tcl,v 1.50 2011/10/31 03:51:21 tom_henderson Exp $ #----------------------------------------------------------------------- # Animator instproc init { trace_file args } @@ -57,7 +57,7 @@ set analysis_OK 0 set analysis_ready 0 set nam_version 0 - set welcome " Welcome to NamGraph 1.14 " + set welcome " Welcome to NamGraph 1.15 " # network model used. can be customized in .nam.tcl in current # directory diff -Nru nam-1.15~RC4/tcl/nam-default.tcl nam-1.15/tcl/nam-default.tcl --- nam-1.15~RC4/tcl/nam-default.tcl 2010-09-05 23:23:20.000000000 +0000 +++ nam-1.15/tcl/nam-default.tcl 2011-11-04 17:18:42.000000000 +0000 @@ -17,7 +17,7 @@ # # Initialization of constants # -# $Header: /cvsroot/nsnam/nam-1/tcl/nam-default.tcl,v 1.8 2009/06/18 00:54:24 tom_henderson Exp $ +# $Header: /cvsroot/nsnam/nam-1/tcl/nam-default.tcl,v 1.9 2011/10/31 03:51:21 tom_henderson Exp $ set tk_strictMotif 0 @@ -41,4 +41,4 @@ AnimControl set ANIMATOR_CLASS_ Animator ;# Overwrite this in .nam.tcl to use derived animator class -Animator set welcome " Welcome to NamGraph 1.14 " +Animator set welcome " Welcome to NamGraph 1.15 " diff -Nru nam-1.15~RC4/testview.cc nam-1.15/testview.cc --- nam-1.15~RC4/testview.cc 2010-09-05 23:23:16.000000000 +0000 +++ nam-1.15/testview.cc 2011-11-04 17:18:42.000000000 +0000 @@ -145,11 +145,9 @@ TestView::line(float x0, float y0, float x1, float y1, int paint) { float ax, ay, bx, by; - rgb * color; matrix_.map(x0, y0, ax, ay); matrix_.map(x1, y1, bx, by); - color = Paint::instance()->paint_to_rgb(paint); fprintf(file_, "half line "); fprintf(file_, "from <%.1f %.1f> to <%.1f %.1f>\n", ax, ay, bx, by); @@ -227,16 +225,14 @@ const char*) { float x, y; - int d; matrix_.map(fx, fy, x, y); float dummy, dlow, dhigh; matrix_.map(0., 0., dummy, dlow); matrix_.map(0., 0.6 * dim, dummy, dhigh); - d = int(dhigh - dlow); - if(s!="") { + if (strcmp(s, "") != 0) { switch (anchor) { case ANCHOR_CENTER: fprintf(file_, "with label (%s) at center <%.1f %.1f>\n", s, x, y); diff -Nru nam-1.15~RC4/VERSION nam-1.15/VERSION --- nam-1.15~RC4/VERSION 2010-09-05 23:30:24.000000000 +0000 +++ nam-1.15/VERSION 2010-02-24 04:30:05.000000000 +0000 @@ -1 +1 @@ -1.15-RC4 +1.15 diff -Nru nam-1.15~RC4/view.cc nam-1.15/view.cc --- nam-1.15~RC4/view.cc 2010-09-05 23:23:15.000000000 +0000 +++ nam-1.15/view.cc 2011-11-04 17:18:42.000000000 +0000 @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /cvsroot/nsnam/nam-1/view.cc,v 1.30 2003/10/11 22:56:51 xuanc Exp $ (LBL) + * @(#) $Header: /cvsroot/nsnam/nam-1/view.cc,v 1.31 2011/11/02 16:08:04 tom_henderson Exp $ (LBL) */ #include @@ -482,14 +482,10 @@ nv->draw(); } else if ((argc == 7) && (strcmp(argv[2], "grab") == 0)) { - float x_start, y_start; float world_x_start, world_y_start; nv->matrix_.imap(atof(argv[3]), atof(argv[4]), world_x_start, world_y_start); - x_start = atof(argv[3]); - y_start = atof(argv[3]); - } else { Tcl_AppendResult(tcl, "\"", argv[0], @@ -855,11 +851,9 @@ View::boxedString(const char * text, double world_x, double world_y, double vertical_size, int paint, const char * color) { - float box_width, text_width, height; + float box_width, text_width; float x_padding, y_padding; - height = 0; - box_width = getStringWidth(text, vertical_size); text_width = getStringWidth(text, 0.9*vertical_size); diff -Nru nam-1.15~RC4/xwd.c nam-1.15/xwd.c --- nam-1.15~RC4/xwd.c 2010-09-05 23:23:16.000000000 +0000 +++ nam-1.15/xwd.c 2011-11-04 17:18:42.000000000 +0000 @@ -258,7 +258,9 @@ char *win_name = "a"; int win_name_size = 1; /* strlen("a") */ XImage *image; - int absx, absy, x, y; + int absx, absy; + int x = 0; + int y = 0; XWDFileHeader header; XWDColor xwdcolor; int format = ZPixmap;