contrib/ncurses/COPYING
@@ -0,0 +1,28 @@
+Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, distribute with modifications, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization.
+
contrib/ncurses/INSTALL
@@ -1,5 +1,5 @@
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
contrib/ncurses/MANIFEST
@@ -190,6 +190,7 @@
./Ada95/src/terminal_interface-curses-text_io.ads ./Ada95/src/terminal_interface-curses-text_io.ads
./Ada95/src/terminal_interface-curses-trace.adb_p ./Ada95/src/terminal_interface-curses-trace.adb_p
./Ada95/src/terminal_interface.ads ./Ada95/src/terminal_interface.ads
+./COPYING
./INSTALL ./INSTALL
./MANIFEST ./MANIFEST
./Makefile.in ./Makefile.in
@@ -545,6 +546,8 @@
./include/nc_alloc.h ./include/nc_alloc.h
./include/nc_mingw.h ./include/nc_mingw.h
./include/nc_panel.h ./include/nc_panel.h
+./include/nc_string.h
+./include/nc_termios.h
./include/nc_tparm.h ./include/nc_tparm.h
./include/ncurses_cfg.hin ./include/ncurses_cfg.hin
./include/ncurses_defs ./include/ncurses_defs
@@ -656,6 +659,8 @@
./man/legacy_coding.3x ./man/legacy_coding.3x
./man/make_sed.sh ./man/make_sed.sh
./man/man_db.renames ./man/man_db.renames
+./man/manhtml.aliases
+./man/manhtml.externs
./man/manlinks.sed ./man/manlinks.sed
./man/menu.3x ./man/menu.3x
./man/menu_attributes.3x ./man/menu_attributes.3x
@@ -764,7 +769,6 @@
./mk-0th.awk ./mk-0th.awk
./mk-1st.awk ./mk-1st.awk
./mk-2nd.awk ./mk-2nd.awk
-./mk-dlls.sh.in
./mk-hdr.awk ./mk-hdr.awk
./ncurses/Makefile.in ./ncurses/Makefile.in
./ncurses/README ./ncurses/README
@@ -850,7 +854,6 @@
./ncurses/base/lib_wattron.c ./ncurses/base/lib_wattron.c
./ncurses/base/lib_winch.c ./ncurses/base/lib_winch.c
./ncurses/base/lib_window.c ./ncurses/base/lib_window.c
-./ncurses/base/memmove.c
./ncurses/base/nc_panel.c ./ncurses/base/nc_panel.c
./ncurses/base/resizeterm.c ./ncurses/base/resizeterm.c
./ncurses/base/safe_sprintf.c ./ncurses/base/safe_sprintf.c
@@ -867,6 +870,14 @@
./ncurses/llib-lncursest ./ncurses/llib-lncursest
./ncurses/llib-lncursestw ./ncurses/llib-lncursestw
./ncurses/llib-lncursesw ./ncurses/llib-lncursesw
+./ncurses/llib-ltic
+./ncurses/llib-ltict
+./ncurses/llib-ltictw
+./ncurses/llib-lticw
+./ncurses/llib-ltinfo
+./ncurses/llib-ltinfot
+./ncurses/llib-ltinfotw
+./ncurses/llib-ltinfow
./ncurses/modules ./ncurses/modules
./ncurses/tinfo/MKcaptab.awk ./ncurses/tinfo/MKcaptab.awk
./ncurses/tinfo/MKcaptab.sh ./ncurses/tinfo/MKcaptab.sh
@@ -915,10 +926,10 @@
./ncurses/tinfo/make_hash.c ./ncurses/tinfo/make_hash.c
./ncurses/tinfo/make_keys.c ./ncurses/tinfo/make_keys.c
./ncurses/tinfo/name_match.c ./ncurses/tinfo/name_match.c
+./ncurses/tinfo/obsolete.c
./ncurses/tinfo/parse_entry.c ./ncurses/tinfo/parse_entry.c
./ncurses/tinfo/read_entry.c ./ncurses/tinfo/read_entry.c
./ncurses/tinfo/read_termcap.c ./ncurses/tinfo/read_termcap.c
-./ncurses/tinfo/setbuf.c
./ncurses/tinfo/strings.c ./ncurses/tinfo/strings.c
./ncurses/tinfo/tinfo_driver.c ./ncurses/tinfo/tinfo_driver.c
./ncurses/tinfo/trim_sgr0.c ./ncurses/tinfo/trim_sgr0.c
@@ -943,8 +954,6 @@
./ncurses/tty/lib_tstp.c ./ncurses/tty/lib_tstp.c
./ncurses/tty/lib_twait.c ./ncurses/tty/lib_twait.c
./ncurses/tty/lib_vidattr.c ./ncurses/tty/lib_vidattr.c
-./ncurses/tty/tty_display.h
-./ncurses/tty/tty_input.h
./ncurses/tty/tty_update.c ./ncurses/tty/tty_update.c
./ncurses/wcwidth.h ./ncurses/wcwidth.h
./ncurses/widechar/charable.c ./ncurses/widechar/charable.c
@@ -967,9 +976,34 @@
./ncurses/widechar/lib_vline_set.c ./ncurses/widechar/lib_vline_set.c
./ncurses/widechar/lib_wacs.c ./ncurses/widechar/lib_wacs.c
./ncurses/widechar/lib_wunctrl.c ./ncurses/widechar/lib_wunctrl.c
+./ncurses/widechar/widechars.c
./ncurses/win32con/gettimeofday.c ./ncurses/win32con/gettimeofday.c
./ncurses/win32con/wcwidth.c ./ncurses/win32con/wcwidth.c
./ncurses/win32con/win_driver.c ./ncurses/win32con/win_driver.c
+./package/debian-mingw/changelog
+./package/debian-mingw/compat
+./package/debian-mingw/control
+./package/debian-mingw/copyright
+./package/debian-mingw/rules
+./package/debian-mingw/source/format
+./package/debian-mingw/watch
+./package/debian-mingw64/changelog
+./package/debian-mingw64/compat
+./package/debian-mingw64/control
+./package/debian-mingw64/copyright
+./package/debian-mingw64/rules
+./package/debian-mingw64/source/format
+./package/debian-mingw64/watch
+./package/debian/changelog
+./package/debian/compat
+./package/debian/control
+./package/debian/copyright
+./package/debian/rules
+./package/debian/source/format
+./package/debian/watch
+./package/mingw-ncurses.nsi
+./package/mingw-ncurses.spec
+./package/ncurses.spec
./panel/Makefile.in ./panel/Makefile.in
./panel/headers ./panel/headers
./panel/llib-lpanel ./panel/llib-lpanel
@@ -1022,12 +1056,14 @@
./test/cardfile.dat ./test/cardfile.dat
./test/chgat.c ./test/chgat.c
./test/clip_printw.c ./test/clip_printw.c
+./test/color_name.h
./test/color_set.c ./test/color_set.c
./test/configure ./test/configure
./test/configure.in ./test/configure.in
./test/demo_altkeys.c ./test/demo_altkeys.c
./test/demo_defkey.c ./test/demo_defkey.c
./test/demo_forms.c ./test/demo_forms.c
+./test/demo_forms.txt
./test/demo_keyok.c ./test/demo_keyok.c
./test/demo_menus.c ./test/demo_menus.c
./test/demo_panels.c ./test/demo_panels.c
@@ -1036,6 +1072,7 @@
./test/ditto.c ./test/ditto.c
./test/dots.c ./test/dots.c
./test/dots_mvcur.c ./test/dots_mvcur.c
+./test/dots_termcap.c
./test/echochar.c ./test/echochar.c
./test/edit_field.c ./test/edit_field.c
./test/edit_field.h ./test/edit_field.h
@@ -1043,6 +1080,7 @@
./test/firework.c ./test/firework.c
./test/firstlast.c ./test/firstlast.c
./test/foldkeys.c ./test/foldkeys.c
+./test/form_driver_w.c
./test/gdc.6 ./test/gdc.6
./test/gdc.c ./test/gdc.c
./test/hanoi.c ./test/hanoi.c
@@ -1073,6 +1111,7 @@
./test/package/debian/rules ./test/package/debian/rules
./test/package/debian/source/format ./test/package/debian/source/format
./test/package/debian/watch ./test/package/debian/watch
+./test/package/mingw-ncurses-examples.spec
./test/package/ncurses-examples.spec ./test/package/ncurses-examples.spec
./test/programs ./test/programs
./test/railroad.c ./test/railroad.c
@@ -1092,12 +1131,15 @@
./test/test_instr.c ./test/test_instr.c
./test/test_inwstr.c ./test/test_inwstr.c
./test/test_opaque.c ./test/test_opaque.c
+./test/test_vid_puts.c
+./test/test_vidputs.c
./test/testaddch.c ./test/testaddch.c
./test/testcurs.c ./test/testcurs.c
./test/testscanw.c ./test/testscanw.c
./test/tracemunch ./test/tracemunch
./test/view.c ./test/view.c
./test/widechars-utf8.txt ./test/widechars-utf8.txt
+./test/widechars.h
./test/worm.c ./test/worm.c
./test/xmas.c ./test/xmas.c
./test/xterm-16color.dat ./test/xterm-16color.dat
contrib/ncurses/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.30 2010/11/27 21:45:27 tom Exp $+# $Id: Makefile.in,v 1.38 2014/01/18 20:19:45 tom Exp $
############################################################################## ##############################################################################
-# Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. #+# Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. #
# # # #
# Permission is hereby granted, free of charge, to any person obtaining a # # Permission is hereby granted, free of charge, to any person obtaining a #
# copy of this software and associated documentation files (the "Software"), # # copy of this software and associated documentation files (the "Software"), #
@@ -27,7 +27,7 @@
# authorization. # # authorization. #
############################################################################## ##############################################################################
# #
-# Author: Thomas E. Dickey <dickey@clark.net> 1996,1997+# Author: Thomas E. Dickey 1996-on
# #
# Master Makefile for ncurses library. # Master Makefile for ncurses library.
@@ -35,7 +35,8 @@ SHELL = /bin/sh
VPATH = @srcdir@ VPATH = @srcdir@
DESTDIR=@DESTDIR@ DESTDIR=@DESTDIR@
-CF_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)"+RPATH_LIST=@RPATH_LIST@
+TOP_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
@SET_MAKE@ @SET_MAKE@
@@ -48,13 +49,17 @@ srcdir = @srcdir@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
bindir = @bindir@ bindir = @bindir@
ticdir = @TERMINFO@ ticdir = @TERMINFO@
includedir = @includedir@ includedir = @includedir@
+includesubdir = @includesubdir@
libdir = @libdir@ libdir = @libdir@
mandir = @mandir@ mandir = @mandir@
+include_dir = ${includedir}${includesubdir}
+
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
@@ -74,25 +79,22 @@ preinstall :
@ echo '' @ echo ''
@ echo ' bin directory: '$(bindir) @ echo ' bin directory: '$(bindir)
@ echo ' lib directory: '$(libdir) @ echo ' lib directory: '$(libdir)
- @ echo ' include directory: '$(includedir)+ @ echo ' include directory: '$(include_dir)
@ echo ' man directory: '$(mandir) @ echo ' man directory: '$(mandir)
@MAKE_TERMINFO@ @ echo ' terminfo directory: '$(ticdir) @MAKE_TERMINFO@ @ echo ' terminfo directory: '$(ticdir)
@ echo '' @ echo ''
- @ test "$(includedir)" = "$(prefix)/include" || \+ @ test "$(include_dir)" = "$(prefix)/include" || \
echo '** Include-directory is not in a standard location' echo '** Include-directory is not in a standard location'
- @ test ! -f $(includedir)/termcap.h || \+ @ test ! -f $(include_dir)/termcap.h || \
- fgrep NCURSES_VERSION $(includedir)/termcap.h >/dev/null || \+ fgrep NCURSES_VERSION $(include_dir)/termcap.h >/dev/null || \
echo '** Will overwrite non-ncurses termcap.h' echo '** Will overwrite non-ncurses termcap.h'
- @ test ! -f $(includedir)/curses.h || \+ @ test ! -f $(include_dir)/curses.h || \
- fgrep NCURSES_VERSION $(includedir)/curses.h >/dev/null || \+ fgrep NCURSES_VERSION $(include_dir)/curses.h >/dev/null || \
echo '** Will overwrite non-ncurses curses.h' echo '** Will overwrite non-ncurses curses.h'
-dlls: libs
- $(SHELL) $(srcdir)/mk-dlls.sh
-
distclean \ distclean \
realclean :: realclean ::
- -rm -f mk-dlls.sh mingw_arch+
# Put the common rules here so that we can easily construct the list of # Put the common rules here so that we can easily construct the list of
# directories to visit. # directories to visit.
contrib/ncurses/NEWS
@@ -1,5 +1,5 @@
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
contrib/ncurses/README
@@ -1,5 +1,5 @@
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
contrib/ncurses/README.MinGW
@@ -1,5 +1,5 @@
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
contrib/ncurses/aclocal.m4
@@ -1,5 +1,5 @@
dnl*************************************************************************** dnl***************************************************************************
-dnl Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. *+dnl Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. *
dnl * dnl *
dnl Permission is hereby granted, free of charge, to any person obtaining a * dnl Permission is hereby granted, free of charge, to any person obtaining a *
dnl copy of this software and associated documentation files (the * dnl copy of this software and associated documentation files (the *
@@ -28,7 +28,7 @@ dnl***************************************************************************
dnl dnl
dnl Author: Thomas E. Dickey 1995-on dnl Author: Thomas E. Dickey 1995-on
dnl dnl
-dnl $Id: aclocal.m4,v 1.553 2011/03/31 23:35:38 tom Exp $+dnl $Id: aclocal.m4,v 1.686 2014/02/10 00:37:02 tom Exp $
dnl Macros used in NCURSES auto-configuration script. dnl Macros used in NCURSES auto-configuration script.
dnl dnl
dnl These macros are maintained separately from NCURSES. The copyright on dnl These macros are maintained separately from NCURSES. The copyright on
@@ -62,7 +62,33 @@ AC_DEFUN([AM_LANGINFO_CODESET],
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_ADA_INCLUDE_DIRS version: 6 updated: 2010/02/26 19:52:07+dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56
+dnl ------------------
+dnl Conditionally generate script according to whether we're using a given autoconf.
+dnl
+dnl $1 = version to compare against
+dnl $2 = code to use if AC_ACVERSION is at least as high as $1.
+dnl $3 = code to use if AC_ACVERSION is older than $1.
+define([CF_ACVERSION_CHECK],
+[
+ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl
+ifdef([m4_version_compare],
+[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
+[CF_ACVERSION_COMPARE(
+AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])),
+AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ACVERSION_COMPARE version: 3 updated: 2012/10/03 18:39:53
+dnl --------------------
+dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1,
+dnl MAJOR2, MINOR2, TERNARY2,
+dnl PRINTABLE2, not FOUND, FOUND)
+define([CF_ACVERSION_COMPARE],
+[ifelse(builtin([eval], [$2 < $5]), 1,
+[ifelse([$8], , ,[$8])],
+[ifelse([$9], , ,[$9])])])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ADA_INCLUDE_DIRS version: 8 updated: 2013/10/14 04:24:07
dnl ------------------- dnl -------------------
dnl Construct the list of include-options for the C programs in the Ada95 dnl Construct the list of include-options for the C programs in the Ada95
dnl binding. dnl binding.
@@ -76,7 +102,7 @@ if test "$GCC" != yes; then
ACPPFLAGS="$ACPPFLAGS -I\${includedir}" ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
elif test "$includedir" != "/usr/include"; then elif test "$includedir" != "/usr/include"; then
if test "$includedir" = '${prefix}/include' ; then if test "$includedir" = '${prefix}/include' ; then
- if test $prefix != /usr ; then+ if test x$prefix != x/usr ; then
ACPPFLAGS="$ACPPFLAGS -I\${includedir}" ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
fi fi
else else
@@ -291,7 +317,7 @@ dnl $1 = libraries to add, with the "-l", etc.
dnl $2 = variable to update (default $LIBS) dnl $2 = variable to update (default $LIBS)
AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_ADD_SUBDIR_PATH version: 3 updated: 2010/07/03 20:58:12+dnl CF_ADD_SUBDIR_PATH version: 4 updated: 2013/10/08 17:47:05
dnl ------------------ dnl ------------------
dnl Append to a search-list for a nonstandard header/lib-file dnl Append to a search-list for a nonstandard header/lib-file
dnl $1 = the variable to return as result dnl $1 = the variable to return as result
@@ -301,9 +327,9 @@ dnl $4 = the directory under which we will test for subdirectories
dnl $5 = a directory that we do not want $4 to match dnl $5 = a directory that we do not want $4 to match
AC_DEFUN([CF_ADD_SUBDIR_PATH], AC_DEFUN([CF_ADD_SUBDIR_PATH],
[ [
-test "$4" != "$5" && \+test "x$4" != "x$5" && \
test -d "$4" && \ test -d "$4" && \
-ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) {+ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]) {
test -n "$verbose" && echo " ... testing for $3-directories under $4" test -n "$verbose" && echo " ... testing for $3-directories under $4"
test -d $4/$3 && $1="[$]$1 $4/$3" test -d $4/$3 && $1="[$]$1 $4/$3"
test -d $4/$3/$2 && $1="[$]$1 $4/$3/$2" test -d $4/$3/$2 && $1="[$]$1 $4/$3/$2"
@@ -313,76 +339,6 @@ ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) {
} }
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32
-dnl ----------------
-dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
-dnl in the sharutils 4.2 distribution.
-AC_DEFUN([CF_ANSI_CC_CHECK],
-[
-AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[
-cf_cv_ansi_cc=no
-cf_save_CFLAGS="$CFLAGS"
-cf_save_CPPFLAGS="$CPPFLAGS"
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX -Aa -D_HPUX_SOURCE
-# SVR4 -Xc
-# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes)
-for cf_arg in "-DCC_HAS_PROTOS" \
- "" \
- -qlanglvl=ansi \
- -std1 \
- -Ae \
- "-Aa -D_HPUX_SOURCE" \
- -Xc
-do
- CF_ADD_CFLAGS($cf_arg)
- AC_TRY_COMPILE(
-[
-#ifndef CC_HAS_PROTOS
-#if !defined(__STDC__) || (__STDC__ != 1)
-choke me
-#endif
-#endif
-],[
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};],
- [cf_cv_ansi_cc="$cf_arg"; break])
-done
-CFLAGS="$cf_save_CFLAGS"
-CPPFLAGS="$cf_save_CPPFLAGS"
-])
-
-if test "$cf_cv_ansi_cc" != "no"; then
-if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then
- CF_ADD_CFLAGS($cf_cv_ansi_cc)
-else
- AC_DEFINE(CC_HAS_PROTOS)
-fi
-fi
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_ANSI_CC_REQD version: 4 updated: 2008/03/23 14:48:54
-dnl ---------------
-dnl For programs that must use an ANSI compiler, obtain compiler options that
-dnl will make it recognize prototypes. We'll do preprocessor checks in other
-dnl macros, since tools such as unproto can fake prototypes, but only part of
-dnl the preprocessor.
-AC_DEFUN([CF_ANSI_CC_REQD],
-[AC_REQUIRE([CF_ANSI_CC_CHECK])
-if test "$cf_cv_ansi_cc" = "no"; then
- AC_MSG_ERROR(
-[Your compiler does not appear to recognize prototypes.
-You have the following choices:
- a. adjust your compiler options
- b. get an up-to-date compiler
- c. use a wrapper such as unproto])
-fi
-])dnl
-dnl ---------------------------------------------------------------------------
dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31 dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
dnl -------------- dnl --------------
dnl Allow user to disable a normally-on option. dnl Allow user to disable a normally-on option.
@@ -465,7 +421,7 @@ fi
AC_SUBST(ARFLAGS) AC_SUBST(ARFLAGS)
]) ])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_AWK_BIG_PRINTF version: 3 updated: 2008/12/27 12:30:03+dnl CF_AWK_BIG_PRINTF version: 4 updated: 2011/10/30 17:09:50
dnl ----------------- dnl -----------------
dnl Check if awk can handle big strings using printf. Some older versions of dnl Check if awk can handle big strings using printf. Some older versions of
dnl awk choke on large strings passed via "%s". dnl awk choke on large strings passed via "%s".
@@ -479,8 +435,8 @@ AC_DEFUN([CF_AWK_BIG_PRINTF],
eval $2=no eval $2=no
;; ;;
*) #(vi *) #(vi
- if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' \+ if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' 2>/dev/null \
- | $AWK '{ printf "%d\n", length([$]0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then+ | $AWK '{ printf "%d\n", length([$]0); }' 2>/dev/null | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
eval $2=yes eval $2=yes
else else
eval $2=no eval $2=no
@@ -536,7 +492,7 @@ else AC_MSG_RESULT(no)
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_BOOL_SIZE version: 12 updated: 2006/12/16 12:33:30+dnl CF_BOOL_SIZE version: 13 updated: 2013/04/13 18:03:21
dnl ------------ dnl ------------
dnl Test for the size of 'bool' in the configured C++ compiler (e.g., a type). dnl Test for the size of 'bool' in the configured C++ compiler (e.g., a type).
dnl Don't bother looking for bool.h, since it's been deprecated. dnl Don't bother looking for bool.h, since it's been deprecated.
@@ -570,7 +526,7 @@ AC_CACHE_VAL(cf_cv_type_of_bool,[
#endif #endif
-main()+int main()
{ {
FILE *fp = fopen("cf_test.out", "w"); FILE *fp = fopen("cf_test.out", "w");
if (fp != 0) { if (fp != 0) {
@@ -604,7 +560,7 @@ if test "$cf_cv_type_of_bool" = unknown ; then
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_BUILD_CC version: 6 updated: 2006/10/14 15:23:15+dnl CF_BUILD_CC version: 7 updated: 2012/10/06 15:31:55
dnl ----------- dnl -----------
dnl If we're cross-compiling, allow the user to override the tools and their dnl If we're cross-compiling, allow the user to override the tools and their
dnl options. The configure script is oriented toward identifying the host dnl options. The configure script is oriented toward identifying the host
@@ -614,7 +570,8 @@ dnl
dnl $1 = default for $CPPFLAGS dnl $1 = default for $CPPFLAGS
dnl $2 = default for $LIBS dnl $2 = default for $LIBS
AC_DEFUN([CF_BUILD_CC],[ AC_DEFUN([CF_BUILD_CC],[
-AC_REQUIRE([CF_PROG_EXT])+CF_ACVERSION_CHECK(2.52,,
+ [AC_REQUIRE([CF_PROG_EXT])])
if test "$cross_compiling" = yes ; then if test "$cross_compiling" = yes ; then
# defaults that we might want to override # defaults that we might want to override
@@ -695,7 +652,33 @@ AC_SUBST(BUILD_EXEEXT)
AC_SUBST(BUILD_OBJEXT) AC_SUBST(BUILD_OBJEXT)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_CFG_DEFAULTS version: 7 updated: 2005/09/24 16:15:00+dnl CF_CC_ENV_FLAGS version: 1 updated: 2012/10/03 05:25:49
+dnl ---------------
+dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
+dnl into CC. This will not help with broken scripts that wrap the compiler with
+dnl options, but eliminates a more common category of user confusion.
+AC_DEFUN([CF_CC_ENV_FLAGS],
+[
+# This should have been defined by AC_PROG_CC
+: ${CC:=cc}
+
+AC_MSG_CHECKING(\$CC variable)
+case "$CC" in #(vi
+*[[\ \ ]]-[[IUD]]*)
+ AC_MSG_RESULT(broken)
+ AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
+ # humor him...
+ cf_flags=`echo "$CC" | sed -e 's/^[[^ ]]*[[ ]]//'`
+ CC=`echo "$CC" | sed -e 's/[[ ]].*//'`
+ CF_ADD_CFLAGS($cf_flags)
+ ;;
+*)
+ AC_MSG_RESULT(ok)
+ ;;
+esac
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CFG_DEFAULTS version: 10 updated: 2013/09/07 13:54:05
dnl --------------- dnl ---------------
dnl Determine the default configuration into which we'll install ncurses. This dnl Determine the default configuration into which we'll install ncurses. This
dnl can be overridden by the user's command-line options. There's two items to dnl can be overridden by the user's command-line options. There's two items to
@@ -713,7 +696,7 @@ AC_MSG_CHECKING(for prefix)
if test "x$prefix" = "xNONE" ; then if test "x$prefix" = "xNONE" ; then
case "$cf_cv_system_name" in case "$cf_cv_system_name" in
# non-vendor systems don't have a conflict # non-vendor systems don't have a conflict
- openbsd*|freebsd*|linux*|cygwin*|k*bsd*-gnu)+ openbsd*|freebsd*|mirbsd*|linux*|cygwin*|msys*|k*bsd*-gnu|mingw*)
prefix=/usr prefix=/usr
;; ;;
*) prefix=$ac_default_prefix *) prefix=$ac_default_prefix
@@ -749,30 +732,51 @@ AC_MSG_RESULT($includedir)
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_CGETENT version: 3 updated: 2000/08/12 23:18:52+dnl CF_CGETENT version: 5 updated: 2012/10/06 17:56:13
dnl ---------- dnl ----------
dnl Check if the terminal-capability database functions are available. If not, dnl Check if the terminal-capability database functions are available. If not,
dnl ncurses has a much-reduced version. dnl ncurses has a much-reduced version.
AC_DEFUN([CF_CGETENT],[ AC_DEFUN([CF_CGETENT],[
-AC_MSG_CHECKING(for terminal-capability database functions)+AC_CACHE_CHECK(for terminal-capability database functions,cf_cv_cgetent,[
-AC_CACHE_VAL(cf_cv_cgetent,[
AC_TRY_LINK([ AC_TRY_LINK([
#include <stdlib.h>],[ #include <stdlib.h>],[
char temp[128]; char temp[128];
char *buf = temp; char *buf = temp;
char *db_array = temp; char *db_array = temp;
- cgetent(&buf, /* int *, */ &db_array, "vt100");+ cgetent(&buf, &db_array, "vt100");
cgetcap(buf, "tc", '='); cgetcap(buf, "tc", '=');
cgetmatch(buf, "tc"); cgetmatch(buf, "tc");
], ],
[cf_cv_cgetent=yes], [cf_cv_cgetent=yes],
[cf_cv_cgetent=no]) [cf_cv_cgetent=no])
]) ])
-AC_MSG_RESULT($cf_cv_cgetent)+
-test "$cf_cv_cgetent" = yes && AC_DEFINE(HAVE_BSD_CGETENT)+if test "$cf_cv_cgetent" = yes
+then
+ AC_DEFINE(HAVE_BSD_CGETENT,1,[Define to 1 if we have BSD cgetent])
+AC_CACHE_CHECK(if cgetent uses const parameter,cf_cv_cgetent_const,[
+AC_TRY_LINK([
+#include <stdlib.h>],[
+ char temp[128];
+ char *buf = temp;
+#ifndef _NETBSD_SOURCE /* given, since April 2004 in stdlib.h */
+ const char *db_array = temp;
+ cgetent(&buf, &db_array, "vt100");
+#endif
+ cgetcap(buf, "tc", '=');
+ cgetmatch(buf, "tc");
+ ],
+ [cf_cv_cgetent_const=yes],
+ [cf_cv_cgetent_const=no])
+])
+ if test "$cf_cv_cgetent_const" = yes
+ then
+ AC_DEFINE_UNQUOTED(CGETENT_CONST,const,[Define to const if needed for some BSD cgetent variations])
+ fi
+fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59+dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03
dnl -------------- dnl --------------
dnl Check if we're accidentally using a cache from a different machine. dnl Check if we're accidentally using a cache from a different machine.
dnl Derive the system name, as a check for reusing the autoconf cache. dnl Derive the system name, as a check for reusing the autoconf cache.
@@ -795,7 +799,7 @@ else
system_name="`(hostname) 2>/dev/null`" system_name="`(hostname) 2>/dev/null`"
fi fi
fi fi
-test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name")+test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name",[Define to the system name.])
AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"]) AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"])
test -z "$system_name" && system_name="$cf_cv_system_name" test -z "$system_name" && system_name="$cf_cv_system_name"
@@ -908,7 +912,82 @@ if test "$cf_cv_check_gpm_wgetch" != yes ; then
fi fi
])])dnl ])])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_CPP_PARAM_INIT version: 4 updated: 2001/04/07 22:31:18+dnl CF_CHECK_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09
+dnl ------------------------
+dnl Show the version of libtool
+dnl
+dnl Save the version in a cache variable - this is not entirely a good thing,
+dnl but the version string from libtool is very ugly, and for bug reports it
+dnl might be useful to have the original string.
+AC_DEFUN([CF_CHECK_LIBTOOL_VERSION],[
+if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+then
+ AC_MSG_CHECKING(version of $LIBTOOL)
+ CF_LIBTOOL_VERSION
+ AC_MSG_RESULT($cf_cv_libtool_version)
+ if test -z "$cf_cv_libtool_version" ; then
+ AC_MSG_ERROR(This is not GNU libtool)
+ fi
+else
+ AC_MSG_ERROR(GNU libtool has not been found)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_WCHAR_H version: 1 updated: 2011/10/29 15:01:05
+dnl ----------------
+dnl Check if wchar.h can be used, i.e., without defining _XOPEN_SOURCE_EXTENDED
+AC_DEFUN([CF_CHECK_WCHAR_H],[
+AC_CACHE_CHECK(if wchar.h can be used as is,cf_cv_wchar_h_okay,[
+AC_TRY_COMPILE(
+[
+#include <stdlib.h>
+#include <wchar.h>
+],[
+ wint_t foo = 0;
+ int bar = iswpunct(foo)],
+ [cf_cv_wchar_h_okay=yes],
+ [cf_cv_wchar_h_okay=no])])
+
+if test $cf_cv_wchar_h_okay = no
+then
+ CF_PREDEFINE(_XOPEN_SOURCE_EXTENDED)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CLANG_COMPILER version: 2 updated: 2013/11/19 19:23:35
+dnl -----------------
+dnl Check if the given compiler is really clang. clang's C driver defines
+dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
+dnl not ignore some gcc options.
+dnl
+dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to
+dnl ensure that it is not mistaken for gcc/g++. It is normally invoked from
+dnl the wrappers for gcc and g++ warnings.
+dnl
+dnl $1 = GCC (default) or GXX
+dnl $2 = CLANG_COMPILER (default)
+dnl $3 = CFLAGS (default) or CXXFLAGS
+AC_DEFUN([CF_CLANG_COMPILER],[
+ifelse([$2],,CLANG_COMPILER,[$2])=no
+
+if test "$ifelse([$1],,[$1],GCC)" = yes ; then
+ AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler)
+ cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
+ ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments"
+ AC_TRY_COMPILE([],[
+#ifdef __clang__
+#else
+make an error
+#endif
+],[ifelse([$2],,CLANG_COMPILER,[$2])=yes
+cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+],[])
+ ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
+ AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2]))
+fi
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_CPP_PARAM_INIT version: 6 updated: 2012/10/06 17:56:13
dnl ----------------- dnl -----------------
dnl Check if the C++ compiler accepts duplicate parameter initialization. This dnl Check if the C++ compiler accepts duplicate parameter initialization. This
dnl is a late feature for the standard and is not in some recent compilers dnl is a late feature for the standard and is not in some recent compilers
@@ -932,7 +1011,7 @@ TEST::TEST(int x = 1) // some compilers do not like second initializer
{ {
value = x; value = x;
} }
-void main() { }+int main() { }
], ],
[cf_cv_cpp_param_init=yes], [cf_cv_cpp_param_init=yes],
[cf_cv_cpp_param_init=no], [cf_cv_cpp_param_init=no],
@@ -940,10 +1019,10 @@ void main() { }
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
fi fi
-test "$cf_cv_cpp_param_init" = yes && AC_DEFINE(CPP_HAS_PARAM_INIT)+test "$cf_cv_cpp_param_init" = yes && AC_DEFINE(CPP_HAS_PARAM_INIT,1,[Define to 1 if C++ has parameter initialization])
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_CPP_STATIC_CAST version: 1 updated: 2005/07/23 16:52:43+dnl CF_CPP_STATIC_CAST version: 3 updated: 2013/04/13 18:03:21
dnl ------------------ dnl ------------------
dnl Check if the C++ compiler accepts static_cast in generics. This appears to dnl Check if the C++ compiler accepts static_cast in generics. This appears to
dnl not be supported in g++ before 3.0 dnl not be supported in g++ before 3.0
@@ -965,7 +1044,7 @@ public:
int begin_x = 0) int begin_x = 0)
{ {
} }
-+ NCursesPanel();
~NCursesPanel(); ~NCursesPanel();
}; };
@@ -996,10 +1075,58 @@ public:
fi fi
-test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST)+test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST,1,[Define to 1 if C++ has static_cast])
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_C_INLINE version: 3 updated: 2010/05/01 15:14:41+dnl CF_CXX_AR_FLAGS version: 1 updated: 2011/10/29 08:35:34
+dnl ---------------
+dnl Setup special archiver flags for given compilers.
+AC_DEFUN([CF_CXX_AR_FLAGS],[
+ CXX_AR='$(AR)'
+ CXX_ARFLAGS='$(ARFLAGS)'
+ case $cf_cv_system_name in #(vi
+ irix*) #(vi
+ if test "$GXX" != yes ; then
+ CXX_AR='$(CXX)'
+ CXX_ARFLAGS='-ar -o'
+ fi
+ ;;
+ sco3.2v5*) #(vi
+ CXXLDFLAGS="-u main"
+ ;;
+ solaris2*)
+ if test "$GXX" != yes ; then
+ CXX_AR='$(CXX)'
+ CXX_ARFLAGS='-xar -o'
+ fi
+ ;;
+ esac
+ AC_SUBST(CXXLDFLAGS)
+ AC_SUBST(CXX_AR)
+ AC_SUBST(CXX_ARFLAGS)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CXX_IOSTREAM_NAMESPACE version: 2 updated: 2012/10/06 17:56:13
+dnl -------------------------
+dnl For c++, check if iostream uses "std::" namespace.
+AC_DEFUN([CF_CXX_IOSTREAM_NAMESPACE],[
+AC_CHECK_HEADERS(iostream)
+if test x"$ac_cv_header_iostream" = xyes ; then
+ AC_MSG_CHECKING(if iostream uses std-namespace)
+ AC_TRY_COMPILE([
+#include <iostream>
+using std::endl;
+using std::cerr;],[
+cerr << "testing" << endl;
+],[cf_iostream_namespace=yes],[cf_iostream_namespace=no])
+ AC_MSG_RESULT($cf_iostream_namespace)
+ if test "$cf_iostream_namespace" = yes ; then
+ AC_DEFINE(IOSTREAM_NAMESPACE,1,[Define to 1 if C++ has namespace iostream])
+ fi
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_C_INLINE version: 4 updated: 2012/06/16 14:55:39
dnl ----------- dnl -----------
dnl Check if the C compiler supports "inline". dnl Check if the C compiler supports "inline".
dnl $1 is the name of a shell variable to set if inline is supported dnl $1 is the name of a shell variable to set if inline is supported
@@ -1010,6 +1137,9 @@ $1=
if test "$ac_cv_c_inline" != no ; then if test "$ac_cv_c_inline" != no ; then
$1=inline $1=inline
if test "$INTEL_COMPILER" = yes if test "$INTEL_COMPILER" = yes
+ then
+ :
+ elif test "$CLANG_COMPILER" = yes
then then
: :
elif test "$GCC" = yes elif test "$GCC" = yes
@@ -1057,7 +1187,44 @@ done
AC_SUBST(DIRS_TO_MAKE) AC_SUBST(DIRS_TO_MAKE)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_LEAKS version: 6 updated: 2010/07/23 04:14:32+dnl CF_DISABLE_ECHO version: 12 updated: 2012/10/06 16:30:28
+dnl ---------------
+dnl You can always use "make -n" to see the actual options, but it's hard to
+dnl pick out/analyze warning messages when the compile-line is long.
+dnl
+dnl Sets:
+dnl ECHO_LT - symbol to control if libtool is verbose
+dnl ECHO_LD - symbol to prefix "cc -o" lines
+dnl RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o)
+dnl SHOW_CC - symbol to put before explicit "cc -c" lines
+dnl ECHO_CC - symbol to put before any "cc" line
+dnl
+AC_DEFUN([CF_DISABLE_ECHO],[
+AC_MSG_CHECKING(if you want to see long compiling messages)
+CF_ARG_DISABLE(echo,
+ [ --disable-echo do not display "compiling" commands],
+ [
+ ECHO_LT='--silent'
+ ECHO_LD='@echo linking [$]@;'
+ RULE_CC='@echo compiling [$]<'
+ SHOW_CC='@echo compiling [$]@'
+ ECHO_CC='@'
+],[
+ ECHO_LT=''
+ ECHO_LD=''
+ RULE_CC=''
+ SHOW_CC=''
+ ECHO_CC=''
+])
+AC_MSG_RESULT($enableval)
+AC_SUBST(ECHO_LT)
+AC_SUBST(ECHO_LD)
+AC_SUBST(RULE_CC)
+AC_SUBST(SHOW_CC)
+AC_SUBST(ECHO_CC)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_DISABLE_LEAKS version: 7 updated: 2012/10/02 20:55:03
dnl ---------------- dnl ----------------
dnl Combine no-leak checks with the libraries or tools that are used for the dnl Combine no-leak checks with the libraries or tools that are used for the
dnl checks. dnl checks.
@@ -1075,8 +1242,8 @@ AC_ARG_ENABLE(leaks,
AC_MSG_RESULT($with_no_leaks) AC_MSG_RESULT($with_no_leaks)
if test "$with_no_leaks" = yes ; then if test "$with_no_leaks" = yes ; then
- AC_DEFINE(NO_LEAKS)+ AC_DEFINE(NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
- AC_DEFINE(YY_NO_LEAKS)+ AC_DEFINE(YY_NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@@ -1123,6 +1290,30 @@ if test "$cf_disable_rpath_hack" = no ; then
fi fi
]) ])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
+dnl CF_ENABLE_PC_FILES version: 9 updated: 2012/08/04 13:59:54
+dnl ------------------
+dnl This is the "--enable-pc-files" option, which is available if there is a
+dnl pkg-config configuration on the local machine.
+AC_DEFUN([CF_ENABLE_PC_FILES],[
+AC_REQUIRE([CF_PKG_CONFIG])
+AC_REQUIRE([CF_WITH_PKG_CONFIG_LIBDIR])
+
+if test "$PKG_CONFIG" != none ; then
+ AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
+ AC_ARG_ENABLE(pc-files,
+ [ --enable-pc-files generate and install .pc files for pkg-config],
+ [enable_pc_files=$enableval],
+ [enable_pc_files=no])
+ AC_MSG_RESULT($enable_pc_files)
+ if test "$enable_pc_files" != no
+ then
+ CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
+ fi
+else
+ enable_pc_files=no
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_ENABLE_RPATH version: 2 updated: 2010/03/27 18:39:42 dnl CF_ENABLE_RPATH version: 2 updated: 2010/03/27 18:39:42
dnl --------------- dnl ---------------
dnl Check if the rpath option should be used, setting cache variable dnl Check if the rpath option should be used, setting cache variable
@@ -1137,6 +1328,37 @@ AC_ARG_ENABLE(rpath,
AC_MSG_RESULT($cf_cv_enable_rpath) AC_MSG_RESULT($cf_cv_enable_rpath)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
+dnl CF_ENABLE_STRING_HACKS version: 3 updated: 2013/01/26 16:26:12
+dnl ----------------------
+dnl On a few platforms, the compiler and/or loader nags with untruthful
+dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect,
+dnl and implying that most uses of the recommended alternatives are correct.
+dnl
+dnl Factually speaking, no one has actually counted the number of uses of these
+dnl functions versus the total of incorrect uses. Samples of a few thousand
+dnl instances are meaningless compared to the hundreds of millions of lines of
+dnl existing C code.
+dnl
+dnl strlcat/strlcpy are (as of 2012) non-standard, and are available on some
+dnl platforms, in implementations of varying quality. Likewise, snprintf is
+dnl standard - but evolved through phases, and older implementations are likely
+dnl to yield surprising results, as documented in manpages on various systems.
+AC_DEFUN([CF_ENABLE_STRING_HACKS],
+[
+AC_MSG_CHECKING(if you want to work around bogus compiler/loader warnings)
+AC_ARG_ENABLE(string-hacks,
+ [ --enable-string-hacks work around bogus compiler/loader warnings],
+ [with_string_hacks=$enableval],
+ [with_string_hacks=no])
+AC_MSG_RESULT($with_string_hacks)
+
+if test "x$with_string_hacks" = "xyes"; then
+ AC_DEFINE(USE_STRING_HACKS,1,[Define to 1 to work around bogus compiler/loader warnings])
+ AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings)
+ AC_CHECK_FUNCS( strlcat strlcpy snprintf )
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_ERRNO version: 5 updated: 1997/11/30 12:44:39 dnl CF_ERRNO version: 5 updated: 1997/11/30 12:44:39
dnl -------- dnl --------
dnl Check if 'errno' is declared in <errno.h> dnl Check if 'errno' is declared in <errno.h>
@@ -1145,7 +1367,7 @@ AC_DEFUN([CF_ERRNO],
CF_CHECK_ERRNO(errno) CF_CHECK_ERRNO(errno)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_ETIP_DEFINES version: 3 updated: 2003/03/22 19:13:43+dnl CF_ETIP_DEFINES version: 5 updated: 2012/02/18 17:51:07
dnl --------------- dnl ---------------
dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between
dnl math.h and builtin.h, only for ncurses dnl math.h and builtin.h, only for ncurses
@@ -1154,11 +1376,17 @@ AC_DEFUN([CF_ETIP_DEFINES],
AC_MSG_CHECKING(for special defines needed for etip.h) AC_MSG_CHECKING(for special defines needed for etip.h)
cf_save_CXXFLAGS="$CXXFLAGS" cf_save_CXXFLAGS="$CXXFLAGS"
cf_result="none" cf_result="none"
+
+# etip.h includes ncurses.h which includes ncurses_dll.h
+# But ncurses_dll.h is generated - fix here.
+test -d include || mkdir include
+test -f include/ncurses_dll.h || sed -e 's/@NCURSES_WRAP_PREFIX@/'$NCURSES_WRAP_PREFIX'/g' ${srcdir}/include/ncurses_dll.h.in >include/ncurses_dll.h
+
for cf_math in "" MATH_H for cf_math in "" MATH_H
do do
for cf_excp in "" MATH_EXCEPTION for cf_excp in "" MATH_EXCEPTION
do do
- CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -I${srcdir}/include"+ CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -Iinclude -I${srcdir}/include"
test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
AC_TRY_COMPILE([ AC_TRY_COMPILE([
@@ -1167,7 +1395,7 @@ AC_TRY_COMPILE([
test -n "$cf_math" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_math}) test -n "$cf_math" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_math})
test -n "$cf_excp" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_excp}) test -n "$cf_excp" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_excp})
cf_result="$cf_math $cf_excp" cf_result="$cf_math $cf_excp"
- break+ break 2
],[]) ],[])
done done
done done
@@ -1305,7 +1533,35 @@ ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5])
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_DLSYM version: 2 updated: 2010/05/29 16:31:02+dnl CF_FIXUP_ADAFLAGS version: 1 updated: 2012/03/31 18:48:10
+dnl -----------------
+dnl make ADAFLAGS consistent with CFLAGS
+AC_DEFUN([CF_FIXUP_ADAFLAGS],[
+ AC_MSG_CHECKING(optimization options for ADAFLAGS)
+ case "$CFLAGS" in
+ *-g*)
+ CF_ADD_ADAFLAGS(-g)
+ ;;
+ esac
+ case "$CFLAGS" in
+ *-O*)
+ cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[[ ]].*//'`
+ CF_ADD_ADAFLAGS($cf_O_flag)
+ ;;
+ esac
+ AC_MSG_RESULT($ADAFLAGS)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_FORGET_TOOL version: 1 updated: 2013/04/06 18:03:09
+dnl --------------
+dnl Forget that we saw the given tool.
+AC_DEFUN([CF_FORGET_TOOL],[
+unset ac_cv_prog_ac_ct_$1
+unset ac_ct_$1
+unset $1
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_FUNC_DLSYM version: 3 updated: 2012/10/06 11:17:15
dnl ------------- dnl -------------
dnl Test for dlsym() and related functions, as well as libdl. dnl Test for dlsym() and related functions, as well as libdl.
dnl dnl
@@ -1332,7 +1588,7 @@ if test "$cf_have_dlsym" = yes ; then
dlclose(obj); dlclose(obj);
} }
}],[ }],[
- AC_DEFINE(HAVE_LIBDL)],[+ AC_DEFINE(HAVE_LIBDL,1,[Define to 1 if we have dl library])],[
AC_MSG_ERROR(Cannot link test program for libdl)]) AC_MSG_ERROR(Cannot link test program for libdl)])
AC_MSG_RESULT(ok) AC_MSG_RESULT(ok)
else else
@@ -1340,7 +1596,7 @@ else
fi fi
]) ])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_MEMMOVE version: 7 updated: 2006/12/16 12:33:30+dnl CF_FUNC_MEMMOVE version: 8 updated: 2012/10/04 20:12:20
dnl --------------- dnl ---------------
dnl Check for memmove, or a bcopy that can handle overlapping copy. If neither dnl Check for memmove, or a bcopy that can handle overlapping copy. If neither
dnl is found, add our own version of memmove to the list of objects. dnl is found, add our own version of memmove to the list of objects.
@@ -1365,13 +1621,13 @@ int main() {
]) ])
],[cf_cv_good_bcopy=no]) ],[cf_cv_good_bcopy=no])
if test "$cf_cv_good_bcopy" = yes ; then if test "$cf_cv_good_bcopy" = yes ; then
- AC_DEFINE(USE_OK_BCOPY)+ AC_DEFINE(USE_OK_BCOPY,1,[Define to 1 to use bcopy when memmove is unavailable])
else else
- AC_DEFINE(USE_MY_MEMMOVE)+ AC_DEFINE(USE_MY_MEMMOVE,1,[Define to 1 to use replacement function when memmove is unavailable])
fi fi
])])dnl ])])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_NANOSLEEP version: 3 updated: 2006/12/16 12:33:30+dnl CF_FUNC_NANOSLEEP version: 4 updated: 2012/10/06 17:56:13
dnl ----------------- dnl -----------------
dnl Check for existence of workable nanosleep() function. Some systems, e.g., dnl Check for existence of workable nanosleep() function. Some systems, e.g.,
dnl AIX 4.x, provide a non-working version. dnl AIX 4.x, provide a non-working version.
@@ -1402,7 +1658,7 @@ int main() {
[cf_cv_func_nanosleep=no], [cf_cv_func_nanosleep=no],
[cf_cv_func_nanosleep=unknown])]) [cf_cv_func_nanosleep=unknown])])
-test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP)+test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP,1,[Define to 1 if we have nanosleep()])
]) ])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_FUNC_OPENPTY version: 3 updated: 2010/05/29 16:31:02 dnl CF_FUNC_OPENPTY version: 3 updated: 2010/05/29 16:31:02
@@ -1433,14 +1689,17 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
]) ])
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_POLL version: 4 updated: 2006/12/16 12:33:30+dnl CF_FUNC_POLL version: 8 updated: 2012/10/04 05:24:07
dnl ------------ dnl ------------
dnl See if the poll function really works. Some platforms have poll(), but dnl See if the poll function really works. Some platforms have poll(), but
dnl it does not work for terminals or files. dnl it does not work for terminals or files.
AC_DEFUN([CF_FUNC_POLL],[ AC_DEFUN([CF_FUNC_POLL],[
AC_CACHE_CHECK(if poll really works,cf_cv_working_poll,[ AC_CACHE_CHECK(if poll really works,cf_cv_working_poll,[
AC_TRY_RUN([ AC_TRY_RUN([
+#include <stdlib.h>
#include <stdio.h> #include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
#ifdef HAVE_POLL_H #ifdef HAVE_POLL_H
#include <poll.h> #include <poll.h>
#else #else
@@ -1450,19 +1709,42 @@ int main() {
struct pollfd myfds; struct pollfd myfds;
int ret; int ret;
- myfds.fd = 0;+ /* check for Darwin bug with respect to "devices" */
+ myfds.fd = open("/dev/null", 1); /* O_WRONLY */
+ if (myfds.fd < 0)
+ myfds.fd = 0;
myfds.events = POLLIN; myfds.events = POLLIN;
+ myfds.revents = 0;
ret = poll(&myfds, 1, 100); ret = poll(&myfds, 1, 100);
- ${cf_cv_main_return:-return}(ret != 0);+
+ if (ret < 0 || (myfds.revents & POLLNVAL)) {
+ ret = -1;
+ } else {
+ int fd = 0;
+ if (!isatty(fd)) {
+ fd = open("/dev/tty", 2); /* O_RDWR */
+ }
+
+ if (fd >= 0) {
+ /* also check with standard input */
+ myfds.fd = fd;
+ myfds.events = POLLIN;
+ myfds.revents = 0;
+ ret = poll(&myfds, 1, 100);
+ } else {
+ ret = -1;
+ }
+ }
+ ${cf_cv_main_return:-return}(ret < 0);
}], }],
[cf_cv_working_poll=yes], [cf_cv_working_poll=yes],
[cf_cv_working_poll=no], [cf_cv_working_poll=no],
[cf_cv_working_poll=unknown])]) [cf_cv_working_poll=unknown])])
-test "$cf_cv_working_poll" = "yes" && AC_DEFINE(HAVE_WORKING_POLL)+test "$cf_cv_working_poll" = "yes" && AC_DEFINE(HAVE_WORKING_POLL,1,[Define to 1 if the poll function seems to work])
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_TERMIOS version: 2 updated: 2000/07/22 23:37:24+dnl CF_FUNC_TERMIOS version: 3 updated: 2012/10/06 17:56:13
dnl --------------- dnl ---------------
dnl Some old/broken variations define tcgetattr() only as a macro in dnl Some old/broken variations define tcgetattr() only as a macro in
dnl termio(s).h dnl termio(s).h
@@ -1488,10 +1770,10 @@ TTY foo;
tcgetattr(1, &foo);], tcgetattr(1, &foo);],
[cf_cv_have_tcgetattr=yes], [cf_cv_have_tcgetattr=yes],
[cf_cv_have_tcgetattr=no])]) [cf_cv_have_tcgetattr=no])])
-test "$cf_cv_have_tcgetattr" = yes && AC_DEFINE(HAVE_TCGETATTR)+test "$cf_cv_have_tcgetattr" = yes && AC_DEFINE(HAVE_TCGETATTR,1,[Define to 1 if we have tcgetattr])
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_VSSCANF version: 3 updated: 2001/12/19 00:50:10+dnl CF_FUNC_VSSCANF version: 4 updated: 2012/10/06 17:56:13
dnl --------------- dnl ---------------
dnl Check for vsscanf() function, which is in c9x but generally not in earlier dnl Check for vsscanf() function, which is in c9x but generally not in earlier
dnl versions of C. It is in the GNU C library, and can often be simulated by dnl versions of C. It is in the GNU C library, and can often be simulated by
@@ -1529,14 +1811,14 @@ AC_TRY_LINK([
cf_cv_func_vsscanf=no])])])]) cf_cv_func_vsscanf=no])])])])
case $cf_cv_func_vsscanf in #(vi case $cf_cv_func_vsscanf in #(vi
-vsscanf) AC_DEFINE(HAVE_VSSCANF);; #(vi+vsscanf) AC_DEFINE(HAVE_VSSCANF,1,[Define to 1 if we have vsscanf]);; #(vi
-vfscanf) AC_DEFINE(HAVE_VFSCANF);; #(vi+vfscanf) AC_DEFINE(HAVE_VFSCANF,1,[Define to 1 if we have vfscanf]);; #(vi
-_doscan) AC_DEFINE(HAVE__DOSCAN);;+_doscan) AC_DEFINE(HAVE__DOSCAN,1,[Define to 1 if we have _doscan]);;
esac esac
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32+dnl CF_GCC_ATTRIBUTES version: 16 updated: 2012/10/02 20:55:03
dnl ----------------- dnl -----------------
dnl Test for availability of useful gcc __attribute__ directives to quiet dnl Test for availability of useful gcc __attribute__ directives to quiet
dnl compiler warnings. Though useful, not all are supported -- and contrary dnl compiler warnings. Though useful, not all are supported -- and contrary
@@ -1614,27 +1896,27 @@ EOF
test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute) test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
cat conftest.h >>confdefs.h cat conftest.h >>confdefs.h
case $cf_attribute in #(vi case $cf_attribute in #(vi
+ noreturn) #(vi
+ AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
+ ;;
printf) #(vi printf) #(vi
- if test "$cf_printf_attribute" = no ; then+ cf_value='/* nothing */'
- cat >>confdefs.h <<EOF+ if test "$cf_printf_attribute" != no ; then
-#define GCC_PRINTFLIKE(fmt,var) /* nothing */+ cf_value='__attribute__((format(printf,fmt,var)))'
-EOF+ AC_DEFINE(GCC_PRINTF,1,[Define to 1 if the compiler supports gcc-like printf attribute.])
- else
- cat >>confdefs.h <<EOF
-#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
-EOF
fi fi
+ AC_DEFINE_UNQUOTED(GCC_PRINTFLIKE(fmt,var),$cf_value,[Define to printf-attribute for gcc])
;; ;;
scanf) #(vi scanf) #(vi
- if test "$cf_scanf_attribute" = no ; then+ cf_value='/* nothing */'
- cat >>confdefs.h <<EOF+ if test "$cf_scanf_attribute" != no ; then
-#define GCC_SCANFLIKE(fmt,var) /* nothing */+ cf_value='__attribute__((format(scanf,fmt,var)))'
-EOF+ AC_DEFINE(GCC_SCANF,1,[Define to 1 if the compiler supports gcc-like scanf attribute.])
- else
- cat >>confdefs.h <<EOF
-#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var)))
-EOF
fi fi
+ AC_DEFINE_UNQUOTED(GCC_SCANFLIKE(fmt,var),$cf_value,[Define to sscanf-attribute for gcc])
+ ;;
+ unused) #(vi
+ AC_DEFINE_UNQUOTED(GCC_UNUSED,$cf_directive,[Define to unused-attribute for gcc])
;; ;;
esac esac
fi fi
@@ -1646,7 +1928,7 @@ rm -rf conftest*
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_GCC_VERSION version: 5 updated: 2010/04/24 11:02:31+dnl CF_GCC_VERSION version: 7 updated: 2012/10/18 06:46:33
dnl -------------- dnl --------------
dnl Find version of gcc dnl Find version of gcc
AC_DEFUN([CF_GCC_VERSION],[ AC_DEFUN([CF_GCC_VERSION],[
@@ -1654,13 +1936,13 @@ AC_REQUIRE([AC_PROG_CC])
GCC_VERSION=none GCC_VERSION=none
if test "$GCC" = yes ; then if test "$GCC" = yes ; then
AC_MSG_CHECKING(version of $CC) AC_MSG_CHECKING(version of $CC)
- GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"+ GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[[^)]]*) //' -e 's/^.*(Debian[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
test -z "$GCC_VERSION" && GCC_VERSION=unknown test -z "$GCC_VERSION" && GCC_VERSION=unknown
AC_MSG_RESULT($GCC_VERSION) AC_MSG_RESULT($GCC_VERSION)
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32+dnl CF_GCC_WARNINGS version: 31 updated: 2013/11/19 19:23:35
dnl --------------- dnl ---------------
dnl Check if the compiler supports useful warning options. There's a few that dnl Check if the compiler supports useful warning options. There's a few that
dnl we don't use, simply because they're too noisy: dnl we don't use, simply because they're too noisy:
@@ -1683,6 +1965,7 @@ AC_DEFUN([CF_GCC_WARNINGS],
[ [
AC_REQUIRE([CF_GCC_VERSION]) AC_REQUIRE([CF_GCC_VERSION])
CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
+CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line __oline__ "${as_me:-configure}" #line __oline__ "${as_me:-configure}"
@@ -1731,10 +2014,14 @@ then
EXTRA_CFLAGS= EXTRA_CFLAGS=
cf_warn_CONST="" cf_warn_CONST=""
test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
+ cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs"
+ test "x$CLANG_COMPILER" = xyes && cf_gcc_warnings=
for cf_opt in W Wall \ for cf_opt in W Wall \
Wbad-function-cast \ Wbad-function-cast \
Wcast-align \ Wcast-align \
Wcast-qual \ Wcast-qual \
+ Wdeclaration-after-statement \
+ Wextra \
Winline \ Winline \
Wmissing-declarations \ Wmissing-declarations \
Wmissing-prototypes \ Wmissing-prototypes \
@@ -1742,7 +2029,7 @@ then
Wpointer-arith \ Wpointer-arith \
Wshadow \ Wshadow \
Wstrict-prototypes \ Wstrict-prototypes \
- Wundef $cf_warn_CONST $1+ Wundef $cf_gcc_warnings $cf_warn_CONST $1
do do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
if AC_TRY_EVAL(ac_compile); then if AC_TRY_EVAL(ac_compile); then
@@ -1758,6 +2045,13 @@ then
continue;; continue;;
esac esac
;; ;;
+ Wpointer-arith) #(vi
+ case $GCC_VERSION in
+ [[12]].*)
+ CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
+ continue;;
+ esac
+ ;;
esac esac
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
fi fi
@@ -1769,6 +2063,29 @@ rm -rf conftest*
AC_SUBST(EXTRA_CFLAGS) AC_SUBST(EXTRA_CFLAGS)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
+dnl CF_GETOPT_HEADER version: 5 updated: 2012/10/06 16:39:58
+dnl ----------------
+dnl Check for getopt's variables which are commonly defined in stdlib.h,
+dnl unistd.h or (nonstandard) in getopt.h
+AC_DEFUN([CF_GETOPT_HEADER],
+[
+AC_HAVE_HEADERS(unistd.h getopt.h)
+AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[
+cf_cv_getopt_header=none
+for cf_header in stdio.h stdlib.h unistd.h getopt.h
+do
+AC_TRY_COMPILE([
+#include <$cf_header>],
+[int x = optind; char *y = optarg],
+[cf_cv_getopt_header=$cf_header
+ break])
+done
+])
+if test $cf_cv_getopt_header != none ; then
+ AC_DEFINE(HAVE_GETOPT_HEADER,1,[Define to 1 if we need to include getopt.h])
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_GNAT_GENERICS version: 2 updated: 2011/03/23 20:24:41 dnl CF_GNAT_GENERICS version: 2 updated: 2011/03/23 20:24:41
dnl ---------------- dnl ----------------
AC_DEFUN([CF_GNAT_GENERICS], AC_DEFUN([CF_GNAT_GENERICS],
@@ -1828,7 +2145,7 @@ fi
AC_SUBST(PRAGMA_UNREF) AC_SUBST(PRAGMA_UNREF)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_GNAT_PROJECTS version: 2 updated: 2011/03/23 20:24:41+dnl CF_GNAT_PROJECTS version: 4 updated: 2013/09/07 14:05:46
dnl ---------------- dnl ----------------
dnl GNAT projects are configured with ".gpr" project files. dnl GNAT projects are configured with ".gpr" project files.
dnl GNAT libraries are a further development, using the project feature. dnl GNAT libraries are a further development, using the project feature.
@@ -1845,7 +2162,7 @@ case $cf_gnat_version in #(vi
;; ;;
*) *)
case $cf_cv_system_name in #(vi case $cf_cv_system_name in #(vi
- cygwin*) #(vi+ cygwin*|msys*) #(vi
;; ;;
*) *)
mkdir conftest.src conftest.bin conftest.lib mkdir conftest.src conftest.bin conftest.lib
@@ -2040,7 +2357,7 @@ fi
rm -rf conftest* *~conftest* rm -rf conftest* *~conftest*
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_GNAT_VERSION version: 17 updated: 2011/03/23 20:24:41+dnl CF_GNAT_VERSION version: 18 updated: 2012/01/21 19:28:10
dnl --------------- dnl ---------------
dnl Verify version of GNAT. dnl Verify version of GNAT.
AC_DEFUN([CF_GNAT_VERSION], AC_DEFUN([CF_GNAT_VERSION],
@@ -2052,7 +2369,7 @@ cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
AC_MSG_RESULT($cf_gnat_version) AC_MSG_RESULT($cf_gnat_version)
case $cf_gnat_version in #(vi case $cf_gnat_version in #(vi
-3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*) #(vi+3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]]) #(vi
cf_cv_prog_gnat_correct=yes cf_cv_prog_gnat_correct=yes
;; ;;
*) *)
@@ -2092,7 +2409,7 @@ make an error
test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_GPP_LIBRARY version: 10 updated: 2010/05/29 16:31:02+dnl CF_GPP_LIBRARY version: 11 updated: 2012/10/06 17:56:13
dnl -------------- dnl --------------
dnl If we're trying to use g++, test if libg++ is installed (a rather common dnl If we're trying to use g++, test if libg++ is installed (a rather common
dnl problem :-). If we have the compiler but no library, we'll be able to dnl problem :-). If we have the compiler but no library, we'll be able to
@@ -2119,9 +2436,9 @@ if test "$GXX" = yes; then
[cf_cxx_library=yes [cf_cxx_library=yes
CF_ADD_LIB($cf_gpp_libname,CXXLIBS) CF_ADD_LIB($cf_gpp_libname,CXXLIBS)
if test "$cf_gpp_libname" = cpp ; then if test "$cf_gpp_libname" = cpp ; then
- AC_DEFINE(HAVE_GPP_BUILTIN_H)+ AC_DEFINE(HAVE_GPP_BUILTIN_H,1,[Define to 1 if we have gpp builtin.h])
else else
- AC_DEFINE(HAVE_GXX_BUILTIN_H)+ AC_DEFINE(HAVE_GXX_BUILTIN_H,1,[Define to 1 if we have g++ builtin.h])
fi], fi],
[AC_TRY_LINK([ [AC_TRY_LINK([
#include <builtin.h> #include <builtin.h>
@@ -2129,28 +2446,28 @@ if test "$GXX" = yes; then
[two_arg_error_handler_t foo2 = lib_error_handler], [two_arg_error_handler_t foo2 = lib_error_handler],
[cf_cxx_library=yes [cf_cxx_library=yes
CF_ADD_LIB($cf_gpp_libname,CXXLIBS) CF_ADD_LIB($cf_gpp_libname,CXXLIBS)
- AC_DEFINE(HAVE_BUILTIN_H)],+ AC_DEFINE(HAVE_BUILTIN_H,1,[Define to 1 if we have builtin.h])],
[cf_cxx_library=no])]) [cf_cxx_library=no])])
LIBS="$cf_save" LIBS="$cf_save"
AC_MSG_RESULT($cf_cxx_library) AC_MSG_RESULT($cf_cxx_library)
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_GXX_VERSION version: 6 updated: 2010/10/23 15:44:18+dnl CF_GXX_VERSION version: 7 updated: 2012/06/16 14:55:39
dnl -------------- dnl --------------
dnl Check for version of g++ dnl Check for version of g++
AC_DEFUN([CF_GXX_VERSION],[ AC_DEFUN([CF_GXX_VERSION],[
AC_REQUIRE([AC_PROG_CPP]) AC_REQUIRE([AC_PROG_CPP])
GXX_VERSION=none GXX_VERSION=none
if test "$GXX" = yes; then if test "$GXX" = yes; then
- AC_MSG_CHECKING(version of g++)+ AC_MSG_CHECKING(version of ${CXX:-g++})
GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
test -z "$GXX_VERSION" && GXX_VERSION=unknown test -z "$GXX_VERSION" && GXX_VERSION=unknown
AC_MSG_RESULT($GXX_VERSION) AC_MSG_RESULT($GXX_VERSION)
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_GXX_WARNINGS version: 6 updated: 2010/08/14 18:25:37+dnl CF_GXX_WARNINGS version: 8 updated: 2013/11/16 14:27:53
dnl --------------- dnl ---------------
dnl Check if the compiler supports useful warning options. dnl Check if the compiler supports useful warning options.
dnl dnl
@@ -2173,6 +2490,7 @@ AC_DEFUN([CF_GXX_WARNINGS],
[ [
CF_INTEL_COMPILER(GXX,INTEL_CPLUSPLUS,CXXFLAGS) CF_INTEL_COMPILER(GXX,INTEL_CPLUSPLUS,CXXFLAGS)
+CF_CLANG_COMPILER(GXX,CLANG_CPLUSPLUS,CXXFLAGS)
AC_REQUIRE([CF_GXX_VERSION]) AC_REQUIRE([CF_GXX_VERSION])
@@ -2238,16 +2556,17 @@ then
for cf_opt in \ for cf_opt in \
Wabi \ Wabi \
fabi-version=0 \ fabi-version=0 \
+ Wextra \
+ Wignored-qualifiers \
+ Wlogical-op \
Woverloaded-virtual \ Woverloaded-virtual \
Wsign-promo \ Wsign-promo \
Wsynth \ Wsynth \
Wold-style-cast \ Wold-style-cast \
Wcast-align \ Wcast-align \
Wcast-qual \ Wcast-qual \
- Wmissing-prototypes \
Wpointer-arith \ Wpointer-arith \
Wshadow \ Wshadow \
- Wstrict-prototypes \
Wundef $cf_gxx_extra_warnings $1 Wundef $cf_gxx_extra_warnings $1
do do
CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
@@ -2464,7 +2783,7 @@ AC_DEFUN([CF_HELP_MESSAGE],
[AC_DIVERT_HELP([$1])dnl [AC_DIVERT_HELP([$1])dnl
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_INCLUDE_DIRS version: 6 updated: 2009/01/06 19:37:40+dnl CF_INCLUDE_DIRS version: 8 updated: 2013/10/12 16:45:09
dnl --------------- dnl ---------------
dnl Construct the list of include-options according to whether we're building dnl Construct the list of include-options according to whether we're building
dnl in the source directory or using '--srcdir=DIR' option. If we're building dnl in the source directory or using '--srcdir=DIR' option. If we're building
@@ -2472,25 +2791,25 @@ dnl with gcc, don't append the includedir if it happens to be /usr/include,
dnl since that usually breaks gcc's shadow-includes. dnl since that usually breaks gcc's shadow-includes.
AC_DEFUN([CF_INCLUDE_DIRS], AC_DEFUN([CF_INCLUDE_DIRS],
[ [
-CPPFLAGS="$CPPFLAGS -I. -I../include"
-if test "$srcdir" != "."; then
- CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
-fi
if test "$GCC" != yes; then if test "$GCC" != yes; then
- CPPFLAGS="$CPPFLAGS -I\${includedir}"+ CPPFLAGS="-I\${includedir} $CPPFLAGS"
elif test "$includedir" != "/usr/include"; then elif test "$includedir" != "/usr/include"; then
if test "$includedir" = '${prefix}/include' ; then if test "$includedir" = '${prefix}/include' ; then
- if test $prefix != /usr ; then+ if test x$prefix != x/usr ; then
- CPPFLAGS="$CPPFLAGS -I\${includedir}"+ CPPFLAGS="-I\${includedir} $CPPFLAGS"
fi fi
else else
- CPPFLAGS="$CPPFLAGS -I\${includedir}"+ CPPFLAGS="-I\${includedir} $CPPFLAGS"
fi fi
fi fi
+if test "$srcdir" != "."; then
+ CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
+fi
+CPPFLAGS="-I. -I../include $CPPFLAGS"
AC_SUBST(CPPFLAGS) AC_SUBST(CPPFLAGS)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_INTEL_COMPILER version: 4 updated: 2010/05/26 05:38:42+dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05
dnl ----------------- dnl -----------------
dnl Check if the given compiler is really the Intel compiler for Linux. It dnl Check if the given compiler is really the Intel compiler for Linux. It
dnl tries to imitate gcc, but does not return an error when it finds a mismatch dnl tries to imitate gcc, but does not return an error when it finds a mismatch
@@ -2504,6 +2823,7 @@ dnl $1 = GCC (default) or GXX
dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
dnl $3 = CFLAGS (default) or CXXFLAGS dnl $3 = CFLAGS (default) or CXXFLAGS
AC_DEFUN([CF_INTEL_COMPILER],[ AC_DEFUN([CF_INTEL_COMPILER],[
+AC_REQUIRE([AC_CANONICAL_HOST])
ifelse([$2],,INTEL_COMPILER,[$2])=no ifelse([$2],,INTEL_COMPILER,[$2])=no
if test "$ifelse([$1],,[$1],GCC)" = yes ; then if test "$ifelse([$1],,[$1],GCC)" = yes ; then
@@ -2527,7 +2847,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_ISASCII version: 3 updated: 2000/08/12 23:18:52+dnl CF_ISASCII version: 4 updated: 2012/10/06 17:56:13
dnl ---------- dnl ----------
dnl Check if we have either a function or macro for 'isascii()'. dnl Check if we have either a function or macro for 'isascii()'.
AC_DEFUN([CF_ISASCII], AC_DEFUN([CF_ISASCII],
@@ -2539,10 +2859,10 @@ AC_CACHE_VAL(cf_cv_have_isascii,[
[cf_cv_have_isascii=no]) [cf_cv_have_isascii=no])
])dnl ])dnl
AC_MSG_RESULT($cf_cv_have_isascii) AC_MSG_RESULT($cf_cv_have_isascii)
-test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII)+test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII,1,[Define to 1 if we have isascii()])
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_LARGEFILE version: 7 updated: 2007/06/02 11:58:50+dnl CF_LARGEFILE version: 8 updated: 2012/10/06 08:57:51
dnl ------------ dnl ------------
dnl Add checks for large file support. dnl Add checks for large file support.
AC_DEFUN([CF_LARGEFILE],[ AC_DEFUN([CF_LARGEFILE],[
@@ -2576,12 +2896,12 @@ ifdef([AC_FUNC_FSEEKO],[
[cf_cv_struct_dirent64=yes], [cf_cv_struct_dirent64=yes],
[cf_cv_struct_dirent64=no]) [cf_cv_struct_dirent64=no])
]) ])
- test "$cf_cv_struct_dirent64" = yes && AC_DEFINE(HAVE_STRUCT_DIRENT64)+ test "$cf_cv_struct_dirent64" = yes && AC_DEFINE(HAVE_STRUCT_DIRENT64,1,[Define to 1 if we have struct dirent64])
fi fi
]) ])
]) ])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_LDFLAGS_STATIC version: 8 updated: 2010/10/23 14:39:56+dnl CF_LDFLAGS_STATIC version: 10 updated: 2011/09/24 12:51:48
dnl ----------------- dnl -----------------
dnl Check for compiler/linker flags used to temporarily force usage of static dnl Check for compiler/linker flags used to temporarily force usage of static
dnl libraries. This depends on the compiler and platform. Use this to help dnl libraries. This depends on the compiler and platform. Use this to help
@@ -2602,7 +2922,7 @@ if test "$GCC" = yes ; then
esac esac
else else
case $cf_cv_system_name in #( case $cf_cv_system_name in #(
- aix[[456]]*) #( from ld manpage+ aix[[4-7]]*) #( from ld manpage
LDFLAGS_STATIC=-bstatic LDFLAGS_STATIC=-bstatic
LDFLAGS_SHARED=-bdynamic LDFLAGS_SHARED=-bdynamic
;; ;;
@@ -2652,7 +2972,17 @@ EOF
int cf_ldflags_static(FILE *fp); int cf_ldflags_static(FILE *fp);
],[ ],[
return cf_ldflags_static(stdin); return cf_ldflags_static(stdin);
-],[cf_ldflags_static=yes],[cf_ldflags_static=no])+],[
+ # some linkers simply ignore the -dynamic
+ case x`file conftest$ac_exeext 2>/dev/null` in #(vi
+ *static*) # (vi
+ cf_ldflags_static=no
+ ;;
+ *)
+ cf_ldflags_static=yes
+ ;;
+ esac
+],[cf_ldflags_static=no])
rm -f libconftest.* rm -f libconftest.*
LIBS="$cf_save_LIBS" LIBS="$cf_save_LIBS"
@@ -2673,7 +3003,7 @@ AC_SUBST(LDFLAGS_STATIC)
AC_SUBST(LDFLAGS_SHARED) AC_SUBST(LDFLAGS_SHARED)
]) ])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_LD_RPATH_OPT version: 3 updated: 2010/06/02 05:03:05+dnl CF_LD_RPATH_OPT version: 5 updated: 2011/07/17 14:48:41
dnl --------------- dnl ---------------
dnl For the given system and compiler, find the compiler flags to pass to the dnl For the given system and compiler, find the compiler flags to pass to the
dnl loader to use the "rpath" feature. dnl loader to use the "rpath" feature.
@@ -2694,10 +3024,10 @@ irix*) #(vi
linux*|gnu*|k*bsd*-gnu) #(vi linux*|gnu*|k*bsd*-gnu) #(vi
LD_RPATH_OPT="-Wl,-rpath," LD_RPATH_OPT="-Wl,-rpath,"
;; ;;
-openbsd[[2-9]].*) #(vi+openbsd[[2-9]].*|mirbsd*) #(vi
LD_RPATH_OPT="-Wl,-rpath," LD_RPATH_OPT="-Wl,-rpath,"
;; ;;
-freebsd*) #(vi+dragonfly*|freebsd*) #(vi
LD_RPATH_OPT="-rpath " LD_RPATH_OPT="-rpath "
;; ;;
netbsd*) #(vi netbsd*) #(vi
@@ -2756,11 +3086,23 @@ CF_SUBDIR_PATH($1,$2,lib)
$1="$cf_library_path_list [$]$1" $1="$cf_library_path_list [$]$1"
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16+dnl CF_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09
+dnl ------------------
+AC_DEFUN([CF_LIBTOOL_VERSION],[
+if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+then
+ cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
+else
+ cf_cv_libtool_version=
+fi
+test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_LIB_PREFIX version: 9 updated: 2012/01/21 19:28:10
dnl ------------- dnl -------------
dnl Compute the library-prefix for the given host system dnl Compute the library-prefix for the given host system
dnl $1 = variable to set dnl $1 = variable to set
-AC_DEFUN([CF_LIB_PREFIX],+define([CF_LIB_PREFIX],
[ [
case $cf_cv_system_name in #(vi case $cf_cv_system_name in #(vi
OS/2*|os2*) #(vi OS/2*|os2*) #(vi
@@ -2773,11 +3115,11 @@ ifelse($1,,,[$1=$LIB_PREFIX])
AC_SUBST(LIB_PREFIX) AC_SUBST(LIB_PREFIX)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 61 updated: 2010/10/23 16:10:30+dnl CF_LIB_RULES version: 74 updated: 2013/09/07 13:54:05
dnl ------------ dnl ------------
dnl Append definitions and rules for the given models to the subdirectory dnl Append definitions and rules for the given models to the subdirectory
dnl Makefiles, and the recursion rule for the top-level Makefile. If the dnl Makefiles, and the recursion rule for the top-level Makefile. If the
-dnl subdirectory is a library-source directory, modify the LIBS_TO_MAKE list in+dnl subdirectory is a library-source directory, modify the Libs_To_Make list in
dnl the corresponding makefile to list the models that we'll generate. dnl the corresponding makefile to list the models that we'll generate.
dnl dnl
dnl For shared libraries, make a list of symbolic links to construct when dnl For shared libraries, make a list of symbolic links to construct when
@@ -2786,15 +3128,19 @@ dnl one:
dnl lib<name>.so -> dnl lib<name>.so ->
dnl lib<name>.so.<major> -> dnl lib<name>.so.<major> ->
dnl lib<name>.so.<maj>.<minor> dnl lib<name>.so.<maj>.<minor>
+dnl
+dnl Note: Libs_To_Make is mixed case, since it is not a pure autoconf variable.
AC_DEFUN([CF_LIB_RULES], AC_DEFUN([CF_LIB_RULES],
[ [
-CF_LIB_PREFIX(cf_prefix)+cf_prefix=$LIB_PREFIX
AC_REQUIRE([CF_SUBST_NCURSES_VERSION]) AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
-if test $cf_cv_shlib_version = cygdll ; then+case $cf_cv_shlib_version in #(vi
+cygdll|msysdll|mingw)
TINFO_NAME=$TINFO_ARG_SUFFIX TINFO_NAME=$TINFO_ARG_SUFFIX
TINFO_SUFFIX=.dll TINFO_SUFFIX=.dll
-fi+ ;;
+esac
if test -n "$TINFO_SUFFIX" ; then if test -n "$TINFO_SUFFIX" ; then
case $TINFO_SUFFIX in case $TINFO_SUFFIX in
@@ -2820,79 +3166,78 @@ do
elif test -f $srcdir/$cf_dir/modules; then elif test -f $srcdir/$cf_dir/modules; then
SHARED_LIB= SHARED_LIB=
- LIBS_TO_MAKE=+ Libs_To_Make=
for cf_item in $cf_LIST_MODELS for cf_item in $cf_LIST_MODELS
do do
CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf) CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
+ cf_libname=$cf_dir
+ test "$cf_dir" = c++ && cf_libname=ncurses++
if test $cf_item = shared ; then if test $cf_item = shared ; then
- if test "$cf_cv_do_symlinks" = yes ; then+ if test -n "${LIB_SUFFIX}"
- case "$cf_cv_shlib_version" in #(vi+ then
- rel) #(vi+ cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${LIB_SUFFIX}"'//'`
- case "$cf_cv_system_name" in #(vi+ else
- darwin*)+ cf_shared_suffix="$cf_suffix"
- case .${LIB_SUFFIX} in+ fi
- .tw*)+ if test "$cf_cv_do_symlinks" = yes ; then
- cf_suffix=`echo $cf_suffix | sed 's/^tw//'`+ cf_version_name=
- cf_suffix=tw'.${REL_VERSION}'"$cf_suffix"+
- ;;+ case "$cf_cv_shlib_version" in #(vi
- .t*)+ rel) #(vi
- cf_suffix=`echo $cf_suffix | sed 's/^t//'`+ cf_version_name=REL_VERSION
- cf_suffix=t'.${REL_VERSION}'"$cf_suffix"
- ;;
- .w*)
- cf_suffix=`echo $cf_suffix | sed 's/^w//'`
- cf_suffix=w'.${REL_VERSION}'"$cf_suffix"
;; ;;
- *)+ abi)
- cf_suffix='.${REL_VERSION}'"$cf_suffix"+ cf_version_name=ABI_VERSION
;; ;;
esac esac
- ;; #(vi+
- *) cf_suffix="$cf_suffix"'.${REL_VERSION}' ;;+ if test -n "$cf_version_name"
- esac+ then
+ case "$cf_cv_system_name" in #(vi
+ darwin*)
+ # "w", etc?
+ cf_suffix="${LIB_SUFFIX}"'.${'$cf_version_name'}'"$cf_shared_suffix"
+ ;; #(vi
+ *)
+ cf_suffix="$cf_suffix"'.${'$cf_version_name'}'
+ ;;
+ esac
+ fi
+ if test -n "${LIB_SUFFIX}"
+ then
+ cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${LIB_SUFFIX}"'//'`
+ else
+ cf_shared_suffix="$cf_suffix"
+ fi
+ fi
+ # cygwin needs import library, and has unique naming convention
+ # use autodetected ${cf_prefix} for import lib and static lib, but
+ # use 'cyg' prefix for shared lib.
+ case $cf_cv_shlib_version in #(vi
+ cygdll) #(vi
+ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
+ Libs_To_Make="$Libs_To_Make ../lib/cyg${cf_libname}${cf_cygsuf}"
+ continue
;; ;;
- abi)+ msysdll) #(vi
- case "$cf_cv_system_name" in #(vi+ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
- darwin*)+ Libs_To_Make="$Libs_To_Make ../lib/msys-${cf_libname}${cf_cygsuf}"
- case .${LIB_SUFFIX} in+ continue
- .tw*)+ ;;
- cf_suffix=`echo $cf_suffix | sed 's/^tw//'`+ mingw)
- cf_suffix=tw'.${ABI_VERSION}'"$cf_suffix"+ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
- ;;+ Libs_To_Make="$Libs_To_Make ../lib/lib${cf_libname}${cf_cygsuf}"
- .t*)+ continue
- cf_suffix=`echo $cf_suffix | sed 's/^t//'`
- cf_suffix=t'.${ABI_VERSION}'"$cf_suffix"
- ;;
- .w*)
- cf_suffix=`echo $cf_suffix | sed 's/^w//'`
- cf_suffix=w'.${ABI_VERSION}'"$cf_suffix"
- ;;
- *)
- cf_suffix='.${ABI_VERSION}'"$cf_suffix"
- ;;
- esac
- ;; #(vi
- *) cf_suffix="$cf_suffix"'.${ABI_VERSION}' ;;
- esac
;; ;;
esac esac
fi fi
- # cygwin needs import library, and has unique naming convention+ Libs_To_Make="$Libs_To_Make ../lib/${cf_prefix}${cf_libname}${cf_suffix}"
- # use autodetected ${cf_prefix} for import lib and static lib, but
- # use 'cyg' prefix for shared lib.
- if test $cf_cv_shlib_version = cygdll ; then
- cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
- LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}${cf_cygsuf}"
- continue
- fi
- fi
- LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/${cf_prefix}${cf_dir}${cf_suffix}"
done done
if test $cf_dir = ncurses ; then if test $cf_dir = ncurses ; then
cf_subsets="$LIB_SUBSETS" cf_subsets="$LIB_SUBSETS"
cf_r_parts="$cf_subsets" cf_r_parts="$cf_subsets"
- cf_liblist="$LIBS_TO_MAKE"+ cf_liblist="$Libs_To_Make"
while test -n "$cf_r_parts" while test -n "$cf_r_parts"
do do
@@ -2912,7 +3257,7 @@ do
;; ;;
esac esac
if test -n "$cf_item"; then if test -n "$cf_item"; then
- LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"+ Libs_To_Make="$cf_item $Libs_To_Make"
fi fi
else else
break break
@@ -2922,13 +3267,40 @@ do
cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'` cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'`
fi fi
- sed -e "s%@LIBS_TO_MAKE@%$LIBS_TO_MAKE%" \+ if test $cf_dir = c++; then
+ if test "x$with_shared_cxx" != xyes && test -n "$cf_shared_suffix"; then
+ cf_list=
+ for cf_item in $Libs_To_Make
+ do
+ case $cf_item in
+ *.a)
+ ;;
+ *)
+ cf_item=`echo "$cf_item" | sed -e "s,"$cf_shared_suffix",.a,"`
+ ;;
+ esac
+ for cf_test in $cf_list
+ do
+ if test "$cf_test" = "$cf_item"
+ then
+ cf_LIST_MODELS=`echo "$cf_LIST_MODELS" | sed -e 's/normal//'`
+ cf_item=
+ break
+ fi
+ done
+ test -n "$cf_item" && cf_list="$cf_list $cf_item"
+ done
+ Libs_To_Make="$cf_list"
+ fi
+ fi
+
+ sed -e "s%@Libs_To_Make@%$Libs_To_Make%" \
-e "s%@SHARED_LIB@%$SHARED_LIB%" \ -e "s%@SHARED_LIB@%$SHARED_LIB%" \
$cf_dir/Makefile >$cf_dir/Makefile.out $cf_dir/Makefile >$cf_dir/Makefile.out
mv $cf_dir/Makefile.out $cf_dir/Makefile mv $cf_dir/Makefile.out $cf_dir/Makefile
$AWK -f $srcdir/mk-0th.awk \ $AWK -f $srcdir/mk-0th.awk \
- libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" \+ libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" ticlib="$TICS_LIB_SUFFIX" termlib="$TINFO_LIB_SUFFIX" \
$srcdir/$cf_dir/modules >>$cf_dir/Makefile $srcdir/$cf_dir/modules >>$cf_dir/Makefile
for cf_subset in $cf_subsets for cf_subset in $cf_subsets
@@ -2936,8 +3308,23 @@ do
cf_subdirs= cf_subdirs=
for cf_item in $cf_LIST_MODELS for cf_item in $cf_LIST_MODELS
do do
+
echo "Appending rules for ${cf_item} model (${cf_dir}: ${cf_subset})" echo "Appending rules for ${cf_item} model (${cf_dir}: ${cf_subset})"
CF_UPPER(cf_ITEM,$cf_item) CF_UPPER(cf_ITEM,$cf_item)
+
+ CXX_MODEL=$cf_ITEM
+ if test "$CXX_MODEL" = SHARED; then
+ case $cf_cv_shlib_version in #(vi
+ cygdll|msysdll|mingw) #(vi
+ test "x$with_shared_cxx" = xno && CF_VERBOSE(overriding CXX_MODEL to SHARED)
+ with_shared_cxx=yes
+ ;;
+ *)
+ test "x$with_shared_cxx" = xno && CXX_MODEL=NORMAL
+ ;;
+ esac
+ fi
+
CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf) CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
CF_OBJ_SUBDIR($cf_item,cf_subdir) CF_OBJ_SUBDIR($cf_item,cf_subdir)
@@ -2955,6 +3342,8 @@ do
cf_libname=$TICS_LIB_SUFFIX cf_libname=$TICS_LIB_SUFFIX
;; ;;
esac esac
+ elif test $cf_dir = c++ ; then
+ cf_libname=ncurses++$LIB_SUFFIX
else else
cf_libname=${cf_libname}$LIB_SUFFIX cf_libname=${cf_libname}$LIB_SUFFIX
fi fi
@@ -3006,10 +3395,12 @@ do
name=${cf_libname}${cf_dir_suffix} \ name=${cf_libname}${cf_dir_suffix} \
traces=$LIB_TRACING \ traces=$LIB_TRACING \
MODEL=$cf_ITEM \ MODEL=$cf_ITEM \
+ CXX_MODEL=$CXX_MODEL \
model=$cf_subdir \ model=$cf_subdir \
prefix=$cf_prefix \ prefix=$cf_prefix \
suffix=$cf_suffix \ suffix=$cf_suffix \
subset=$cf_subset \ subset=$cf_subset \
+ driver=$cf_cv_term_driver \
SymLink="$LN_S" \ SymLink="$LN_S" \
TermlibRoot=$TINFO_NAME \ TermlibRoot=$TINFO_NAME \
TermlibSuffix=$TINFO_SUFFIX \ TermlibSuffix=$TINFO_SUFFIX \
@@ -3048,7 +3439,7 @@ do
done done
fi fi
- echo ' cd '$cf_dir' && ${MAKE} ${CF_MFLAGS} [$]@' >>Makefile+ echo ' cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} [$]@' >>Makefile
done done
for cf_dir in $SRC_SUBDIRS for cf_dir in $SRC_SUBDIRS
@@ -3063,7 +3454,7 @@ do
echo 'libs \' >> Makefile echo 'libs \' >> Makefile
echo 'install.libs \' >> Makefile echo 'install.libs \' >> Makefile
echo 'uninstall.libs ::' >> Makefile echo 'uninstall.libs ::' >> Makefile
- echo ' cd '$cf_dir' && ${MAKE} ${CF_MFLAGS} [$]@' >> Makefile+ echo ' cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} [$]@' >> Makefile
;; ;;
esac esac
fi fi
@@ -3086,7 +3477,7 @@ install.libs \\
uninstall.libs \\ uninstall.libs \\
install.$cf_dir \\ install.$cf_dir \\
uninstall.$cf_dir :: uninstall.$cf_dir ::
- cd $cf_dir && \${MAKE} \${CF_MFLAGS} \[$]@+ cd $cf_dir && \${MAKE} \${TOP_MFLAGS} \[$]@
CF_EOF CF_EOF
elif test -f $srcdir/$cf_dir/headers; then elif test -f $srcdir/$cf_dir/headers; then
cat >> Makefile <<CF_EOF cat >> Makefile <<CF_EOF
@@ -3096,24 +3487,26 @@ install.libs \\
uninstall.libs \\ uninstall.libs \\
install.includes \\ install.includes \\
uninstall.includes :: uninstall.includes ::
- cd $cf_dir && \${MAKE} \${CF_MFLAGS} \[$]@+ cd $cf_dir && \${MAKE} \${TOP_MFLAGS} \[$]@
CF_EOF CF_EOF
fi fi
done done
+if test "x$cf_with_db_install" = xyes; then
cat >> Makefile <<CF_EOF cat >> Makefile <<CF_EOF
install.libs uninstall.libs \\ install.libs uninstall.libs \\
install.data uninstall.data :: install.data uninstall.data ::
-$MAKE_TERMINFO cd misc && \${MAKE} \${CF_MFLAGS} \[$]@+$MAKE_TERMINFO cd misc && \${MAKE} \${TOP_MFLAGS} \[$]@
CF_EOF CF_EOF
+fi
if test "x$cf_with_manpages" = xyes; then if test "x$cf_with_manpages" = xyes; then
cat >> Makefile <<CF_EOF cat >> Makefile <<CF_EOF
install.man \\ install.man \\
uninstall.man :: uninstall.man ::
- cd man && \${MAKE} \${CF_MFLAGS} \[$]@+ cd man && \${MAKE} \${TOP_MFLAGS} \[$]@
CF_EOF CF_EOF
fi fi
@@ -3134,7 +3527,7 @@ cat >> Makefile <<CF_EOF
install.man \\ install.man \\
uninstall.man :: uninstall.man ::
- cd tack && \${MAKE} \${CF_MFLAGS} \[$]@+ cd tack && \${MAKE} \${TOP_MFLAGS} \[$]@
CF_EOF CF_EOF
fi fi
fi fi
@@ -3252,7 +3645,7 @@ CF_EOF
fi fi
fi fi
done done
-AC_SUBST(LIBS_TO_MAKE)+AC_SUBST(Libs_To_Make)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_LIB_SONAME version: 5 updated: 2010/08/14 18:25:37 dnl CF_LIB_SONAME version: 5 updated: 2010/08/14 18:25:37
@@ -3292,7 +3685,7 @@ fi
]) ])
]) ])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03+dnl CF_LIB_SUFFIX version: 22 updated: 2013/09/07 13:54:05
dnl ------------- dnl -------------
dnl Compute the library file-suffix from the given model name dnl Compute the library file-suffix from the given model name
dnl $1 = model name dnl $1 = model name
@@ -3301,31 +3694,26 @@ dnl $3 = dependency variable to set (actual filename)
dnl The variable $LIB_SUFFIX, if set, prepends the variable to set. dnl The variable $LIB_SUFFIX, if set, prepends the variable to set.
AC_DEFUN([CF_LIB_SUFFIX], AC_DEFUN([CF_LIB_SUFFIX],
[ [
- AC_REQUIRE([CF_SUBST_NCURSES_VERSION])+ case X$1 in #(vi
- case $1 in #(vi+ Xlibtool) #(vi
- libtool) #(vi
$2='.la' $2='.la'
$3=[$]$2 $3=[$]$2
;; ;;
- normal) #(vi+ Xdebug) #(vi
- $2='.a'
- $3=[$]$2
- ;;
- debug) #(vi
$2='_g.a' $2='_g.a'
$3=[$]$2 $3=[$]$2
;; ;;
- profile) #(vi+ Xprofile) #(vi
$2='_p.a' $2='_p.a'
$3=[$]$2 $3=[$]$2
;; ;;
- shared) #(vi+ Xshared) #(vi
case $cf_cv_system_name in case $cf_cv_system_name in
- aix[[56]]*) #(vi+ aix[[5-7]]*) #(vi
$2='.a' $2='.a'
$3=[$]$2 $3=[$]$2
;; ;;
- cygwin*) #(vi+ cygwin*|msys*|mingw*) #(vi
$2='.dll' $2='.dll'
$3='.dll.a' $3='.dll.a'
;; ;;
@@ -3345,10 +3733,16 @@ AC_DEFUN([CF_LIB_SUFFIX],
;; ;;
esac esac
;; ;;
- *) $2='.so'+ *) #(vi
+ $2='.so'
$3=[$]$2 $3=[$]$2
;; ;;
esac esac
+ ;;
+ *)
+ $2='.a'
+ $3=[$]$2
+ ;;
esac esac
test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}" test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
test -n "$LIB_SUFFIX" && $3="${LIB_SUFFIX}[$]{$3}" test -n "$LIB_SUFFIX" && $3="${LIB_SUFFIX}[$]{$3}"
@@ -3372,7 +3766,7 @@ AC_DEFUN([CF_LIB_TYPE],
test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}" test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_LINK_DATAONLY version: 9 updated: 2009/01/01 20:21:38+dnl CF_LINK_DATAONLY version: 10 updated: 2012/10/06 17:41:51
dnl ---------------- dnl ----------------
dnl Some systems have a non-ANSI linker that doesn't pull in modules that have dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
dnl only data (i.e., no functions), for example NeXT. On those systems we'll dnl only data (i.e., no functions), for example NeXT. On those systems we'll
@@ -3429,13 +3823,13 @@ EOF
AC_MSG_RESULT($cf_cv_link_dataonly) AC_MSG_RESULT($cf_cv_link_dataonly)
if test "$cf_cv_link_dataonly" = no ; then if test "$cf_cv_link_dataonly" = no ; then
- AC_DEFINE(BROKEN_LINKER)+ AC_DEFINE(BROKEN_LINKER,1,[if data-only library module does not link])
BROKEN_LINKER=1 BROKEN_LINKER=1
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_LINK_FUNCS version: 7 updated: 2006/12/16 12:33:30+dnl CF_LINK_FUNCS version: 8 updated: 2012/10/06 17:56:13
dnl ------------- dnl -------------
dnl Most Unix systems have both link and symlink, a few don't have symlink. dnl Most Unix systems have both link and symlink, a few don't have symlink.
dnl A few non-Unix systems implement symlink, but not link. dnl A few non-Unix systems implement symlink, but not link.
@@ -3487,23 +3881,11 @@ int main()
done done
test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
]) ])
- test "$ac_cv_func_link" = yes && AC_DEFINE(HAVE_LINK)+ test "$ac_cv_func_link" = yes && AC_DEFINE(HAVE_LINK,1,[Define to 1 if we have link() function])
- test "$ac_cv_func_symlink" = yes && AC_DEFINE(HAVE_SYMLINK)+ test "$ac_cv_func_symlink" = yes && AC_DEFINE(HAVE_SYMLINK,1,[Define to 1 if we have symlink() function])
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_MAIN_RETURN version: 1 updated: 2006/12/10 09:51:54
-dnl --------------
-dnl Check if a return from main to the shell actually returns the same exit
-dnl code. This is true for almost any POSIX environment.
-dnl
-dnl Some very old environments did not flush stdout, etc., on an exit. That
-dnl would be a useful case to test for also.
-AC_DEFUN([CF_MAIN_RETURN],
-[
-cf_cv_main_return=return
-])dnl
-dnl ---------------------------------------------------------------------------
dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46 dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46
dnl ------------ dnl ------------
dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make' dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
@@ -3799,7 +4181,7 @@ AC_ARG_WITH(manpage-tbl,
AC_MSG_RESULT($MANPAGE_TBL) AC_MSG_RESULT($MANPAGE_TBL)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 39 updated: 2010/10/23 15:44:18+dnl CF_MAN_PAGES version: 43 updated: 2013/02/09 12:53:45
dnl ------------ dnl ------------
dnl Try to determine if the man-pages on the system are compressed, and if dnl Try to determine if the man-pages on the system are compressed, and if
dnl so, what format is used. Use this information to construct a script that dnl so, what format is used. Use this information to construct a script that
@@ -3856,6 +4238,7 @@ cat >$cf_edit_man <<CF_EOF
# this script is generated by the configure-script CF_MAN_PAGES macro. # this script is generated by the configure-script CF_MAN_PAGES macro.
prefix="$cf_prefix" prefix="$cf_prefix"
+datarootdir="$datarootdir"
datadir="$datadir" datadir="$datadir"
NCURSES_MAJOR="$NCURSES_MAJOR" NCURSES_MAJOR="$NCURSES_MAJOR"
@@ -3916,11 +4299,12 @@ case \$i in #(vi
if test ! -f $cf_man_alias ; then if test ! -f $cf_man_alias ; then
cat >>$cf_man_alias <<-CF_EOF2 cat >>$cf_man_alias <<-CF_EOF2
s,@DATADIR@,\$datadir,g s,@DATADIR@,\$datadir,g
- s,@TERMINFO@,\$TERMINFO,g+ s,@TERMINFO@,\${TERMINFO:="no default value"},g
- s,@NCURSES_MAJOR@,\$NCURSES_MAJOR,g+ s,@TERMINFO_DIRS@,\${TERMINFO_DIRS:="no default value"},g
- s,@NCURSES_MINOR@,\$NCURSES_MINOR,g+ s,@NCURSES_MAJOR@,\${NCURSES_MAJOR:="no default value"},g
- s,@NCURSES_PATCH@,\$NCURSES_PATCH,g+ s,@NCURSES_MINOR@,\${NCURSES_MINOR:="no default value"},g
- s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g+ s,@NCURSES_PATCH@,\${NCURSES_PATCH:="no default value"},g
+ s,@NCURSES_OSPEED@,\${NCURSES_OSPEED:="no default value"},g
CF_EOF CF_EOF
ifelse($1,,,[ ifelse($1,,,[
for cf_name in $1 for cf_name in $1
@@ -3949,7 +4333,9 @@ CF_EOF
if test "$MANPAGE_ALIASES" != no ; then if test "$MANPAGE_ALIASES" != no ; then
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
- aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u\`+ nCurses=ignore.3x
+ test $with_curses_h = yes && nCurses=ncurses.3x
+ aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u; test \$inalias = \$nCurses && echo curses\`
CF_EOF CF_EOF
fi fi
@@ -3995,6 +4381,13 @@ if test \$cf_tables = yes ; then
fi fi
CF_EOF CF_EOF
+if test $with_overwrite != yes ; then
+cat >>$cf_edit_man <<CF_EOF
+ sed -e "/\#[ ]*include/s,<curses.h,<ncurses$LIB_SUFFIX/curses.h," < \$TMP >\$TMP.out
+ mv \$TMP.out \$TMP
+CF_EOF
+fi
+
if test $with_curses_h != yes ; then if test $with_curses_h != yes ; then
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
sed -e "/\#[ ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out sed -e "/\#[ ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out
@@ -4154,7 +4547,7 @@ ifelse($1,,[
fi fi
]) ])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_MIXEDCASE_FILENAMES version: 3 updated: 2003/09/20 17:07:55+dnl CF_MIXEDCASE_FILENAMES version: 6 updated: 2013/10/08 17:47:05
dnl ---------------------- dnl ----------------------
dnl Check if the file-system supports mixed-case filenames. If we're able to dnl Check if the file-system supports mixed-case filenames. If we're able to
dnl create a lowercase name and see it as uppercase, it doesn't support that. dnl create a lowercase name and see it as uppercase, it doesn't support that.
@@ -4163,7 +4556,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES],
AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[ AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
if test "$cross_compiling" = yes ; then if test "$cross_compiling" = yes ; then
case $target_alias in #(vi case $target_alias in #(vi
- *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi+ *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) #(vi
cf_cv_mixedcase=no cf_cv_mixedcase=no
;; ;;
*) *)
@@ -4181,10 +4574,10 @@ else
rm -f conftest CONFTEST rm -f conftest CONFTEST
fi fi
]) ])
-test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)+test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37+dnl CF_MKSTEMP version: 9 updated: 2012/10/03 04:34:49
dnl ---------- dnl ----------
dnl Check for a working mkstemp. This creates two files, checks that they are dnl Check for a working mkstemp. This creates two files, checks that they are
dnl successfully created and distinct (AmigaOS apparently fails on the last). dnl successfully created and distinct (AmigaOS apparently fails on the last).
@@ -4226,11 +4619,13 @@ int main()
} }
],[cf_cv_func_mkstemp=yes ],[cf_cv_func_mkstemp=yes
],[cf_cv_func_mkstemp=no ],[cf_cv_func_mkstemp=no
-],[AC_CHECK_FUNC(mkstemp)+],[cf_cv_func_mkstemp=maybe])
-])
]) ])
+if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+ AC_CHECK_FUNC(mkstemp)
+fi
if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
- AC_DEFINE(HAVE_MKSTEMP)+ AC_DEFINE(HAVE_MKSTEMP,1,[Define to 1 if mkstemp() is available and working.])
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@@ -4258,14 +4653,14 @@ if test "${with_abi_version+set}" != set; then
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_NO_LEAKS_OPTION version: 4 updated: 2006/12/16 14:24:05+dnl CF_NO_LEAKS_OPTION version: 5 updated: 2012/10/02 20:55:03
dnl ------------------ dnl ------------------
dnl see CF_WITH_NO_LEAKS dnl see CF_WITH_NO_LEAKS
AC_DEFUN([CF_NO_LEAKS_OPTION],[ AC_DEFUN([CF_NO_LEAKS_OPTION],[
AC_MSG_CHECKING(if you want to use $1 for testing) AC_MSG_CHECKING(if you want to use $1 for testing)
AC_ARG_WITH($1, AC_ARG_WITH($1,
[$2], [$2],
- [AC_DEFINE($3)ifelse([$4],,[+ [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[
$4 $4
]) ])
: ${with_cflags:=-g} : ${with_cflags:=-g}
@@ -4306,7 +4701,7 @@ else
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_OBJ_SUBDIR version: 4 updated: 2002/02/23 20:38:31+dnl CF_OBJ_SUBDIR version: 6 updated: 2013/09/07 14:06:10
dnl ------------- dnl -------------
dnl Compute the object-directory name from the given model name dnl Compute the object-directory name from the given model name
AC_DEFUN([CF_OBJ_SUBDIR], AC_DEFUN([CF_OBJ_SUBDIR],
@@ -4318,7 +4713,7 @@ AC_DEFUN([CF_OBJ_SUBDIR],
profile) $2='obj_p' ;; profile) $2='obj_p' ;;
shared) shared)
case $cf_cv_system_name in #(vi case $cf_cv_system_name in #(vi
- cygwin) #(vi+ cygwin|msys) #(vi
$2='objects' ;; $2='objects' ;;
*) *)
$2='obj_s' ;; $2='obj_s' ;;
@@ -4326,20 +4721,23 @@ AC_DEFUN([CF_OBJ_SUBDIR],
esac esac
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_PATHSEP version: 5 updated: 2010/05/26 05:38:42+dnl CF_PATHSEP version: 6 updated: 2012/09/29 18:38:12
dnl ---------- dnl ----------
-dnl Provide a value for the $PATH and similar separator+dnl Provide a value for the $PATH and similar separator (or amend the value
+dnl as provided in autoconf 2.5x).
AC_DEFUN([CF_PATHSEP], AC_DEFUN([CF_PATHSEP],
[ [
+ AC_MSG_CHECKING(for PATH separator)
case $cf_cv_system_name in case $cf_cv_system_name in
os2*) PATH_SEPARATOR=';' ;; os2*) PATH_SEPARATOR=';' ;;
- *) PATH_SEPARATOR=':' ;;+ *) ${PATH_SEPARATOR:=':'} ;;
esac esac
ifelse([$1],,,[$1=$PATH_SEPARATOR]) ifelse([$1],,,[$1=$PATH_SEPARATOR])
AC_SUBST(PATH_SEPARATOR) AC_SUBST(PATH_SEPARATOR)
+ AC_MSG_RESULT($PATH_SEPARATOR)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42+dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54
dnl -------------- dnl --------------
dnl Check the argument to see that it looks like a pathname. Rewrite it if it dnl Check the argument to see that it looks like a pathname. Rewrite it if it
dnl begins with one of the prefix/exec_prefix variables, and then again if the dnl begins with one of the prefix/exec_prefix variables, and then again if the
@@ -4359,7 +4757,7 @@ case ".[$]$1" in #(vi
;; ;;
.[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX
;; ;;
-.\[$]{*prefix}*) #(vi+.\[$]{*prefix}*|.\[$]{*dir}*) #(vi
eval $1="[$]$1" eval $1="[$]$1"
case ".[$]$1" in #(vi case ".[$]$1" in #(vi
.NONE/*) .NONE/*)
@@ -4376,7 +4774,7 @@ case ".[$]$1" in #(vi
esac esac
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_PKG_CONFIG version: 4 updated: 2011/02/18 20:26:24+dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22
dnl ------------- dnl -------------
dnl Check for the package-config program, unless disabled by command-line. dnl Check for the package-config program, unless disabled by command-line.
AC_DEFUN([CF_PKG_CONFIG], AC_DEFUN([CF_PKG_CONFIG],
@@ -4393,7 +4791,9 @@ no) #(vi
PKG_CONFIG=none PKG_CONFIG=none
;; ;;
yes) #(vi yes) #(vi
- AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)+ CF_ACVERSION_CHECK(2.52,
+ [AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)],
+ [AC_PATH_PROG(PKG_CONFIG, pkg-config, none)])
;; ;;
*) *)
PKG_CONFIG=$withval PKG_CONFIG=$withval
@@ -4554,6 +4954,19 @@ AC_PROG_AWK
test -z "$AWK" && AC_MSG_ERROR(No awk program found) test -z "$AWK" && AC_MSG_ERROR(No awk program found)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
+dnl CF_PROG_CC version: 3 updated: 2012/10/06 15:31:55
+dnl ----------
+dnl standard check for CC, plus followup sanity checks
+dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
+AC_DEFUN([CF_PROG_CC],[
+ifelse($1,,[AC_PROG_CC],[AC_PROG_CC($1)])
+CF_GCC_VERSION
+CF_ACVERSION_CHECK(2.52,
+ [AC_PROG_CC_STDC],
+ [CF_ANSI_CC_REQD])
+CF_CC_ENV_FLAGS
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_PROG_CC_C_O version: 3 updated: 2010/08/14 18:25:37 dnl CF_PROG_CC_C_O version: 3 updated: 2010/08/14 18:25:37
dnl -------------- dnl --------------
dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that
@@ -4593,31 +5006,6 @@ else
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_PROG_CC_U_D version: 1 updated: 2005/07/14 16:59:30
-dnl --------------
-dnl Check if C (preprocessor) -U and -D options are processed in the order
-dnl given rather than by type of option. Some compilers insist on apply all
-dnl of the -U options after all of the -D options. Others allow mixing them,
-dnl and may predefine symbols that conflict with those we define.
-AC_DEFUN([CF_PROG_CC_U_D],
-[
-AC_CACHE_CHECK(if $CC -U and -D options work together,cf_cv_cc_u_d_options,[
- cf_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
- AC_TRY_COMPILE([],[
-#ifndef U_D_OPTIONS
-make an undefined-error
-#endif
-#ifdef D_U_OPTIONS
-make a defined-error
-#endif
- ],[
- cf_cv_cc_u_d_options=yes],[
- cf_cv_cc_u_d_options=no])
- CPPFLAGS="$cf_save_CPPFLAGS"
-])
-])dnl
-dnl ---------------------------------------------------------------------------
dnl CF_PROG_EGREP version: 1 updated: 2006/09/16 11:40:59 dnl CF_PROG_EGREP version: 1 updated: 2006/09/16 11:40:59
dnl ------------- dnl -------------
dnl AC_PROG_EGREP was introduced in autoconf 2.53. dnl AC_PROG_EGREP was introduced in autoconf 2.53.
@@ -4633,32 +5021,7 @@ AC_DEFUN([CF_PROG_EGREP],
test -z "$EGREP" && AC_MSG_ERROR(No egrep program found) test -z "$EGREP" && AC_MSG_ERROR(No egrep program found)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_PROG_EXT version: 10 updated: 2004/01/03 19:28:18+dnl CF_PROG_GNAT version: 2 updated: 2011/10/22 14:01:47
-dnl -----------
-dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
-AC_DEFUN([CF_PROG_EXT],
-[
-AC_REQUIRE([CF_CHECK_CACHE])
-case $cf_cv_system_name in
-os2*)
- CFLAGS="$CFLAGS -Zmt"
- CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
- CXXFLAGS="$CXXFLAGS -Zmt"
- # autoconf's macro sets -Zexe and suffix both, which conflict:w
- LDFLAGS="$LDFLAGS -Zmt -Zcrtdll"
- ac_cv_exeext=.exe
- ;;
-esac
-
-AC_EXEEXT
-AC_OBJEXT
-
-PROG_EXT="$EXEEXT"
-AC_SUBST(PROG_EXT)
-test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_PROG_GNAT version: 1 updated: 2010/06/19 15:22:18
dnl ------------ dnl ------------
dnl Check for gnatmake, ensure that it is complete. dnl Check for gnatmake, ensure that it is complete.
AC_DEFUN([CF_PROG_GNAT],[ AC_DEFUN([CF_PROG_GNAT],[
@@ -4666,6 +5029,7 @@ cf_ada_make=gnatmake
AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no) AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no)
if test "$ac_cv_prog_gnat_exists" = no; then if test "$ac_cv_prog_gnat_exists" = no; then
cf_ada_make= cf_ada_make=
+ cf_cv_prog_gnat_correct=no
else else
CF_GNAT_VERSION CF_GNAT_VERSION
AC_CHECK_PROG(M4_exists, m4, yes, no) AC_CHECK_PROG(M4_exists, m4, yes, no)
@@ -4709,7 +5073,7 @@ case $INSTALL in
esac esac
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_PROG_LDCONFIG version: 2 updated: 2008/12/13 14:08:40+dnl CF_PROG_LDCONFIG version: 3 updated: 2011/06/04 20:09:13
dnl ---------------- dnl ----------------
dnl Check for ldconfig, needed to fixup shared libraries that would be built dnl Check for ldconfig, needed to fixup shared libraries that would be built
dnl and then used in the install. dnl and then used in the install.
@@ -4718,7 +5082,7 @@ if test "$cross_compiling" = yes ; then
LDCONFIG=: LDCONFIG=:
else else
case "$cf_cv_system_name" in #(vi case "$cf_cv_system_name" in #(vi
-dragonfly*|freebsd*) #(vi+dragonfly*|mirbsd*|freebsd*) #(vi
test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R" test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R"
;; ;;
*) LDPATH=$PATH:/sbin:/usr/sbin *) LDPATH=$PATH:/sbin:/usr/sbin
@@ -4759,7 +5123,7 @@ AC_MSG_RESULT($cf_prog_ln_sf)
test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_REGEX version: 8 updated: 2010/08/07 14:09:44+dnl CF_REGEX version: 10 updated: 2012/10/04 20:12:20
dnl -------- dnl --------
dnl Attempt to determine if we've got one of the flavors of regular-expression dnl Attempt to determine if we've got one of the flavors of regular-expression
dnl code that we can support. dnl code that we can support.
@@ -4771,7 +5135,7 @@ cf_regex_func=no
cf_regex_libs="regex re" cf_regex_libs="regex re"
case $host_os in #(vi case $host_os in #(vi
mingw*) mingw*)
- cf_regex_libs="regex.dll $cf_regex_libs"+ cf_regex_libs="gnurx $cf_regex_libs"
;; ;;
esac esac
@@ -4833,9 +5197,9 @@ esac
case $cf_cv_regex_hdrs in #(vi case $cf_cv_regex_hdrs in #(vi
no) AC_MSG_WARN(no regular expression header found) ;; #(vi no) AC_MSG_WARN(no regular expression header found) ;; #(vi
- regex.h) AC_DEFINE(HAVE_REGEX_H_FUNCS) ;; #(vi+ regex.h) AC_DEFINE(HAVE_REGEX_H_FUNCS,1,[Define to 1 to include regex.h for regular expressions]) ;; #(vi
- regexp.h) AC_DEFINE(HAVE_REGEXP_H_FUNCS) ;; #(vi+ regexp.h) AC_DEFINE(HAVE_REGEXP_H_FUNCS,1,[Define to 1 to include regexp.h for regular expressions]) ;; #(vi
- regexpr.h) AC_DEFINE(HAVE_REGEXPR_H_FUNCS) ;;+ regexpr.h) AC_DEFINE(HAVE_REGEXPR_H_FUNCS,1,[Define to 1 to include regexpr.h for regular expressions]) ;;
esac esac
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@@ -4869,7 +5233,7 @@ define([CF_REMOVE_LIB],
$1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'` $1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'`
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_RPATH_HACK version: 9 updated: 2011/02/13 13:31:33+dnl CF_RPATH_HACK version: 11 updated: 2013/09/01 13:02:00
dnl ------------- dnl -------------
AC_DEFUN([CF_RPATH_HACK], AC_DEFUN([CF_RPATH_HACK],
[ [
@@ -4886,8 +5250,8 @@ if test -n "$LD_RPATH_OPT" ; then
AC_TRY_LINK([#include <stdio.h>], AC_TRY_LINK([#include <stdio.h>],
[printf("Hello");], [printf("Hello");],
- [cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u`+ [cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
- cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`])+ cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort | uniq`])
# If we passed the link-test, but get a "not found" on a given library, # If we passed the link-test, but get a "not found" on a given library,
# this could be due to inept reconfiguration of gcc to make it only # this could be due to inept reconfiguration of gcc to make it only
@@ -4920,6 +5284,8 @@ AC_TRY_LINK([#include <stdio.h>],
CF_RPATH_HACK_2(LIBS) CF_RPATH_HACK_2(LIBS)
CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS) CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
+else
+ AC_MSG_RESULT(no)
fi fi
AC_SUBST(EXTRA_LDFLAGS) AC_SUBST(EXTRA_LDFLAGS)
])dnl ])dnl
@@ -4984,18 +5350,19 @@ CF_VERBOSE(...checked $1 [$]$1)
AC_SUBST(EXTRA_LDFLAGS) AC_SUBST(EXTRA_LDFLAGS)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 64 updated: 2010/06/05 16:51:16+dnl CF_SHARED_OPTS version: 84 updated: 2013/11/03 06:26:10
dnl -------------- dnl --------------
dnl -------------- dnl --------------
dnl Attempt to determine the appropriate CC/LD options for creating a shared dnl Attempt to determine the appropriate CC/LD options for creating a shared
dnl library. dnl library.
dnl dnl
-dnl Note: ${LOCAL_LDFLAGS} is used to link executables that will run within the+dnl Notes:
-dnl build-tree, i.e., by making use of the libraries that are compiled in ../lib+dnl a) ${LOCAL_LDFLAGS} is used to link executables that will run within
-dnl We avoid compiling-in a ../lib path for the shared library since that can+dnl the build-tree, i.e., by making use of the libraries that are compiled in
-dnl lead to unexpected results at runtime.+dnl $rel_builddir/lib We avoid compiling-in a $rel_builddir/lib path for the
-dnl ${LOCAL_LDFLAGS2} has the same intention but assumes that the shared libraries+dnl shared library since that can lead to unexpected results at runtime.
-dnl are compiled in ../../lib+dnl b) ${LOCAL_LDFLAGS2} has the same intention but assumes that the shared
+dnl libraries are compiled in ../../lib
dnl dnl
dnl The variable 'cf_cv_do_symlinks' is used to control whether we configure dnl The variable 'cf_cv_do_symlinks' is used to control whether we configure
dnl to install symbolic links to the rel/abi versions of shared libraries. dnl to install symbolic links to the rel/abi versions of shared libraries.
@@ -5010,12 +5377,19 @@ dnl
dnl Some loaders leave 'so_locations' lying around. It's nice to clean up. dnl Some loaders leave 'so_locations' lying around. It's nice to clean up.
AC_DEFUN([CF_SHARED_OPTS], AC_DEFUN([CF_SHARED_OPTS],
[ [
- AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
AC_REQUIRE([CF_LD_RPATH_OPT]) AC_REQUIRE([CF_LD_RPATH_OPT])
+ RM_SHARED_OPTS=
LOCAL_LDFLAGS= LOCAL_LDFLAGS=
LOCAL_LDFLAGS2= LOCAL_LDFLAGS2=
LD_SHARED_OPTS= LD_SHARED_OPTS=
INSTALL_LIB="-m 644" INSTALL_LIB="-m 644"
+ : ${rel_builddir:=.}
+
+ shlibdir=$libdir
+ AC_SUBST(shlibdir)
+
+ MAKE_DLLS="#"
+ AC_SUBST(MAKE_DLLS)
cf_cv_do_symlinks=no cf_cv_do_symlinks=no
cf_ld_rpath_opt= cf_ld_rpath_opt=
@@ -5040,6 +5414,7 @@ AC_DEFUN([CF_SHARED_OPTS],
AC_MSG_RESULT($cf_cv_shlib_version) AC_MSG_RESULT($cf_cv_shlib_version)
cf_cv_rm_so_locs=no cf_cv_rm_so_locs=no
+ cf_try_cflags=
# Some less-capable ports of gcc support only -fpic # Some less-capable ports of gcc support only -fpic
CC_SHARED_OPTS= CC_SHARED_OPTS=
@@ -5059,10 +5434,14 @@ AC_DEFUN([CF_SHARED_OPTS],
cf_cv_shlib_version_infix=no cf_cv_shlib_version_infix=no
case $cf_cv_system_name in #(vi case $cf_cv_system_name in #(vi
- aix[[56]]*) #(vi+ aix4.[3-9]*|aix[[5-7]]*) #(vi
if test "$GCC" = yes; then if test "$GCC" = yes; then
CC_SHARED_OPTS= CC_SHARED_OPTS=
- MK_SHARED_LIB='$(CC) -shared'+ MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
+ else
+ # CC_SHARED_OPTS='-qpic=large -G'
+ # perhaps "-bM:SRE -bnoentry -bexpall"
+ MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
fi fi
;; ;;
beos*) #(vi beos*) #(vi
@@ -5070,9 +5449,12 @@ AC_DEFUN([CF_SHARED_OPTS],
;; ;;
cygwin*) #(vi cygwin*) #(vi
CC_SHARED_OPTS= CC_SHARED_OPTS=
- MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
cf_cv_shlib_version=cygdll cf_cv_shlib_version=cygdll
cf_cv_shlib_version_infix=cygdll cf_cv_shlib_version_infix=cygdll
+ shlibdir=$bindir
+ MAKE_DLLS=
cat >mk_shared_lib.sh <<-CF_EOF cat >mk_shared_lib.sh <<-CF_EOF
#!/bin/sh #!/bin/sh
SHARED_LIB=\[$]1 SHARED_LIB=\[$]1
@@ -5083,12 +5465,34 @@ AC_DEFUN([CF_SHARED_OPTS],
** SHARED_LIB \[$]SHARED_LIB ** SHARED_LIB \[$]SHARED_LIB
** IMPORT_LIB \[$]IMPORT_LIB ** IMPORT_LIB \[$]IMPORT_LIB
EOF EOF
- exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}+ exec \[$]* -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
+CF_EOF
+ chmod +x mk_shared_lib.sh
+ ;;
+ msys*) #(vi
+ CC_SHARED_OPTS=
+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
+ cf_cv_shlib_version=msysdll
+ cf_cv_shlib_version_infix=msysdll
+ shlibdir=$bindir
+ MAKE_DLLS=
+ cat >mk_shared_lib.sh <<-CF_EOF
+ #!/bin/sh
+ SHARED_LIB=\[$]1
+ IMPORT_LIB=\`echo "\[$]1" | sed -e 's/msys-/lib/' -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
+ shift
+ cat <<-EOF
+ Linking shared library
+ ** SHARED_LIB \[$]SHARED_LIB
+ ** IMPORT_LIB \[$]IMPORT_LIB
+EOF
+ exec \[$]* -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
CF_EOF CF_EOF
chmod +x mk_shared_lib.sh chmod +x mk_shared_lib.sh
;; ;;
darwin*) #(vi darwin*) #(vi
- EXTRA_CFLAGS="-no-cpp-precomp"+ cf_try_cflags="no-cpp-precomp"
CC_SHARED_OPTS="-dynamic" CC_SHARED_OPTS="-dynamic"
MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]' MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
@@ -5102,6 +5506,14 @@ CF_EOF
LDFLAGS="$LDFLAGS -Wl,-search_paths_first" LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
fi fi
;; ;;
+ hpux[[7-8]]*) #(vi
+ # HP-UX 8.07 ld lacks "+b" option used for libdir search-list
+ if test "$GCC" != yes; then
+ CC_SHARED_OPTS='+Z'
+ fi
+ MK_SHARED_LIB='${LD} -b -o $[@]'
+ INSTALL_LIB="-m 555"
+ ;;
hpux*) #(vi hpux*) #(vi
# (tested with gcc 2.7.2 -- I don't have c89) # (tested with gcc 2.7.2 -- I don't have c89)
if test "$GCC" = yes; then if test "$GCC" = yes; then
@@ -5115,9 +5527,19 @@ CF_EOF
# readonly to exploit a quirk in the memory manager. # readonly to exploit a quirk in the memory manager.
INSTALL_LIB="-m 555" INSTALL_LIB="-m 555"
;; ;;
+ interix*)
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ if test "$cf_cv_shlib_version" = rel; then
+ cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+ else
+ cf_shared_soname='`basename $@`'
+ fi
+ CC_SHARED_OPTS=
+ MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $@'
+ ;;
irix*) #(vi irix*) #(vi
if test "$cf_cv_enable_rpath" = yes ; then if test "$cf_cv_enable_rpath" = yes ; then
- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"+ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
fi fi
# tested with IRIX 5.2 and 'cc'. # tested with IRIX 5.2 and 'cc'.
if test "$GCC" != yes; then if test "$GCC" != yes; then
@@ -5134,18 +5556,45 @@ CF_EOF
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
fi fi
if test "$cf_cv_enable_rpath" = yes ; then if test "$cf_cv_enable_rpath" = yes ; then
- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"+ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
fi fi
CF_SHARED_SONAME CF_SHARED_SONAME
MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]' MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
;; ;;
- openbsd[[2-9]].*) #(vi+ mingw*) #(vi
+ cf_cv_shlib_version=mingw
+ cf_cv_shlib_version_infix=mingw
+ shlibdir=$bindir
+ MAKE_DLLS=
+ if test "$DFT_LWR_MODEL" = "shared" ; then
+ LOCAL_LDFLAGS="-Wl,--enable-auto-import"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ EXTRA_LDFLAGS="-Wl,--enable-auto-import $EXTRA_LDFLAGS"
+ fi
+ CC_SHARED_OPTS=
+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
+ cat >mk_shared_lib.sh <<-CF_EOF
+ #!/bin/sh
+ SHARED_LIB=\[$]1
+ IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
+ shift
+ cat <<-EOF
+ Linking shared library
+ ** SHARED_LIB \[$]SHARED_LIB
+ ** IMPORT_LIB \[$]IMPORT_LIB
+EOF
+ exec \[$]* -shared -Wl,--enable-auto-import,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
+CF_EOF
+ chmod +x mk_shared_lib.sh
+ ;;
+ openbsd[[2-9]].*|mirbsd*) #(vi
if test "$DFT_LWR_MODEL" = "shared" ; then if test "$DFT_LWR_MODEL" = "shared" ; then
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
fi fi
if test "$cf_cv_enable_rpath" = yes ; then if test "$cf_cv_enable_rpath" = yes ; then
- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"+ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
fi fi
CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
CF_SHARED_SONAME CF_SHARED_SONAME
@@ -5156,12 +5605,12 @@ CF_EOF
MK_SHARED_LIB='${LD} -Bshareable -o $[@]' MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
;; ;;
- freebsd*) #(vi+ dragonfly*|freebsd*) #(vi
CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
- LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${libdir} $LOCAL_LDFLAGS"+ LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS"
- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"+ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
fi fi
CF_SHARED_SONAME CF_SHARED_SONAME
MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]' MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]'
@@ -5171,7 +5620,7 @@ CF_EOF
if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"+ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
if test "$cf_cv_shlib_version" = auto; then if test "$cf_cv_shlib_version" = auto; then
if test -f /usr/libexec/ld.elf_so; then if test -f /usr/libexec/ld.elf_so; then
cf_cv_shlib_version=abi cf_cv_shlib_version=abi
@@ -5182,7 +5631,7 @@ CF_EOF
CF_SHARED_SONAME CF_SHARED_SONAME
MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]' MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
else else
- MK_SHARED_LIB='${LD} -shared -Bshareable -o $[@]'+ MK_SHARED_LIB='${CC} -Wl,-shared -Wl,-Bshareable -o $[@]'
fi fi
;; ;;
osf*|mls+*) #(vi osf*|mls+*) #(vi
@@ -5276,20 +5725,57 @@ CF_EOF
;; ;;
esac esac
- if test -n "$cf_ld_rpath_opt" ; then+ if test -n "$cf_try_cflags"
- MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"+ then
+cat > conftest.$ac_ext <<EOF
+#line __oline__ "${as_me:-configure}"
+#include <stdio.h>
+int main(int argc, char *argv[[]])
+{
+ printf("hello\n");
+ return (argv[[argc-1]] == 0) ;
+}
+EOF
+ cf_save_CFLAGS="$CFLAGS"
+ for cf_opt in $cf_try_cflags
+ do
+ CFLAGS="$cf_save_CFLAGS -$cf_opt"
+ AC_MSG_CHECKING(if CFLAGS option -$cf_opt works)
+ if AC_TRY_EVAL(ac_compile); then
+ AC_MSG_RESULT(yes)
+ cf_save_CFLAGS="$CFLAGS"
+ else
+ AC_MSG_RESULT(no)
+ fi
+ done
+ CFLAGS="$cf_save_CFLAGS"
fi fi
+
+ # RPATH_LIST is a colon-separated list of directories
+ test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
+ test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
+
+ test $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations"
+
+ CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS)
+ CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB)
+
AC_SUBST(CC_SHARED_OPTS) AC_SUBST(CC_SHARED_OPTS)
AC_SUBST(LD_RPATH_OPT) AC_SUBST(LD_RPATH_OPT)
AC_SUBST(LD_SHARED_OPTS) AC_SUBST(LD_SHARED_OPTS)
AC_SUBST(MK_SHARED_LIB) AC_SUBST(MK_SHARED_LIB)
+ AC_SUBST(RM_SHARED_OPTS)
+
AC_SUBST(LINK_PROGS) AC_SUBST(LINK_PROGS)
AC_SUBST(LINK_TESTS) AC_SUBST(LINK_TESTS)
+
AC_SUBST(EXTRA_LDFLAGS) AC_SUBST(EXTRA_LDFLAGS)
AC_SUBST(LOCAL_LDFLAGS) AC_SUBST(LOCAL_LDFLAGS)
AC_SUBST(LOCAL_LDFLAGS2) AC_SUBST(LOCAL_LDFLAGS2)
+
AC_SUBST(INSTALL_LIB) AC_SUBST(INSTALL_LIB)
+ AC_SUBST(RPATH_LIST)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43 dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43
@@ -5369,7 +5855,7 @@ done
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_SIG_ATOMIC_T version: 2 updated: 2005/09/18 17:27:12+dnl CF_SIG_ATOMIC_T version: 3 updated: 2012/10/04 20:12:20
dnl --------------- dnl ---------------
dnl signal handler, but there are some gcc depedencies in that recommendation. dnl signal handler, but there are some gcc depedencies in that recommendation.
dnl Try anyway. dnl Try anyway.
@@ -5401,10 +5887,10 @@ static void handler(int sig)
done done
]) ])
AC_MSG_RESULT($cf_cv_sig_atomic_t) AC_MSG_RESULT($cf_cv_sig_atomic_t)
-test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t)+test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t,[Define to signal global datatype])
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_SIZECHANGE version: 8 updated: 2000/11/04 12:22:16+dnl CF_SIZECHANGE version: 9 updated: 2012/10/06 11:17:15
dnl ------------- dnl -------------
dnl Check for definitions & structures needed for window size-changing dnl Check for definitions & structures needed for window size-changing
dnl FIXME: check that this works with "snake" (HP-UX 10.x) dnl FIXME: check that this works with "snake" (HP-UX 10.x)
@@ -5465,7 +5951,7 @@ do
done done
]) ])
if test "$cf_cv_sizechange" != no ; then if test "$cf_cv_sizechange" != no ; then
- AC_DEFINE(HAVE_SIZECHANGE)+ AC_DEFINE(HAVE_SIZECHANGE,1,[Define to 1 if sizechar declarations are provided])
case $cf_cv_sizechange in #(vi case $cf_cv_sizechange in #(vi
NEED*) NEED*)
AC_DEFINE_UNQUOTED($cf_cv_sizechange ) AC_DEFINE_UNQUOTED($cf_cv_sizechange )
@@ -5474,7 +5960,7 @@ if test "$cf_cv_sizechange" != no ; then
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_SRC_MODULES version: 21 updated: 2010/09/04 17:37:40+dnl CF_SRC_MODULES version: 27 updated: 2013/08/03 18:18:08
dnl -------------- dnl --------------
dnl For each parameter, test if the source-directory exists, and if it contains dnl For each parameter, test if the source-directory exists, and if it contains
dnl a 'modules' file. If so, add to the list $cf_cv_src_modules which we'll dnl a 'modules' file. If so, add to the list $cf_cv_src_modules which we'll
@@ -5497,6 +5983,7 @@ else
TEST_ARG2="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARG2" TEST_ARG2="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARG2"
fi fi
+PC_MODULES_TO_MAKE="ncurses${DFT_ARG_SUFFIX}"
cf_cv_src_modules= cf_cv_src_modules=
for cf_dir in $1 for cf_dir in $1
do do
@@ -5535,6 +6022,7 @@ do
TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS" TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS"
TEST_ARG2="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARG2" TEST_ARG2="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARG2"
fi fi
+ PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ${cf_dir}${DFT_ARG_SUFFIX}"
fi fi
fi fi
done done
@@ -5561,11 +6049,21 @@ done
if test "x$cf_with_tests" != "xno" ; then if test "x$cf_with_tests" != "xno" ; then
SRC_SUBDIRS="$SRC_SUBDIRS test" SRC_SUBDIRS="$SRC_SUBDIRS test"
fi fi
-test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc"+if test "x$cf_with_db_install" = xyes; then
-test "$cf_with_cxx_binding" != no && SRC_SUBDIRS="$SRC_SUBDIRS c++"+ test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc"
+fi
+if test "$cf_with_cxx_binding" != no; then
+ PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ncurses++${DFT_ARG_SUFFIX}"
+ SRC_SUBDIRS="$SRC_SUBDIRS c++"
+fi
+
+test "x$with_termlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TINFO_ARG_SUFFIX"
+test "x$with_ticlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TICS_ARG_SUFFIX"
+
+AC_SUBST(PC_MODULES_TO_MAKE)
ADA_SUBDIRS= ADA_SUBDIRS=
-if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then+if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = xyes && test -f $srcdir/Ada95/Makefile.in; then
SRC_SUBDIRS="$SRC_SUBDIRS Ada95" SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
ADA_SUBDIRS="gen src" ADA_SUBDIRS="gen src"
if test "x$cf_with_tests" != "xno" ; then if test "x$cf_with_tests" != "xno" ; then
@@ -5624,13 +6122,13 @@ dnl Remove "-g" option from the compiler options
AC_DEFUN([CF_STRIP_G_OPT], AC_DEFUN([CF_STRIP_G_OPT],
[$1=`echo ${$1} | sed -e 's%-g %%' -e 's%-g$%%'`])dnl [$1=`echo ${$1} | sed -e 's%-g %%' -e 's%-g$%%'`])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_STRUCT_SIGACTION version: 3 updated: 2000/08/12 23:18:52+dnl CF_STRUCT_SIGACTION version: 5 updated: 2012/10/06 17:56:13
dnl ------------------- dnl -------------------
dnl Check if we need _POSIX_SOURCE defined to use struct sigaction. We'll only dnl Check if we need _POSIX_SOURCE defined to use struct sigaction. We'll only
dnl do this if we've found the sigaction function. dnl do this if we've found the sigaction function.
-dnl
-dnl If needed, define SVR4_ACTION.
AC_DEFUN([CF_STRUCT_SIGACTION],[ AC_DEFUN([CF_STRUCT_SIGACTION],[
+AC_REQUIRE([CF_XOPEN_SOURCE])
+
if test "$ac_cv_func_sigaction" = yes; then if test "$ac_cv_func_sigaction" = yes; then
AC_MSG_CHECKING(whether sigaction needs _POSIX_SOURCE) AC_MSG_CHECKING(whether sigaction needs _POSIX_SOURCE)
AC_TRY_COMPILE([ AC_TRY_COMPILE([
@@ -5645,22 +6143,24 @@ AC_TRY_COMPILE([
#include <signal.h>], #include <signal.h>],
[struct sigaction act], [struct sigaction act],
[sigact_bad=yes [sigact_bad=yes
- AC_DEFINE(SVR4_ACTION)],+ AC_DEFINE(_POSIX_SOURCE,1,[Define to 1 if we must define _POSIX_SOURCE])],
[sigact_bad=unknown])]) [sigact_bad=unknown])])
AC_MSG_RESULT($sigact_bad) AC_MSG_RESULT($sigact_bad)
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_STRUCT_TERMIOS version: 5 updated: 2000/11/04 12:22:46+dnl CF_STRUCT_TERMIOS version: 7 updated: 2012/10/06 17:56:13
dnl ----------------- dnl -----------------
dnl Some machines require _POSIX_SOURCE to completely define struct termios. dnl Some machines require _POSIX_SOURCE to completely define struct termios.
-dnl If so, define SVR4_TERMIO
AC_DEFUN([CF_STRUCT_TERMIOS],[ AC_DEFUN([CF_STRUCT_TERMIOS],[
+AC_REQUIRE([CF_XOPEN_SOURCE])
+
AC_CHECK_HEADERS( \ AC_CHECK_HEADERS( \
termio.h \ termio.h \
termios.h \ termios.h \
unistd.h \ unistd.h \
) )
+
if test "$ISC" = yes ; then if test "$ISC" = yes ; then
AC_CHECK_HEADERS( sys/termio.h ) AC_CHECK_HEADERS( sys/termio.h )
fi fi
@@ -5680,7 +6180,7 @@ if test "$ac_cv_header_termios_h" = yes ; then
#include <termios.h>], #include <termios.h>],
[struct termios foo; int x = foo.c_iflag], [struct termios foo; int x = foo.c_iflag],
termios_bad=unknown, termios_bad=unknown,
- termios_bad=yes AC_DEFINE(SVR4_TERMIO))+ termios_bad=yes AC_DEFINE(_POSIX_SOURCE,1,[Define to 1 if we must define _POSIX_SOURCE]))
]) ])
AC_MSG_RESULT($termios_bad) AC_MSG_RESULT($termios_bad)
fi fi
@@ -5704,23 +6204,6 @@ CF_ADD_SUBDIR_PATH($1,$2,$3,/opt,$prefix)
CF_ADD_SUBDIR_PATH($1,$2,$3,[$]HOME,$prefix) CF_ADD_SUBDIR_PATH($1,$2,$3,[$]HOME,$prefix)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_SUBST version: 4 updated: 2006/06/17 12:33:03
-dnl --------
-dnl Shorthand macro for substituting things that the user may override
-dnl with an environment variable.
-dnl
-dnl $1 = long/descriptive name
-dnl $2 = environment variable
-dnl $3 = default value
-AC_DEFUN([CF_SUBST],
-[AC_CACHE_VAL(cf_cv_subst_$2,[
-AC_MSG_CHECKING(for $1 (symbol $2))
-CF_SUBST_IF([-z "[$]$2"], [$2], [$3])
-cf_cv_subst_$2=[$]$2
-AC_MSG_RESULT([$]$2)
-])
-])dnl
-dnl ---------------------------------------------------------------------------
dnl CF_SUBST_IF version: 2 updated: 2006/06/17 12:33:03 dnl CF_SUBST_IF version: 2 updated: 2006/06/17 12:33:03
dnl ----------- dnl -----------
dnl Shorthand macro for substituting things that the user may override dnl Shorthand macro for substituting things that the user may override
@@ -5766,7 +6249,7 @@ AC_SUBST(cf_cv_header_stdbool_h)
AC_SUBST(cf_cv_type_of_bool)dnl AC_SUBST(cf_cv_type_of_bool)dnl
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_SYS_TIME_SELECT version: 4 updated: 2000/10/04 09:18:40+dnl CF_SYS_TIME_SELECT version: 5 updated: 2012/10/04 05:24:07
dnl ------------------ dnl ------------------
dnl Check if we can include <sys/time.h> with <sys/select.h>; this breaks on dnl Check if we can include <sys/time.h> with <sys/select.h>; this breaks on
dnl older SCO configurations. dnl older SCO configurations.
@@ -5786,19 +6269,58 @@ AC_TRY_COMPILE([
[cf_cv_sys_time_select=no]) [cf_cv_sys_time_select=no])
]) ])
AC_MSG_RESULT($cf_cv_sys_time_select) AC_MSG_RESULT($cf_cv_sys_time_select)
-test "$cf_cv_sys_time_select" = yes && AC_DEFINE(HAVE_SYS_TIME_SELECT)+test "$cf_cv_sys_time_select" = yes && AC_DEFINE(HAVE_SYS_TIME_SELECT,1,[Define to 1 if we can include <sys/time.h> with <sys/select.h>])
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_TOP_BUILDDIR version: 1 updated: 2006/10/15 16:33:23+dnl CF_TOP_BUILDDIR version: 2 updated: 2013/07/27 17:38:32
dnl --------------- dnl ---------------
dnl Define a top_builddir symbol, for applications that need an absolute path. dnl Define a top_builddir symbol, for applications that need an absolute path.
AC_DEFUN([CF_TOP_BUILDDIR], AC_DEFUN([CF_TOP_BUILDDIR],
[ [
-top_builddir=`pwd`+top_builddir=ifelse($1,,`pwd`,$1)
AC_SUBST(top_builddir) AC_SUBST(top_builddir)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_TYPEOF_CHTYPE version: 8 updated: 2006/12/16 12:33:30+dnl CF_TRY_XOPEN_SOURCE version: 1 updated: 2011/10/30 17:09:50
+dnl -------------------
+dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we
+dnl can define it successfully.
+AC_DEFUN([CF_TRY_XOPEN_SOURCE],[
+AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
+ AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+],[
+#ifndef _XOPEN_SOURCE
+make an error
+#endif],
+ [cf_cv_xopen_source=no],
+ [cf_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+],[
+#ifdef _XOPEN_SOURCE
+make an error
+#endif],
+ [cf_cv_xopen_source=no],
+ [cf_cv_xopen_source=$cf_XOPEN_SOURCE])
+ CPPFLAGS="$cf_save"
+ ])
+])
+
+if test "$cf_cv_xopen_source" != no ; then
+ CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
+ CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
+ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
+ CF_ADD_CFLAGS($cf_temp_xopen_source)
+fi
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_TYPEOF_CHTYPE version: 9 updated: 2012/10/06 17:56:13
dnl ---------------- dnl ----------------
dnl Determine the type we should use for chtype (and attr_t, which is treated dnl Determine the type we should use for chtype (and attr_t, which is treated
dnl as the same thing). We want around 32 bits, so on most machines want a dnl as the same thing). We want around 32 bits, so on most machines want a
@@ -5847,10 +6369,10 @@ int main()
AC_MSG_RESULT($cf_cv_typeof_chtype) AC_MSG_RESULT($cf_cv_typeof_chtype)
AC_SUBST(cf_cv_typeof_chtype) AC_SUBST(cf_cv_typeof_chtype)
-AC_DEFINE_UNQUOTED(TYPEOF_CHTYPE,$cf_cv_typeof_chtype)+AC_DEFINE_UNQUOTED(TYPEOF_CHTYPE,$cf_cv_typeof_chtype,[Define to actual type if needed for chtype])
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_TYPE_SIGACTION version: 3 updated: 2000/08/12 23:18:52+dnl CF_TYPE_SIGACTION version: 4 updated: 2012/10/06 17:56:13
dnl ----------------- dnl -----------------
dnl dnl
AC_DEFUN([CF_TYPE_SIGACTION], AC_DEFUN([CF_TYPE_SIGACTION],
@@ -5863,7 +6385,7 @@ AC_CACHE_VAL(cf_cv_type_sigaction,[
[cf_cv_type_sigaction=yes], [cf_cv_type_sigaction=yes],
[cf_cv_type_sigaction=no])]) [cf_cv_type_sigaction=no])])
AC_MSG_RESULT($cf_cv_type_sigaction) AC_MSG_RESULT($cf_cv_type_sigaction)
-test "$cf_cv_type_sigaction" = yes && AC_DEFINE(HAVE_TYPE_SIGACTION)+test "$cf_cv_type_sigaction" = yes && AC_DEFINE(HAVE_TYPE_SIGACTION,1,[Define to 1 if we have the sigaction_t type])
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_UNSIGNED_LITERALS version: 2 updated: 1998/02/07 22:10:16 dnl CF_UNSIGNED_LITERALS version: 2 updated: 1998/02/07 22:10:16
@@ -5890,7 +6412,7 @@ AC_DEFUN([CF_UPPER],
$1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_UTF8_LIB version: 7 updated: 2010/06/20 09:24:28+dnl CF_UTF8_LIB version: 8 updated: 2012/10/06 08:57:51
dnl ----------- dnl -----------
dnl Check for multibyte support, and if not found, utf8 compatibility library dnl Check for multibyte support, and if not found, utf8 compatibility library
AC_DEFUN([CF_UTF8_LIB], AC_DEFUN([CF_UTF8_LIB],
@@ -5909,14 +6431,14 @@ AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
# HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
# ncurses/ncursesw: # ncurses/ncursesw:
if test "$cf_cv_utf8_lib" = "add-on" ; then if test "$cf_cv_utf8_lib" = "add-on" ; then
- AC_DEFINE(HAVE_LIBUTF8_H)+ AC_DEFINE(HAVE_LIBUTF8_H,1,[Define to 1 if we should include libutf8.h])
CF_ADD_INCDIR($cf_cv_header_path_utf8) CF_ADD_INCDIR($cf_cv_header_path_utf8)
CF_ADD_LIBDIR($cf_cv_library_path_utf8) CF_ADD_LIBDIR($cf_cv_library_path_utf8)
CF_ADD_LIBS($cf_cv_library_file_utf8) CF_ADD_LIBS($cf_cv_library_file_utf8)
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_VA_COPY version: 2 updated: 2010/03/04 05:37:29+dnl CF_VA_COPY version: 3 updated: 2012/10/06 11:17:15
dnl ---------- dnl ----------
dnl check for va_copy, part of stdarg.h dnl check for va_copy, part of stdarg.h
dnl Also, workaround for glibc's __va_copy, by checking for both. dnl Also, workaround for glibc's __va_copy, by checking for both.
@@ -5931,7 +6453,7 @@ AC_TRY_LINK([
cf_cv_have_va_copy=yes, cf_cv_have_va_copy=yes,
cf_cv_have_va_copy=no)]) cf_cv_have_va_copy=no)])
-test "$cf_cv_have_va_copy" = yes && AC_DEFINE(HAVE_VA_COPY)+test "$cf_cv_have_va_copy" = yes && AC_DEFINE(HAVE_VA_COPY,1,[Define to 1 if we have va_copy])
AC_CACHE_CHECK(for __va_copy, cf_cv_have___va_copy,[ AC_CACHE_CHECK(for __va_copy, cf_cv_have___va_copy,[
AC_TRY_LINK([ AC_TRY_LINK([
@@ -5943,7 +6465,7 @@ AC_TRY_LINK([
cf_cv_have___va_copy=yes, cf_cv_have___va_copy=yes,
cf_cv_have___va_copy=no)]) cf_cv_have___va_copy=no)])
-test "$cf_cv_have___va_copy" = yes && AC_DEFINE(HAVE___VA_COPY)+test "$cf_cv_have___va_copy" = yes && AC_DEFINE(HAVE___VA_COPY,1,[Define to 1 if we have __va_copy])
]) ])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12 dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12
@@ -5954,7 +6476,7 @@ AC_DEFUN([CF_VERBOSE],
CF_MSG_LOG([$1]) CF_MSG_LOG([$1])
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_WCHAR_TYPE version: 3 updated: 2010/05/26 16:44:57+dnl CF_WCHAR_TYPE version: 4 updated: 2012/10/06 16:39:58
dnl ------------- dnl -------------
dnl Check if type wide-character type $1 is declared, and if so, which header dnl Check if type wide-character type $1 is declared, and if so, which header
dnl file is needed. The second parameter is used to set a shell variable when dnl file is needed. The second parameter is used to set a shell variable when
@@ -5986,7 +6508,7 @@ AC_TRY_COMPILE([
[cf_cv_$1=unknown])])]) [cf_cv_$1=unknown])])])
if test "$cf_cv_$1" = yes ; then if test "$cf_cv_$1" = yes ; then
- AC_DEFINE(NEED_WCHAR_H)+ AC_DEFINE(NEED_WCHAR_H,1,[Define to 1 if we must include wchar.h])
NEED_WCHAR_H=1 NEED_WCHAR_H=1
fi fi
@@ -6149,7 +6671,7 @@ if test "$with_dmalloc" = yes ; then
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_WITH_GPM version: 7 updated: 2008/03/23 14:48:54+dnl CF_WITH_GPM version: 8 updated: 2012/10/06 17:56:13
dnl ----------- dnl -----------
dnl dnl
dnl The option parameter (if neither yes/no) is assumed to be the name of dnl The option parameter (if neither yes/no) is assumed to be the name of
@@ -6165,10 +6687,10 @@ AC_MSG_RESULT($with_gpm)
if test "$with_gpm" != no ; then if test "$with_gpm" != no ; then
AC_CHECK_HEADER(gpm.h,[ AC_CHECK_HEADER(gpm.h,[
- AC_DEFINE(HAVE_GPM_H)+ AC_DEFINE(HAVE_GPM_H,1,[Define to 1 if we have gpm.h header])
if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
CF_VERBOSE(assuming we really have GPM library) CF_VERBOSE(assuming we really have GPM library)
- AC_DEFINE(HAVE_LIBGPM)+ AC_DEFINE(HAVE_LIBGPM,1,[Define to 1 if we have the gpm library])
else else
AC_CHECK_LIB(gpm,Gpm_Open,[:],[ AC_CHECK_LIB(gpm,Gpm_Open,[:],[
AC_MSG_ERROR(Cannot link with GPM library) AC_MSG_ERROR(Cannot link with GPM library)
@@ -6182,7 +6704,7 @@ if test "$with_gpm" != no ; then
fi fi
]) ])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_WITH_LIBTOOL version: 26 updated: 2010/10/23 15:55:24+dnl CF_WITH_LIBTOOL version: 30 updated: 2013/09/07 13:54:05
dnl --------------- dnl ---------------
dnl Provide a configure option to incorporate libtool. Define several useful dnl Provide a configure option to incorporate libtool. Define several useful
dnl symbols for the makefile rules. dnl symbols for the makefile rules.
@@ -6252,13 +6774,20 @@ ifdef([AC_PROG_LIBTOOL],[
CF_PATH_SYNTAX(with_libtool) CF_PATH_SYNTAX(with_libtool)
LIBTOOL=$with_libtool LIBTOOL=$with_libtool
else else
- AC_PATH_PROG(LIBTOOL,libtool)+ AC_CHECK_TOOLS(LIBTOOL,[libtool glibtool],none)
+ CF_LIBTOOL_VERSION
+ if test -z "$cf_cv_libtool_version" && test "$LIBTOOL" = libtool
+ then
+ CF_FORGET_TOOL(LIBTOOL)
+ AC_CHECK_TOOLS(LIBTOOL,[glibtool],none)
+ CF_LIBTOOL_VERSION
+ fi
fi fi
if test -z "$LIBTOOL" ; then if test -z "$LIBTOOL" ; then
AC_MSG_ERROR(Cannot find libtool) AC_MSG_ERROR(Cannot find libtool)
fi fi
])dnl ])dnl
- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
LIB_OBJECT='${OBJECTS:.o=.lo}' LIB_OBJECT='${OBJECTS:.o=.lo}'
LIB_SUFFIX=.la LIB_SUFFIX=.la
LIB_CLEAN='${LIBTOOL} --mode=clean' LIB_CLEAN='${LIBTOOL} --mode=clean'
@@ -6268,22 +6797,12 @@ ifdef([AC_PROG_LIBTOOL],[
LIB_UNINSTALL='${LIBTOOL} --mode=uninstall' LIB_UNINSTALL='${LIBTOOL} --mode=uninstall'
LIB_PREP=: LIB_PREP=:
- # Show the version of libtool+ CF_CHECK_LIBTOOL_VERSION
- AC_MSG_CHECKING(version of libtool)
-
- # Save the version in a cache variable - this is not entirely a good
- # thing, but the version string from libtool is very ugly, and for
- # bug reports it might be useful to have the original string. "("
- cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
- AC_MSG_RESULT($cf_cv_libtool_version)
- if test -z "$cf_cv_libtool_version" ; then
- AC_MSG_ERROR(This is not GNU libtool)
- fi
# special hack to add -no-undefined (which libtool should do for itself) # special hack to add -no-undefined (which libtool should do for itself)
LT_UNDEF= LT_UNDEF=
case "$cf_cv_system_name" in #(vi case "$cf_cv_system_name" in #(vi
- cygwin*|mingw32*|uwin*|aix[[456]]) #(vi+ cygwin*|msys*|mingw32*|uwin*|aix[[4-7]]) #(vi
LT_UNDEF=-no-undefined LT_UNDEF=-no-undefined
;; ;;
esac esac
@@ -6323,7 +6842,33 @@ AC_SUBST(LIB_UNINSTALL)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PATH version: 10 updated: 2010/10/23 15:44:18+dnl CF_WITH_LIB_PREFIX version: 1 updated: 2012/01/21 19:28:10
+dnl ------------------
+dnl Allow the library-prefix to be overridden. OS/2 EMX originally had no
+dnl "lib" prefix, e.g., because it used the dll naming convention.
+dnl
+dnl $1 = variable to set
+AC_DEFUN([CF_WITH_LIB_PREFIX],
+[
+AC_MSG_CHECKING(if you want to have a library-prefix)
+AC_ARG_WITH(lib-prefix,
+ [ --with-lib-prefix override library-prefix],
+ [with_lib_prefix=$withval],
+ [with_lib_prefix=auto])
+AC_MSG_RESULT($with_lib_prefix)
+
+if test $with_lib_prefix = auto
+then
+ CF_LIB_PREFIX($1)
+elif test $with_lib_prefix = no
+then
+ LIB_PREFIX=
+else
+ LIB_PREFIX=$with_lib_prefix
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_PATH version: 11 updated: 2012/09/29 15:04:19
dnl ------------ dnl ------------
dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
dnl defaulting to yes/no. dnl defaulting to yes/no.
@@ -6340,11 +6885,11 @@ ifelse([$4],,[withval="${$3}"],[withval="${$3:-ifelse([$5],,[$4],[$5])}"]))dnl
if ifelse([$5],,true,[test -n "$5"]) ; then if ifelse([$5],,true,[test -n "$5"]) ; then
CF_PATH_SYNTAX(withval) CF_PATH_SYNTAX(withval)
fi fi
-$3="$withval"+eval $3="$withval"
AC_SUBST($3)dnl AC_SUBST($3)dnl
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PATHLIST version: 7 updated: 2010/10/23 16:10:30+dnl CF_WITH_PATHLIST version: 9 updated: 2012/10/18 05:05:24
dnl ---------------- dnl ----------------
dnl Process an option specifying a list of colon-separated paths. dnl Process an option specifying a list of colon-separated paths.
dnl dnl
@@ -6365,7 +6910,7 @@ cf_dst_path=
for cf_src_path in $withval for cf_src_path in $withval
do do
CF_PATH_SYNTAX(cf_src_path) CF_PATH_SYNTAX(cf_src_path)
- test -n "$cf_dst_path" && cf_dst_path="${cf_dst_path}:"+ test -n "$cf_dst_path" && cf_dst_path="${cf_dst_path}$PATH_SEPARATOR"
cf_dst_path="${cf_dst_path}${cf_src_path}" cf_dst_path="${cf_dst_path}${cf_src_path}"
done done
IFS="$ac_save_ifs" IFS="$ac_save_ifs"
@@ -6381,12 +6926,65 @@ esac
cf_dst_path=`echo "$cf_dst_path" | sed -e 's/\\\\/\\\\\\\\/g'` cf_dst_path=`echo "$cf_dst_path" | sed -e 's/\\\\/\\\\\\\\/g'`
]) ])
-eval '$3="$cf_dst_path"'+# This may use the prefix/exec_prefix symbols which will only yield "NONE"
+# so we have to check/work around. We do prefer the result of "eval"...
+eval cf_dst_eval="$cf_dst_path"
+case "x$cf_dst_eval" in #(vi
+xNONE*) #(vi
+ $3=$cf_dst_path
+ ;;
+*)
+ $3="$cf_dst_eval"
+ ;;
+esac
AC_SUBST($3)dnl AC_SUBST($3)dnl
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PTHREAD version: 3 updated: 2010/05/29 16:31:02+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 2 updated: 2011/12/10 18:58:47
+dnl -------------------------
+dnl Allow the choice of the pkg-config library directory to be overridden.
+AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
+if test "$PKG_CONFIG" != none ; then
+ AC_MSG_CHECKING(for $PKG_CONFIG library directory)
+ AC_ARG_WITH(pkg-config-libdir,
+ [ --with-pkg-config-libdir=XXX use given directory for installing pc-files],
+ [PKG_CONFIG_LIBDIR=$withval],
+ [PKG_CONFIG_LIBDIR=yes])
+
+ case x$PKG_CONFIG_LIBDIR in #(vi
+ x/*) #(vi
+ ;;
+ xyes) #(vi
+ # look for the library directory using the same prefix as the executable
+ cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`
+ case x`(arch) 2>/dev/null` in #(vi
+ *64) #(vi
+ for cf_config in $cf_path/share $cf_path/lib64 $cf_path/lib32 $cf_path/lib
+ do
+ if test -d $cf_config/pkgconfig
+ then
+ PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
+ break
+ fi
+ done
+ ;;
+ *)
+ PKG_CONFIG_LIBDIR=$cf_path/lib/pkgconfig
+ ;;
+ esac
+ ;;
+ *)
+ ;;
+ esac
+
+ AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+fi
+
+AC_SUBST(PKG_CONFIG_LIBDIR)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_PTHREAD version: 6 updated: 2012/10/06 17:41:51
dnl --------------- dnl ---------------
dnl Check for POSIX thread library. dnl Check for POSIX thread library.
AC_DEFUN([CF_WITH_PTHREAD], AC_DEFUN([CF_WITH_PTHREAD],
@@ -6400,25 +6998,30 @@ AC_MSG_RESULT($with_pthread)
if test "$with_pthread" != no ; then if test "$with_pthread" != no ; then
AC_CHECK_HEADER(pthread.h,[ AC_CHECK_HEADER(pthread.h,[
- AC_DEFINE(HAVE_PTHREADS_H)+ AC_DEFINE(HAVE_PTHREADS_H,1,[Define to 1 if we have pthreads.h header])
- AC_MSG_CHECKING(if we can link with the pthread library)+ for cf_lib_pthread in pthread c_r
- cf_save_LIBS="$LIBS"+ do
- CF_ADD_LIB(pthread)+ AC_MSG_CHECKING(if we can link with the $cf_lib_pthread library)
- AC_TRY_LINK([+ cf_save_LIBS="$LIBS"
+ CF_ADD_LIB($cf_lib_pthread)
+ AC_TRY_LINK([
#include <pthread.h> #include <pthread.h>
],[ ],[
- int rc = pthread_create(0,0,0,0);+ int rc = pthread_create(0,0,0,0);
+ int r2 = pthread_mutexattr_settype(0, 0);
],[with_pthread=yes],[with_pthread=no]) ],[with_pthread=yes],[with_pthread=no])
- LIBS="$cf_save_LIBS"+ LIBS="$cf_save_LIBS"
- AC_MSG_RESULT($with_pthread)+ AC_MSG_RESULT($with_pthread)
-+ test "$with_pthread" = yes && break
- if test "$with_pthread" = yes ; then+ done
- CF_ADD_LIB(pthread)+
- AC_DEFINE(HAVE_LIBPTHREADS)+ if test "$with_pthread" = yes ; then
- else+ CF_ADD_LIB($cf_lib_pthread)
- AC_MSG_ERROR(Cannot link with pthread library)+ AC_DEFINE(HAVE_LIBPTHREADS,1,[Define to 1 if we have pthreads library])
- fi+ else
+ AC_MSG_ERROR(Cannot link with pthread library)
+ fi
]) ])
fi fi
]) ])
@@ -6448,7 +7051,7 @@ ifelse($1,,[
]) ])
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_WITH_SYSMOUSE version: 2 updated: 2003/03/22 19:13:43+dnl CF_WITH_SYSMOUSE version: 3 updated: 2012/10/06 17:56:13
dnl ---------------- dnl ----------------
dnl If we can compile with sysmouse, make it available unless it is not wanted. dnl If we can compile with sysmouse, make it available unless it is not wanted.
AC_DEFUN([CF_WITH_SYSMOUSE],[ AC_DEFUN([CF_WITH_SYSMOUSE],[
@@ -6474,10 +7077,30 @@ AC_ARG_WITH(sysmouse,
],[cf_with_sysmouse=yes],[cf_with_sysmouse=no]) ],[cf_with_sysmouse=yes],[cf_with_sysmouse=no])
fi fi
AC_MSG_RESULT($cf_with_sysmouse) AC_MSG_RESULT($cf_with_sysmouse)
-test "$cf_with_sysmouse" = yes && AC_DEFINE(USE_SYSMOUSE)+test "$cf_with_sysmouse" = yes && AC_DEFINE(USE_SYSMOUSE,1,[Define to 1 if we can/should use the sysmouse interface])
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
+dnl CF_WITH_SYSTYPE version: 1 updated: 2013/01/26 16:26:12
+dnl ---------------
+dnl For testing, override the derived host system-type which is used to decide
+dnl things such as the linker commands used to build shared libraries. This is
+dnl normally chosen automatically based on the type of system which you are
+dnl building on. We use it for testing the configure script.
+dnl
+dnl This is different from the --host option: it is used only for testing parts
+dnl of the configure script which would not be reachable with --host since that
+dnl relies on the build environment being real, rather than mocked up.
+AC_DEFUN([CF_WITH_SYSTYPE],[
+CF_CHECK_CACHE([AC_CANONICAL_SYSTEM])
+AC_ARG_WITH(system-type,
+ [ --with-system-type=XXX test: override derived host system-type],
+[AC_MSG_WARN(overriding system type to $withval)
+ cf_cv_system_name=$withval
+ host_os=$withval
+])
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21 dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21
dnl ---------------- dnl ----------------
AC_DEFUN([CF_WITH_VALGRIND],[ AC_DEFUN([CF_WITH_VALGRIND],[
@@ -6486,7 +7109,7 @@ CF_NO_LEAKS_OPTION(valgrind,
[USE_VALGRIND]) [USE_VALGRIND])
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37+dnl CF_XOPEN_SOURCE version: 46 updated: 2014/02/09 19:30:15
dnl --------------- dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality, dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -6496,16 +7119,17 @@ dnl Parameters:
dnl $1 is the nominal value for _XOPEN_SOURCE dnl $1 is the nominal value for _XOPEN_SOURCE
dnl $2 is the nominal value for _POSIX_C_SOURCE dnl $2 is the nominal value for _POSIX_C_SOURCE
AC_DEFUN([CF_XOPEN_SOURCE],[ AC_DEFUN([CF_XOPEN_SOURCE],[
+AC_REQUIRE([AC_CANONICAL_HOST])
cf_XOPEN_SOURCE=ifelse([$1],,500,[$1]) cf_XOPEN_SOURCE=ifelse([$1],,500,[$1])
cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2]) cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
cf_xopen_source= cf_xopen_source=
case $host_os in #(vi case $host_os in #(vi
-aix[[456]]*) #(vi+aix[[4-7]]*) #(vi
cf_xopen_source="-D_ALL_SOURCE" cf_xopen_source="-D_ALL_SOURCE"
;; ;;
-cygwin) #(vi+cygwin|msys) #(vi
cf_XOPEN_SOURCE=600 cf_XOPEN_SOURCE=600
;; ;;
darwin[[0-8]].*) #(vi darwin[[0-8]].*) #(vi
@@ -6513,6 +7137,7 @@ darwin[[0-8]].*) #(vi
;; ;;
darwin*) #(vi darwin*) #(vi
cf_xopen_source="-D_DARWIN_C_SOURCE" cf_xopen_source="-D_DARWIN_C_SOURCE"
+ cf_XOPEN_SOURCE=
;; ;;
freebsd*|dragonfly*) #(vi freebsd*|dragonfly*) #(vi
# 5.x headers associate # 5.x headers associate
@@ -6530,15 +7155,23 @@ hpux*) #(vi
;; ;;
irix[[56]].*) #(vi irix[[56]].*) #(vi
cf_xopen_source="-D_SGI_SOURCE" cf_xopen_source="-D_SGI_SOURCE"
+ cf_XOPEN_SOURCE=
;; ;;
linux*|gnu*|mint*|k*bsd*-gnu) #(vi linux*|gnu*|mint*|k*bsd*-gnu) #(vi
CF_GNU_SOURCE CF_GNU_SOURCE
;; ;;
mirbsd*) #(vi mirbsd*) #(vi
- # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>+ # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
+ cf_XOPEN_SOURCE=
+ CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
;; ;;
netbsd*) #(vi netbsd*) #(vi
- # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw+ cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
+ ;;
+openbsd[[4-9]]*) #(vi
+ # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
+ cf_xopen_source="-D_BSD_SOURCE"
+ cf_XOPEN_SOURCE=600
;; ;;
openbsd*) #(vi openbsd*) #(vi
# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
@@ -6552,36 +7185,12 @@ nto-qnx*) #(vi
sco*) #(vi sco*) #(vi
# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
;; ;;
-solaris2.1[[0-9]]) #(vi+solaris2.*) #(vi
- cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- ;;
-solaris2.[[1-9]]) #(vi
cf_xopen_source="-D__EXTENSIONS__" cf_xopen_source="-D__EXTENSIONS__"
+ cf_cv_xopen_source=broken
;; ;;
*) *)
- AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[+ CF_TRY_XOPEN_SOURCE
- AC_TRY_COMPILE([#include <sys/types.h>],[
-#ifndef _XOPEN_SOURCE
-make an error
-#endif],
- [cf_cv_xopen_source=no],
- [cf_save="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- AC_TRY_COMPILE([#include <sys/types.h>],[
-#ifdef _XOPEN_SOURCE
-make an error
-#endif],
- [cf_cv_xopen_source=no],
- [cf_cv_xopen_source=$cf_XOPEN_SOURCE])
- CPPFLAGS="$cf_save"
- ])
-])
- if test "$cf_cv_xopen_source" != no ; then
- CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
- CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
- cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
- CF_ADD_CFLAGS($cf_temp_xopen_source)
- fi
CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
;; ;;
esac esac
@@ -6589,4 +7198,33 @@ esac
if test -n "$cf_xopen_source" ; then if test -n "$cf_xopen_source" ; then
CF_ADD_CFLAGS($cf_xopen_source) CF_ADD_CFLAGS($cf_xopen_source)
fi fi
+
+dnl In anything but the default case, we may have system-specific setting
+dnl which is still not guaranteed to provide all of the entrypoints that
+dnl _XOPEN_SOURCE would yield.
+if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+ AC_MSG_CHECKING(if _XOPEN_SOURCE really is set)
+ AC_TRY_COMPILE([#include <stdlib.h>],[
+#ifndef _XOPEN_SOURCE
+make an error
+#endif],
+ [cf_XOPEN_SOURCE_set=yes],
+ [cf_XOPEN_SOURCE_set=no])
+ AC_MSG_RESULT($cf_XOPEN_SOURCE_set)
+ if test $cf_XOPEN_SOURCE_set = yes
+ then
+ AC_TRY_COMPILE([#include <stdlib.h>],[
+#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
+make an error
+#endif],
+ [cf_XOPEN_SOURCE_set_ok=yes],
+ [cf_XOPEN_SOURCE_set_ok=no])
+ if test $cf_XOPEN_SOURCE_set_ok = no
+ then
+ AC_MSG_WARN(_XOPEN_SOURCE is lower than requested)
+ fi
+ else
+ CF_TRY_XOPEN_SOURCE
+ fi
+fi
]) ])
contrib/ncurses/announce.html.in
@@ -1,8 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!-- <!--
- $Id: announce.html.in,v 1.85 2011/04/04 00:05:34 tom Exp $+ $Id: announce.html.in,v 1.89 2013/05/18 10:12:25 tom Exp $
**************************************************************************** ****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. *+ * Copyright (c) 1998-2011,2013 Free Software Foundation, Inc. *
* * * *
* Permission is hereby granted, free of charge, to any person obtaining a * * Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the * * copy of this software and associated documentation files (the *
@@ -29,11 +28,12 @@
* authorization. * * authorization. *
**************************************************************************** ****************************************************************************
--> -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html> <html>
<head> <head>
<meta name="generator" content= <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 6 November 2007), see www.w3.org">+ "HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
<title>Announcing ncurses @VERSION@</title> <title>Announcing ncurses @VERSION@</title>
<link rev="made" href="mailto:bug-ncurses@gnu.org"> <link rev="made" href="mailto:bug-ncurses@gnu.org">
@@ -42,12 +42,13 @@
</head> </head>
<body> <body>
- <h1>Announcing ncurses @VERSION@</h1>The ncurses (new curses)+ <h1>Announcing ncurses @VERSION@</h1>
- library is a free software emulation of curses in System V+
- Release 4.0, and more. It uses terminfo format, supports pads and+ <p>The ncurses (new curses) library is a free software emulation
- color and multiple highlights and forms characters and+ of curses in System V Release 4.0, and more. It uses terminfo
- function-key mapping, and has all the other SYSV-curses+ format, supports pads and color and multiple highlights and forms
- enhancements over BSD curses.+ characters and function-key mapping, and has all the other
+ SYSV-curses enhancements over BSD curses.</p>
<p>In mid-June 1995, the maintainer of 4.4BSD curses declared <p>In mid-June 1995, the maintainer of 4.4BSD curses declared
that he considered 4.4BSD curses obsolete, and encouraged the that he considered 4.4BSD curses obsolete, and encouraged the
@@ -73,38 +74,50 @@
It is also available at <a href= It is also available at <a href=
"ftp://invisible-island.net/ncurses/">ftp://invisible-island.net/ncurses/</a>&nbsp;.</p> "ftp://invisible-island.net/ncurses/">ftp://invisible-island.net/ncurses/</a>&nbsp;.</p>
- <h1>Release Notes</h1>This release is designed to be upward+ <h1>Release Notes</h1>
- compatible from ncurses 5.0 through 5.8; very few applications+
- will require recompilation, depending on the platform. These are+ <p>This release is designed to be upward compatible from ncurses
- the highlights from the change-log since ncurses 5.8 release.+ 5.0 through 5.8; very few applications will require
- <p>+ recompilation, depending on the platform. These are the
- This is a bug-fix release, correcting a small number of urgent problems+ highlights from the change-log since ncurses 5.8 release.</p>
- in the ncurses library from the 5.8 release.+
- <p>+ <p>This is a bug-fix release, correcting a small number of urgent
- It also improves the Ada95 binding:+ problems in the ncurses library from the 5.8 release.</p>
+
+ <p>It also improves the Ada95 binding:</p>
+
<ul> <ul>
- <li>fixes a longstanding portability problem with its use of the+ <li>fixes a longstanding portability problem with its use of
- <a href="http://invisible-island.net/ncurses/man/form_fieldtype.3x">set_field_type</a>+ the <a href=
- function. Because that function uses variable-length argument lists,+ "http://invisible-island.net/ncurses/man/form_fieldtype.3x">set_field_type</a>
- its interface with gnat does not work with certain platforms.+ function. Because that function uses variable-length argument
- <li>improves configurability and portability, particularly when built+ lists, its interface with gnat does not work with certain
- separately from the main ncurses tree. The 5.8 release introduced+ platforms.</li>
- scripts which can be used to construct separate tarballs for the+
- Ada95 and ncurses examples.+ <li>improves configurability and portability, particularly when
- <p>Those were a proof of concept. For the 5.9 release, those+ built separately from the main ncurses tree. The 5.8 release
- scripts are augmented with rpm- and dpkg-scripts used in test builds+ introduced scripts which can be used to construct separate
- against a variety of gnat- and system ncurses versions as old as+ tarballs for the Ada95 and ncurses examples.
- gnat 3.15 and ncurses 5.4 (see snapshots and systems tested+
- <a href="http://invisible-island.net/ncurses/ncurses-Ada95.html">here</a>.+ <p>Those were a proof of concept. For the 5.9 release, those
- <li>additional improvements were made for portability of the+ scripts are augmented with rpm- and dpkg-scripts used in test
- ncurses examples, adding rpm- and dpkg-scripts for test-builds.+ builds against a variety of gnat- and system ncurses versions
- See + as old as gnat 3.15 and ncurses 5.4 (see snapshots and
- <a href="http://invisible-island.net/ncurses/ncurses-examples.html">this page</a>+ systems tested <a href=
- for snapshots and other information.+ "http://invisible-island.net/ncurses/ncurses-Ada95.html">here</a>.</p>
+ </li>
+
+ <li>additional improvements were made for portability of the
+ ncurses examples, adding rpm- and dpkg-scripts for test-builds.
+ See <a href=
+ "http://invisible-island.net/ncurses/ncurses-examples.html">this
+ page</a> for snapshots and other information.</li>
</ul> </ul>
- <h1>Features of Ncurses</h1>The ncurses package is fully+ <h1>Features of Ncurses</h1>
- compatible with SVr4 (System V Release 4) curses:+
+ <p>The ncurses package is fully compatible with SVr4 (System V
+ Release 4) curses:</p>
<ul> <ul>
<li>All 257 of the SVr4 calls have been implemented (and are <li>All 257 of the SVr4 calls have been implemented (and are
@@ -132,8 +145,10 @@
entries for use with less capable entries for use with less capable
<strong>curses</strong>/<strong>terminfo</strong> versions such <strong>curses</strong>/<strong>terminfo</strong> versions such
as the HP/UX and AIX ports.</li> as the HP/UX and AIX ports.</li>
- </ul>The ncurses package also has many useful extensions over+ </ul>
- SVr4:+
+ <p>The ncurses package also has many useful extensions over
+ SVr4:</p>
<ul> <ul>
<li>The API is 8-bit clean and base-level conformant with the <li>The API is 8-bit clean and base-level conformant with the
@@ -249,12 +264,14 @@
interface.</li> interface.</li>
</ul> </ul>
- <h1>State of the Package</h1>Numerous bugs present in earlier+ <h1>State of the Package</h1>
- versions have been fixed; the library is far more reliable than+
- it used to be. Bounds checking in many `dangerous' entry points+ <p>Numerous bugs present in earlier versions have been fixed; the
- has been improved. The code is now type-safe according to gcc+ library is far more reliable than it used to be. Bounds checking
- -Wall. The library has been checked for malloc leaks and arena+ in many `dangerous' entry points has been improved. The code is
- corruption by the Purify memory-allocation tester.+ now type-safe according to gcc -Wall. The library has been
+ checked for malloc leaks and arena corruption by the Purify
+ memory-allocation tester.</p>
<p>The ncurses code has been tested with a wide variety of <p>The ncurses code has been tested with a wide variety of
applications including (versions starting with those noted):</p> applications including (versions starting with those noted):</p>
@@ -321,8 +338,10 @@
<dd>newsreader, supporting color, MIME <a href= <dd>newsreader, supporting color, MIME <a href=
"http://www.tin.org/">http://www.tin.org/</a></dd> "http://www.tin.org/">http://www.tin.org/</a></dd>
- </dl>as well as some that use ncurses for the terminfo support+ </dl>
- alone:+
+ <p>as well as some that use ncurses for the terminfo support
+ alone:</p>
<dl> <dl>
<dt>minicom</dt> <dt>minicom</dt>
@@ -341,15 +360,17 @@
<p>The ncurses distribution includes a selection of test programs <p>The ncurses distribution includes a selection of test programs
(including a few games).</p> (including a few games).</p>
- <h2>Who's Who and What's What</h2>Zeyd Ben-Halim started it from+ <h2>Who's Who and What's What</h2>
- a previous package pcurses, written by Pavel Curtis. Eric S.+
- Raymond continued development. J&uuml;rgen Pfeifer wrote most of+ <p>Zeyd Ben-Halim started it from a previous package pcurses,
- the form and menu libraries. Ongoing work is being done by+ written by Pavel Curtis. Eric S. Raymond continued development.
- <a href="mailto:dickey@invisible-island.net">Thomas Dickey</a>.+ J&uuml;rgen Pfeifer wrote most of the form and menu libraries.
- Thomas Dickey acts as the maintainer for the Free Software+ Ongoing work is being done by <a href=
- Foundation, which holds the copyright on ncurses. Contact the+ "mailto:dickey@invisible-island.net">Thomas Dickey</a>. Thomas
- current maintainers at <a href=+ Dickey acts as the maintainer for the Free Software Foundation,
- "mailto:bug-ncurses@gnu.org">bug-ncurses@gnu.org</a>.+ which holds the copyright on ncurses. Contact the current
+ maintainers at <a href=
+ "mailto:bug-ncurses@gnu.org">bug-ncurses@gnu.org</a>.</p>
<p>To join the ncurses mailing list, please write email to <p>To join the ncurses mailing list, please write email to
<code>bug-ncurses-request@gnu.org</code> containing the line:</p> <code>bug-ncurses-request@gnu.org</code> containing the line:</p>
@@ -364,6 +385,13 @@
are made available at <a href= are made available at <a href=
"ftp://invisible-island.net/ncurses/">ftp://invisible-island.net/ncurses/</a>&nbsp;.</p> "ftp://invisible-island.net/ncurses/">ftp://invisible-island.net/ncurses/</a>&nbsp;.</p>
+ <p>There is an archive of the mailing list here:</p>
+
+ <p><a href=
+ "http://lists.gnu.org/archive/html/bug-ncurses">http://lists.gnu.org/archive/html/bug-ncurses</a>
+ (also <a href=
+ "https://lists.gnu.org/archive/html/bug-ncurses">https</a>)</p>
+
<h2>Future Plans</h2> <h2>Future Plans</h2>
<ul> <ul>
@@ -371,15 +399,19 @@
support.</li> support.</li>
<li>Ports to more systems, including DOS and Windows.</li> <li>Ports to more systems, including DOS and Windows.</li>
- </ul>We need people to help with these projects. If you are+ </ul>
- interested in working on them, please join the ncurses list.+
+ <p>We need people to help with these projects. If you are
+ interested in working on them, please join the ncurses list.</p>
+
+ <h2>Other Related Resources</h2>
- <h2>Other Related Resources</h2>The distribution provides a newer+ <p>The distribution provides a newer version of the
- version of the terminfo-format terminal description file once+ terminfo-format terminal description file once maintained by
- maintained by <a href="http://www.catb.org/~esr/terminfo/">Eric+ <a href="http://www.catb.org/~esr/terminfo/">Eric
Raymond</a>&nbsp;. Unlike the older version, the termcap and Raymond</a>&nbsp;. Unlike the older version, the termcap and
terminfo data are provided in the same file, and provides several terminfo data are provided in the same file, and provides several
- user-definable extensions beyond the X/Open specification.+ user-definable extensions beyond the X/Open specification.</p>
<p>You can find lots of information on terminal-related topics <p>You can find lots of information on terminal-related topics
not covered in the terminfo file at <a href= not covered in the terminfo file at <a href=
contrib/ncurses/config.guess
@@ -1,14 +1,12 @@
#! /bin/sh #! /bin/sh
# Attempt to guess a canonical system name. # Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,+# Copyright 1992-2013 Free Software Foundation, Inc.
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
-timestamp='2010-09-24'+timestamp='2013-06-10'
# This file is free software; you can redistribute it and/or modify it # This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, but # This program is distributed in the hope that it will be useful, but
@@ -17,26 +15,22 @@ timestamp='2010-09-24'
# General Public License for more details. # General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software+# along with this program; if not, see <http://www.gnu.org/licenses/>.
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
# #
# As a special exception to the GNU General Public License, if you # As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a # distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.+# the same distribution terms that you use for the rest of that
-+# program. This Exception is an additional permission under section 7
-+# of the GNU General Public License, version 3 ("GPLv3").
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
# #
-# This script attempts to guess a canonical system name similar to+# Originally written by Per Bothner.
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
# #
# You can get the latest version of this script from: # You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
me=`echo "$0" | sed -e 's,.*/,,'` me=`echo "$0" | sed -e 's,.*/,,'`
@@ -56,9 +50,7 @@ version="\
GNU config.guess ($timestamp) GNU config.guess ($timestamp)
Originally written by Per Bothner. Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,+Copyright 1992-2013 Free Software Foundation, Inc.
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -92,7 +84,7 @@ if test $# != 0; then
exit 1 exit 1
fi fi
-trap 'exit 1' HUP INT TERM+trap 'exit 1' 1 2 15
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires # compiler to aid in system detection is discouraged as it requires
@@ -106,7 +98,7 @@ trap 'exit 1' HUP INT TERM
set_cc_for_build=' set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ; : ${TMPDIR=/tmp} ;
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -140,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+ # If the system lacks a compiler, then just pick glibc.
+ # We could probably try harder.
+ LIBC=gnu
+
+ eval $set_cc_for_build
+ cat <<-EOF > $dummy.c
+ #include <features.h>
+ #if defined(__UCLIBC__)
+ LIBC=uclibc
+ #elif defined(__dietlibc__)
+ LIBC=dietlibc
+ #else
+ LIBC=gnu
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ ;;
+esac
+
# Note: order is significant - the case branches are not exclusive. # Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*) *:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or # NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old # switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward # object file format. This provides both forward
@@ -202,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}" echo "${machine}-${os}${release}"
exit ;; exit ;;
+ *:Bitrig:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ exit ;;
*:OpenBSD:*:*) *:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -220,10 +237,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit ;; exit ;;
alpha:OSF1:*:*) alpha:OSF1:*:*)
case $UNAME_RELEASE in case $UNAME_RELEASE in
- *4.0)+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;; ;;
- *5.*)+ *5.*)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;; ;;
esac esac
@@ -270,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# A Xn.n version is an unreleased experimental baselevel. # A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r. # 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit ;;+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ exitcode=$?
+ trap '' 0
+ exit $exitcode ;;
Alpha\ *:Windows_NT*:*) Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem? # How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead # Should we change UNAME_MACHINE based on the output of uname instead
@@ -301,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE} echo arm-acorn-riscix${UNAME_RELEASE}
exit ;; exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)+ arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos echo arm-unknown-riscos
exit ;; exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -326,8 +346,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sparc) echo sparc-icl-nx7; exit ;; sparc) echo sparc-icl-nx7; exit ;;
esac ;; esac ;;
s390x:SunOS:*:*) s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;+ exit ;;
sun4H:SunOS:5.*:*) sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;; exit ;;
@@ -495,7 +515,7 @@ EOF
else else
echo i586-dg-dgux${UNAME_RELEASE} echo i586-dg-dgux${UNAME_RELEASE}
fi fi
- exit ;;+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3) M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3 echo m88k-dolphin-sysv3
exit ;; exit ;;
@@ -597,50 +617,50 @@ EOF
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0+ 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in+ case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;+ 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;+ 64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;+ esac ;;
- esac+ esac
fi fi
if [ "${HP_ARCH}" = "" ]; then if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c+ sed 's/^ //' << EOF >$dummy.c
- #define _HPUX_SOURCE+ #define _HPUX_SOURCE
- #include <stdlib.h>+ #include <stdlib.h>
- #include <unistd.h>+ #include <unistd.h>
- int main ()+ int main ()
- {+ {
- #if defined(_SC_KERNEL_BITS)+ #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);+ long bits = sysconf(_SC_KERNEL_BITS);
- #endif+ #endif
- long cpu = sysconf (_SC_CPU_VERSION);+ long cpu = sysconf (_SC_CPU_VERSION);
- switch (cpu)+ switch (cpu)
- {+ {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:+ case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)+ #if defined(_SC_KERNEL_BITS)
- switch (bits)+ switch (bits)
- {+ {
- case 64: puts ("hppa2.0w"); break;+ case 64: puts ("hppa2.0w"); break;
- case 32: puts ("hppa2.0n"); break;+ case 32: puts ("hppa2.0n"); break;
- default: puts ("hppa2.0"); break;+ default: puts ("hppa2.0"); break;
- } break;+ } break;
- #else /* !defined(_SC_KERNEL_BITS) */+ #else /* !defined(_SC_KERNEL_BITS) */
- puts ("hppa2.0"); break;+ puts ("hppa2.0"); break;
- #endif+ #endif
- default: puts ("hppa1.0"); break;+ default: puts ("hppa1.0"); break;
- }+ }
- exit (0);+ exit (0);
- }+ }
EOF EOF
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -789,21 +809,26 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;; exit ;;
*:FreeBSD:*:*) *:FreeBSD:*:*)
- case ${UNAME_MACHINE} in+ UNAME_PROCESSOR=`/usr/bin/uname -p`
- pc98)+ case ${UNAME_PROCESSOR} in
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
amd64) amd64)
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*) *)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac esac
exit ;; exit ;;
i*:CYGWIN*:*) i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin echo ${UNAME_MACHINE}-pc-cygwin
exit ;; exit ;;
+ *:MINGW64*:*)
+ echo ${UNAME_MACHINE}-pc-mingw64
+ exit ;;
*:MINGW*:*) *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32 echo ${UNAME_MACHINE}-pc-mingw32
exit ;; exit ;;
+ i*:MSYS*:*)
+ echo ${UNAME_MACHINE}-pc-msys
+ exit ;;
i*:windows32*:*) i*:windows32*:*)
# uname -m includes "-pc" on this system. # uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32 echo ${UNAME_MACHINE}-mingw32
@@ -820,8 +845,8 @@ EOF
echo x86_64-unknown-interix${UNAME_RELEASE} echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;; exit ;;
IA64) IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}+ echo ia64-unknown-interix${UNAME_RELEASE}
- exit ;;+ exit ;;
esac ;; esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks echo i${UNAME_MACHINE}-pc-mks
@@ -849,70 +874,81 @@ EOF
exit ;; exit ;;
*:GNU:*:*) *:GNU:*:*)
# the GNU system # the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;; exit ;;
*:GNU/*:*:*) *:GNU/*:*:*)
# other systems with GNU libc and userland # other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;; exit ;;
i*86:Minix:*:*) i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix echo ${UNAME_MACHINE}-pc-minix
exit ;; exit ;;
+ aarch64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
alpha:Linux:*:*) alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;+ EV5) UNAME_MACHINE=alphaev5 ;;
- EV56) UNAME_MACHINE=alphaev56 ;;+ EV56) UNAME_MACHINE=alphaev56 ;;
- PCA56) UNAME_MACHINE=alphapca56 ;;+ PCA56) UNAME_MACHINE=alphapca56 ;;
- PCA57) UNAME_MACHINE=alphapca56 ;;+ PCA57) UNAME_MACHINE=alphapca56 ;;
- EV6) UNAME_MACHINE=alphaev6 ;;+ EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;+ EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;+ EV68*) UNAME_MACHINE=alphaev68 ;;
esac esac
objdump --private-headers /bin/sh | grep -q ld.so.1 objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;; exit ;;
arm*:Linux:*:*) arm*:Linux:*:*)
eval $set_cc_for_build eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null | \+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- grep -q __ARM_EABI__+ | grep -q __ARM_EABI__
then then
- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
else else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ fi
fi fi
exit ;; exit ;;
avr32*:Linux:*:*) avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;; exit ;;
cris:Linux:*:*) cris:Linux:*:*)
- echo cris-axis-linux-gnu+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;; exit ;;
crisv32:Linux:*:*) crisv32:Linux:*:*)
- echo crisv32-axis-linux-gnu+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;; exit ;;
frv:Linux:*:*) frv:Linux:*:*)
- echo frv-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ hexagon:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;; exit ;;
i*86:Linux:*:*) i*86:Linux:*:*)
- LIBC=gnu+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit ;; exit ;;
ia64:Linux:*:*) ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;; exit ;;
m32r*:Linux:*:*) m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;; exit ;;
m68*:Linux:*:*) m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;; exit ;;
mips:Linux:*:* | mips64:Linux:*:*) mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build eval $set_cc_for_build
@@ -931,54 +967,63 @@ EOF
#endif #endif
EOF EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;; ;;
+ or1k:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
or32:Linux:*:*) or32:Linux:*:*)
- echo or32-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;+ exit ;;
padre:Linux:*:*) padre:Linux:*:*)
- echo sparc-unknown-linux-gnu+ echo sparc-unknown-linux-${LIBC}
exit ;; exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*) parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu+ echo hppa64-unknown-linux-${LIBC}
- exit ;;+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*) parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level # Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
- *) echo hppa-unknown-linux-gnu ;;+ *) echo hppa-unknown-linux-${LIBC} ;;
esac esac
exit ;; exit ;;
ppc64:Linux:*:*) ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu+ echo powerpc64-unknown-linux-${LIBC}
exit ;; exit ;;
ppc:Linux:*:*) ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu+ echo powerpc-unknown-linux-${LIBC}
+ exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-${LIBC}
+ exit ;;
+ ppcle:Linux:*:*)
+ echo powerpcle-unknown-linux-${LIBC}
exit ;; exit ;;
s390:Linux:*:* | s390x:Linux:*:*) s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;; exit ;;
sh64*:Linux:*:*) sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;; exit ;;
sh*:Linux:*:*) sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;; exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*) sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;; exit ;;
tile*:Linux:*:*) tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-tilera-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;; exit ;;
vax:Linux:*:*) vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;; exit ;;
x86_64:Linux:*:*) x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;; exit ;;
xtensa*:Linux:*:*) xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;; exit ;;
i*86:DYNIX/ptx:4*:*) i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1093,7 +1138,7 @@ EOF
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;+ && { echo i486-ncr-sysv4; exit; } ;;
NCR*:*:4.2:* | MPRAS*:*:4.2:*) NCR*:*:4.2:* | MPRAS*:*:4.2:*)
OS_REL='.3' OS_REL='.3'
test -r /etc/.relid \ test -r /etc/.relid \
@@ -1136,8 +1181,8 @@ EOF
echo ns32k-sni-sysv echo ns32k-sni-sysv
fi fi
exit ;; exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel@ccMail.Census.GOV>+ # says <Richard.M.Bartel@ccMail.Census.GOV>
echo i586-unisys-sysv4 echo i586-unisys-sysv4
exit ;; exit ;;
*:UNIX_System_V:4*:FTX*) *:UNIX_System_V:4*:FTX*)
@@ -1165,9 +1210,9 @@ EOF
exit ;; exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}+ echo mips-nec-sysv${UNAME_RELEASE}
else else
- echo mips-unknown-sysv${UNAME_RELEASE}+ echo mips-unknown-sysv${UNAME_RELEASE}
fi fi
exit ;; exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1182,6 +1227,9 @@ EOF
BePC:Haiku:*:*) # Haiku running on Intel PC compatible. BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
echo i586-pc-haiku echo i586-pc-haiku
exit ;; exit ;;
+ x86_64:Haiku:*:*)
+ echo x86_64-unknown-haiku
+ exit ;;
SX-4:SUPER-UX:*:*) SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE} echo sx4-nec-superux${UNAME_RELEASE}
exit ;; exit ;;
@@ -1208,26 +1256,28 @@ EOF
exit ;; exit ;;
*:Darwin:*:*) *:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- case $UNAME_PROCESSOR in+ eval $set_cc_for_build
- i386)+ if test "$UNAME_PROCESSOR" = unknown ; then
- eval $set_cc_for_build+ UNAME_PROCESSOR=powerpc
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then+ fi
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- grep IS_64BIT_ARCH >/dev/null+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- then+ grep IS_64BIT_ARCH >/dev/null
- UNAME_PROCESSOR="x86_64"+ then
- fi+ case $UNAME_PROCESSOR in
- fi ;;+ i386) UNAME_PROCESSOR=x86_64 ;;
- unknown) UNAME_PROCESSOR=powerpc ;;+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
- esac+ esac
+ fi
+ fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;; exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*) *:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p` UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then if test "$UNAME_PROCESSOR" = "x86"; then
- UNAME_PROCESSOR=i386+ UNAME_PROCESSOR=i386
- UNAME_MACHINE=pc+ UNAME_MACHINE=pc
fi fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
exit ;; exit ;;
@@ -1237,7 +1287,7 @@ EOF
NEO-?:NONSTOP_KERNEL:*:*) NEO-?:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE} echo neo-tandem-nsk${UNAME_RELEASE}
exit ;; exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)+ NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE} echo nse-tandem-nsk${UNAME_RELEASE}
exit ;; exit ;;
NSR-?:NONSTOP_KERNEL:*:*) NSR-?:NONSTOP_KERNEL:*:*)
@@ -1306,11 +1356,11 @@ EOF
i*86:AROS:*:*) i*86:AROS:*:*)
echo ${UNAME_MACHINE}-pc-aros echo ${UNAME_MACHINE}-pc-aros
exit ;; exit ;;
+ x86_64:VMkernel:*:*)
+ echo ${UNAME_MACHINE}-unknown-esx
+ exit ;;
esac esac
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
eval $set_cc_for_build eval $set_cc_for_build
cat >$dummy.c <<EOF cat >$dummy.c <<EOF
#ifdef _SEQUENT_ #ifdef _SEQUENT_
@@ -1328,11 +1378,11 @@ main ()
#include <sys/param.h> #include <sys/param.h>
printf ("m68k-sony-newsos%s\n", printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4 #ifdef NEWSOS4
- "4"+ "4"
#else #else
- ""+ ""
#endif #endif
- ); exit (0);+ ); exit (0);
#endif #endif
#endif #endif
contrib/ncurses/config.sub
@@ -1,38 +1,31 @@
#! /bin/sh #! /bin/sh
# Configuration validation subroutine script. # Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,+# Copyright 1992-2013 Free Software Foundation, Inc.
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
-timestamp='2010-09-11'+timestamp='2013-10-01'
-# This file is (in principle) common to ALL GNU software.+# This file is free software; you can redistribute it and/or modify it
-# The presence of a machine in this file suggests that SOME GNU software+# under the terms of the GNU General Public License as published by
-# can handle that machine. It does not imply ALL GNU software can.+# the Free Software Foundation; either version 3 of the License, or
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
-# This program is distributed in the hope that it will be useful,+# This program is distributed in the hope that it will be useful, but
-# but WITHOUT ANY WARRANTY; without even the implied warranty of+# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# GNU General Public License for more details.+# General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software+# along with this program; if not, see <http://www.gnu.org/licenses/>.
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
# #
# As a special exception to the GNU General Public License, if you # As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a # distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches to <config-patches@gnu.org>. Submit a context+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
-# diff and a properly formatted GNU ChangeLog entry.
# #
# Configuration subroutine to validate and canonicalize a configuration type. # Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument. # Supply the specified configuration type as an argument.
@@ -75,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\ version="\
GNU config.sub ($timestamp) GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,+Copyright 1992-2013 Free Software Foundation, Inc.
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -125,13 +116,17 @@ esac
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \ kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*) storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;; ;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*) *)
basic_machine=`echo $1 | sed 's/-[^-]*$//'` basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ] if [ $basic_machine != $1 ]
@@ -154,7 +149,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze)+ -apple | -axis | -knuth | -cray | -microblaze*)
os= os=
basic_machine=$1 basic_machine=$1
;; ;;
@@ -175,10 +170,10 @@ case $os in
os=-chorusos os=-chorusos
basic_machine=$1 basic_machine=$1
;; ;;
- -chorusrdb)+ -chorusrdb)
- os=-chorusrdb+ os=-chorusrdb
basic_machine=$1 basic_machine=$1
- ;;+ ;;
-hiux*) -hiux*)
os=-hiuxwe2 os=-hiuxwe2
;; ;;
@@ -223,6 +218,12 @@ case $os in
-isc*) -isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;; ;;
+ -lynx*178)
+ os=-lynxos178
+ ;;
+ -lynx*5)
+ os=-lynxos5
+ ;;
-lynx*) -lynx*)
os=-lynxos os=-lynxos
;; ;;
@@ -247,20 +248,28 @@ case $basic_machine in
# Some are omitted here because they have special meanings below. # Some are omitted here because they have special meanings below.
1750a | 580 \ 1750a | 580 \
| a29k \ | a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \ | am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \+ | arc | arceb \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | avr | avr32 \
+ | be32 | be64 \
| bfin \ | bfin \
- | c4x | clipper \+ | c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \ | d10v | d30v | dlx | dsp16xx \
+ | epiphany \
| fido | fr30 | frv \ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
| i370 | i860 | i960 | ia64 \ | i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \ | ip2k | iq2000 \
+ | k1om \
+ | le32 | le64 \
| lm32 \ | lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \ | m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \ | mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \ | mips16 \
| mips64 | mips64el \ | mips64 | mips64el \
@@ -278,30 +287,32 @@ case $basic_machine in
| mipsisa64r2 | mipsisa64r2el \ | mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \ | mipstx39 | mipstx39el \
| mn10200 | mn10300 \ | mn10200 | mn10300 \
| moxie \ | moxie \
| mt \ | mt \
| msp430 \ | msp430 \
- | nds32 | nds32le | nds32be\+ | nds32 | nds32le | nds32be \
- | nios | nios2 \+ | nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \ | ns16k | ns32k \
- | or32 \+ | open8 \
+ | or1k | or32 \
| pdp10 | pdp11 | pj | pjl \ | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \+ | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \ | pyramid \
- | rx \+ | rl78 | rx \
| score \ | score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \ | sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu | strongarm \+ | spu \
- | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \ | ubicom32 \
- | v850 | v850e \+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \ | we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \+ | x86 | xc16x | xstormy16 | xtensa \
| z8k | z80) | z8k | z80)
basic_machine=$basic_machine-unknown basic_machine=$basic_machine-unknown
;; ;;
@@ -314,8 +325,7 @@ case $basic_machine in
c6x) c6x)
basic_machine=tic6x-unknown basic_machine=tic6x-unknown
;; ;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
- # Motorola 68HC11/12.
basic_machine=$basic_machine-unknown basic_machine=$basic_machine-unknown
os=-none os=-none
;; ;;
@@ -325,12 +335,27 @@ case $basic_machine in
basic_machine=mt-unknown basic_machine=mt-unknown
;; ;;
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+ xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
+
+ xscaleel)
+ basic_machine=armel-unknown
+ ;;
+
# We use `pc' rather than `unknown' # We use `pc' rather than `unknown'
# because (1) that's what they normally are, and # because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users. # (2) the word "unknown" tends to confuse beginning users.
i*86 | x86_64) i*86 | x86_64)
- basic_machine=$basic_machine-pc+ basic_machine=$basic_machine-pc
- ;;+ ;;
# Object if more than one company name word. # Object if more than one company name word.
*-*-*) *-*-*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -339,25 +364,31 @@ case $basic_machine in
# Recognize the basic CPU types with company name. # Recognize the basic CPU types with company name.
580-* \ 580-* \
| a29k-* \ | a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \ | avr-* | avr32-* \
+ | be32-* | be64-* \
| bfin-* | bs2000-* \ | bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \
- | clipper-* | craynv-* | cydra-* \+ | c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \ | d10v-* | d30v-* | dlx-* \
| elxsi-* \ | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \ | h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \ | i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \ | ip2k-* | iq2000-* \
+ | k1om-* \
+ | le32-* | le64-* \
| lm32-* \ | lm32-* \
| m32c-* | m32r-* | m32rle-* \ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | microblaze-* | microblazeel-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \ | mips16-* \
| mips64-* | mips64el-* \ | mips64-* | mips64el-* \
@@ -375,31 +406,34 @@ case $basic_machine in
| mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \ | mipstx39-* | mipstx39el-* \
| mmix-* \ | mmix-* \
| mt-* \ | mt-* \
| msp430-* \ | msp430-* \
| nds32-* | nds32le-* | nds32be-* \ | nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* \+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \ | none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
| orion-* \ | orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \ | pyramid-* \
- | romp-* | rs6000-* | rx-* \+ | rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \ | sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \+ | tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile-* | tilegx-* \+ | tile*-* \
| tron-* \ | tron-* \
| ubicom32-* \ | ubicom32-* \
- | v850-* | v850e-* | vax-* \+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ | vax-* \
| we32k-* \ | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \+ | x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \ | xstormy16-* | xtensa*-* \
| ymp-* \ | ymp-* \
| z8k-* | z80-*) | z8k-* | z80-*)
@@ -539,7 +573,7 @@ case $basic_machine in
basic_machine=craynv-cray basic_machine=craynv-cray
os=-unicosmp os=-unicosmp
;; ;;
- cr16)+ cr16 | cr16-*)
basic_machine=cr16-unknown basic_machine=cr16-unknown
os=-elf os=-elf
;; ;;
@@ -697,7 +731,6 @@ case $basic_machine in
i370-ibm* | ibm*) i370-ibm* | ibm*)
basic_machine=i370-ibm basic_machine=i370-ibm
;; ;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i*86v32) i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32 os=-sysv32
@@ -755,11 +788,15 @@ case $basic_machine in
basic_machine=ns32k-utek basic_machine=ns32k-utek
os=-sysv os=-sysv
;; ;;
- microblaze)+ microblaze*)
basic_machine=microblaze-xilinx basic_machine=microblaze-xilinx
;; ;;
+ mingw64)
+ basic_machine=x86_64-pc
+ os=-mingw64
+ ;;
mingw32) mingw32)
- basic_machine=i386-pc+ basic_machine=i686-pc
os=-mingw32 os=-mingw32
;; ;;
mingw32ce) mingw32ce)
@@ -794,10 +831,18 @@ case $basic_machine in
ms1-*) ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;; ;;
+ msys)
+ basic_machine=i686-pc
+ os=-msys
+ ;;
mvs) mvs)
basic_machine=i370-ibm basic_machine=i370-ibm
os=-mvs os=-mvs
;; ;;
+ nacl)
+ basic_machine=le32-unknown
+ os=-nacl
+ ;;
ncr3000) ncr3000)
basic_machine=i486-ncr basic_machine=i486-ncr
os=-sysv4 os=-sysv4
@@ -950,9 +995,10 @@ case $basic_machine in
;; ;;
power) basic_machine=power-ibm power) basic_machine=power-ibm
;; ;;
- ppc) basic_machine=powerpc-unknown+ ppc | ppcbe) basic_machine=powerpc-unknown
;; ;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`+ ppc-* | ppcbe-*)
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ;;
ppcle | powerpclittle | ppc-le | powerpc-little) ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown basic_machine=powerpcle-unknown
@@ -977,7 +1023,11 @@ case $basic_machine in
basic_machine=i586-unknown basic_machine=i586-unknown
os=-pw32 os=-pw32
;; ;;
- rdos)+ rdos | rdos64)
+ basic_machine=x86_64-pc
+ os=-rdos
+ ;;
+ rdos32)
basic_machine=i386-pc basic_machine=i386-pc
os=-rdos os=-rdos
;; ;;
@@ -1046,6 +1096,9 @@ case $basic_machine in
basic_machine=i860-stratus basic_machine=i860-stratus
os=-sysv4 os=-sysv4
;; ;;
+ strongarm-* | thumb-*)
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
sun2) sun2)
basic_machine=m68000-sun basic_machine=m68000-sun
;; ;;
@@ -1102,13 +1155,8 @@ case $basic_machine in
basic_machine=t90-cray basic_machine=t90-cray
os=-unicos os=-unicos
;; ;;
- # This must be matched before tile*.
- tilegx*)
- basic_machine=tilegx-unknown
- os=-linux-gnu
- ;;
tile*) tile*)
- basic_machine=tile-unknown+ basic_machine=$basic_machine-unknown
os=-linux-gnu os=-linux-gnu
;; ;;
tx39) tx39)
@@ -1178,6 +1226,9 @@ case $basic_machine in
xps | xps100) xps | xps100)
basic_machine=xps100-honeywell basic_machine=xps100-honeywell
;; ;;
+ xscale-* | xscalee[bl]-*)
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ ;;
ymp) ymp)
basic_machine=ymp-cray basic_machine=ymp-cray
os=-unicos os=-unicos
@@ -1303,21 +1354,21 @@ case $os in
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* \+ | -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \ | -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -openbsd* | -solidbsd* \+ | -bitrig* | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \ | -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-android* \+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-uclibc* \+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \ | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1449,9 +1500,6 @@ case $os in
-aros*) -aros*)
os=-aros os=-aros
;; ;;
- -kaos*)
- os=-kaos
- ;;
-zvmoe) -zvmoe)
os=-zvmoe os=-zvmoe
;; ;;
@@ -1500,6 +1548,12 @@ case $basic_machine in
c4x-* | tic4x-*) c4x-* | tic4x-*)
os=-coff os=-coff
;; ;;
+ c8051-*)
+ os=-elf
+ ;;
+ hexagon-*)
+ os=-elf
+ ;;
tic54x-*) tic54x-*)
os=-coff os=-coff
;; ;;
@@ -1527,9 +1581,6 @@ case $basic_machine in
;; ;;
m68000-sun) m68000-sun)
os=-sunos3 os=-sunos3
- # This also exists in the configure program, but was not the
- # default.
- # os=-sunos4
;; ;;
m68*-cisco) m68*-cisco)
os=-aout os=-aout
@@ -1543,6 +1594,9 @@ case $basic_machine in
mips*-*) mips*-*)
os=-elf os=-elf
;; ;;
+ or1k-*)
+ os=-elf
+ ;;
or32-*) or32-*)
os=-coff os=-coff
;; ;;
contrib/ncurses/configure
@@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
-# From configure.in Revision: 1.520 .+# From configure.in Revision: 1.577 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20101002.+# Generated by Autoconf 2.52.20121002.
# #
# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
@@ -171,15 +171,16 @@ x_libraries=NONE
bindir='${exec_prefix}/bin' bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin' sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec' libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
sysconfdir='${prefix}/etc' sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com' sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var' localstatedir='${prefix}/var'
libdir='${exec_prefix}/lib' libdir='${exec_prefix}/lib'
includedir='${prefix}/include' includedir='${prefix}/include'
oldincludedir='/usr/include' oldincludedir='/usr/include'
-infodir='${prefix}/info'+infodir='${datarootdir}/info'
-mandir='${prefix}/man'+mandir='${datarootdir}/man'
# Identity of this package. # Identity of this package.
PACKAGE_NAME= PACKAGE_NAME=
@@ -230,6 +231,13 @@ do
| --da=*) | --da=*)
datadir=$ac_optarg ;; datadir=$ac_optarg ;;
+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+ | --dataroo | --dataro | --datar)
+ ac_prev=datarootdir ;;
+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+ datarootdir=$ac_optarg ;;
+
-disable-* | --disable-*) -disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names. # Reject names that are not valid shell variable names.
@@ -505,7 +513,7 @@ do
done done
# Be sure to have absolute paths. # Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \+for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \
localstatedir libdir includedir oldincludedir infodir mandir localstatedir libdir includedir oldincludedir infodir mandir
do do
eval ac_val=$`echo $ac_var` eval ac_val=$`echo $ac_var`
@@ -654,15 +662,16 @@ Fine tuning of the installation directories:
--bindir=DIR user executables [EPREFIX/bin] --bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin] --sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec] --libexecdir=DIR program executables [EPREFIX/libexec]
- --datadir=DIR read-only architecture-independent data [PREFIX/share]+ --datarootdir=DIR read-only architecture-independent data [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
--sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var] --localstatedir=DIR modifiable single-machine data [PREFIX/var]
--libdir=DIR object code libraries [EPREFIX/lib] --libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include] --includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --infodir=DIR info documentation [PREFIX/info]+ --infodir=DIR info documentation [DATAROOTDIR/info]
- --mandir=DIR man documentation [PREFIX/man]+ --mandir=DIR man documentation [DATAROOTDIR/man]
EOF EOF
cat <<\EOF cat <<\EOF
@@ -694,14 +703,16 @@ Optional Features:
--with-rel-version=XXX override derived release version --with-rel-version=XXX override derived release version
--with-abi-version=XXX override derived ABI version --with-abi-version=XXX override derived ABI version
--with-system-type=XXX test: override derived host system-type --with-system-type=XXX test: override derived host system-type
+ --without-ada suppress check for Ada95, don't build demo
--without-cxx do not adjust ncurses bool to match C++ --without-cxx do not adjust ncurses bool to match C++
--without-cxx-binding do not build C++ binding and demo --without-cxx-binding do not build C++ binding and demo
- --without-ada suppress check for Ada95, don't build demo+ --disable-db-install suppress install of terminal database
--without-manpages suppress install of manpages --without-manpages suppress install of manpages
- --without-progs suppress build with programs (e.g., tic)+ --without-progs suppress build/install with programs (e.g., tic)
- --without-tests suppress build with test-programs+ --without-tests suppress build/install with test-programs
--without-curses-h install curses.h as ncurses.h only --without-curses-h install curses.h as ncurses.h only
--with-pkg-config{=path} enable/disable use of pkg-config --with-pkg-config{=path} enable/disable use of pkg-config
+ --with-pkg-config-libdir=XXX use given directory for installing pc-files
--enable-pc-files generate and install .pc files for pkg-config --enable-pc-files generate and install .pc files for pkg-config
--enable-mixed-case tic should assume mixed-case filenames --enable-mixed-case tic should assume mixed-case filenames
--with-install-prefix prefixes actual install-location ($DESTDIR) --with-install-prefix prefixes actual install-location ($DESTDIR)
@@ -719,6 +730,8 @@ Options to Specify the Libraries Built/Used:
--with-normal generate normal-libraries (default) --with-normal generate normal-libraries (default)
--with-debug generate debug-libraries (default) --with-debug generate debug-libraries (default)
--with-profile generate profile-libraries --with-profile generate profile-libraries
+ --with-cxx-shared generate C++ shared-libraries
+ --with-lib-prefix override library-prefix
--with-termlib generate separate terminfo library --with-termlib generate separate terminfo library
--with-ticlib generate separate tic library --with-ticlib generate separate tic library
--with-gpm use Alessandro Rubini's GPM library --with-gpm use Alessandro Rubini's GPM library
@@ -735,6 +748,7 @@ Fine-Tuning Your Configuration:
--with-hashed-db specify hashed-database library --with-hashed-db specify hashed-database library
--with-fallbacks=XXX specify list of fallback terminal descriptions --with-fallbacks=XXX specify list of fallback terminal descriptions
--without-xterm-new specify if xterm terminfo should be old version --without-xterm-new specify if xterm terminfo should be old version
+ --with-xterm-kbs=XXX specify if xterm backspace sends BS or DEL
--with-terminfo-dirs=XXX specify list of terminfo directories (default: DATADIR/terminfo) --with-terminfo-dirs=XXX specify list of terminfo directories (default: DATADIR/terminfo)
--with-default-terminfo-dir=DIR default terminfo directory (default: DATADIR/terminfo) --with-default-terminfo-dir=DIR default terminfo directory (default: DATADIR/terminfo)
--disable-big-core assume machine has little memory --disable-big-core assume machine has little memory
@@ -759,6 +773,7 @@ Fine-Tuning Your Configuration:
--with-ospeed=TYPE override type of ospeed variable --with-ospeed=TYPE override type of ospeed variable
--with-mmask-t=TYPE override type of mmask_t --with-mmask-t=TYPE override type of mmask_t
--with-ccharw-max=XXX override size CCHARW_MAX --with-ccharw-max=XXX override size CCHARW_MAX
+ --with-tparm-arg=TYPE override parameter type of tparm
--with-rcs-ids compile-in RCS identifiers --with-rcs-ids compile-in RCS identifiers
Options to Specify How Manpages are Installed: Options to Specify How Manpages are Installed:
--with-manpage-format specify manpage-format: gzip/compress/BSDI/normal and --with-manpage-format specify manpage-format: gzip/compress/BSDI/normal and
@@ -796,8 +811,9 @@ Experimental Code:
--disable-scroll-hints compile without scroll-hints code --disable-scroll-hints compile without scroll-hints code
--enable-wgetch-events compile with experimental wgetch-events code --enable-wgetch-events compile with experimental wgetch-events code
Testing/development Options: Testing/development Options:
- --enable-echo build: display "compiling" commands (default)+ --disable-echo do not display "compiling" commands
--enable-warnings build: turn on GCC compiler warnings --enable-warnings build: turn on GCC compiler warnings
+ --enable-string-hacks work around bogus compiler/loader warnings
--enable-assertions test: turn on generation of assertion code --enable-assertions test: turn on generation of assertion code
--with-dmalloc test: use Gray Watson's dmalloc library --with-dmalloc test: use Gray Watson's dmalloc library
--with-dbmalloc test: use Conor Cahill's dbmalloc library --with-dbmalloc test: use Conor Cahill's dbmalloc library
@@ -883,7 +899,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20101002. Invocation command line was+generated by GNU Autoconf 2.52.20121002. Invocation command line was
$ $0 $@ $ $0 $@
@@ -1007,7 +1023,7 @@ if test -z "$CONFIG_SITE"; then
fi fi
for ac_site_file in $CONFIG_SITE; do for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then if test -r "$ac_site_file"; then
- { echo "$as_me:1010: loading site script $ac_site_file" >&5+ { echo "$as_me:1026: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;} echo "$as_me: loading site script $ac_site_file" >&6;}
cat "$ac_site_file" >&5 cat "$ac_site_file" >&5
. "$ac_site_file" . "$ac_site_file"
@@ -1018,7 +1034,7 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special # Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that. # files actually), so we avoid doing that.
if test -f "$cache_file"; then if test -f "$cache_file"; then
- { echo "$as_me:1021: loading cache $cache_file" >&5+ { echo "$as_me:1037: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;} echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in case $cache_file in
[\\/]* | ?:[\\/]* ) . $cache_file;; [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1026,7 +1042,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
esac esac
fi fi
else else
- { echo "$as_me:1029: creating cache $cache_file" >&5+ { echo "$as_me:1045: creating cache $cache_file" >&5
echo "$as_me: creating cache $cache_file" >&6;} echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file >$cache_file
fi fi
@@ -1042,21 +1058,21 @@ for ac_var in `(set) 2>&1 |
eval ac_new_val="\$ac_env_${ac_var}_value" eval ac_new_val="\$ac_env_${ac_var}_value"
case $ac_old_set,$ac_new_set in case $ac_old_set,$ac_new_set in
set,) set,)
- { echo "$as_me:1045: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5+ { echo "$as_me:1061: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;; ac_cache_corrupted=: ;;
,set) ,set)
- { echo "$as_me:1049: error: \`$ac_var' was not set in the previous run" >&5+ { echo "$as_me:1065: error: \`$ac_var' was not set in the previous run" >&5
echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;; ac_cache_corrupted=: ;;
,);; ,);;
*) *)
if test "x$ac_old_val" != "x$ac_new_val"; then if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:1055: error: \`$ac_var' has changed since the previous run:" >&5+ { echo "$as_me:1071: error: \`$ac_var' has changed since the previous run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:1057: former value: $ac_old_val" >&5+ { echo "$as_me:1073: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;} echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:1059: current value: $ac_new_val" >&5+ { echo "$as_me:1075: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;} echo "$as_me: current value: $ac_new_val" >&2;}
ac_cache_corrupted=: ac_cache_corrupted=:
fi;; fi;;
@@ -1075,9 +1091,9 @@ echo "$as_me: current value: $ac_new_val" >&2;}
fi fi
done done
if $ac_cache_corrupted; then if $ac_cache_corrupted; then
- { echo "$as_me:1078: error: changes in the environment can compromise the build" >&5+ { echo "$as_me:1094: error: changes in the environment can compromise the build" >&5
echo "$as_me: error: changes in the environment can compromise the build" >&2;} echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:1080: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5+ { { echo "$as_me:1096: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@@ -1098,10 +1114,10 @@ esac
echo "#! $SHELL" >conftest.sh echo "#! $SHELL" >conftest.sh
echo "exit 0" >>conftest.sh echo "exit 0" >>conftest.sh
chmod +x conftest.sh chmod +x conftest.sh
-if { (echo "$as_me:1101: PATH=\".;.\"; conftest.sh") >&5+if { (echo "$as_me:1117: PATH=\".;.\"; conftest.sh") >&5
(PATH=".;."; conftest.sh) 2>&5 (PATH=".;."; conftest.sh) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:1104: \$? = $ac_status" >&5+ echo "$as_me:1120: \$? = $ac_status" >&5
(exit $ac_status); }; then (exit $ac_status); }; then
ac_path_separator=';' ac_path_separator=';'
else else
@@ -1114,7 +1130,7 @@ ac_config_headers="$ac_config_headers include/ncurses_cfg.h:include/ncurses_cfg.
top_builddir=`pwd` top_builddir=`pwd`
-echo "$as_me:1117: checking for egrep" >&5+echo "$as_me:1133: checking for egrep" >&5
echo $ECHO_N "checking for egrep... $ECHO_C" >&6 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
if test "${ac_cv_prog_egrep+set}" = set; then if test "${ac_cv_prog_egrep+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1124,11 +1140,11 @@ else
else ac_cv_prog_egrep='egrep' else ac_cv_prog_egrep='egrep'
fi fi
fi fi
-echo "$as_me:1127: result: $ac_cv_prog_egrep" >&5+echo "$as_me:1143: result: $ac_cv_prog_egrep" >&5
echo "${ECHO_T}$ac_cv_prog_egrep" >&6 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
EGREP=$ac_cv_prog_egrep EGREP=$ac_cv_prog_egrep
-test -z "$EGREP" && { { echo "$as_me:1131: error: No egrep program found" >&5+test -z "$EGREP" && { { echo "$as_me:1147: error: No egrep program found" >&5
echo "$as_me: error: No egrep program found" >&2;} echo "$as_me: error: No egrep program found" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@@ -1138,7 +1154,7 @@ NCURSES_PATCH="`$ac_cv_prog_egrep '^NCURSES_PATCH[ ]*=' $srcdir/dist.mk | sed -
cf_cv_abi_version=${NCURSES_MAJOR} cf_cv_abi_version=${NCURSES_MAJOR}
cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
cf_cv_timestamp=`date` cf_cv_timestamp=`date`
-echo "$as_me:1141: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5+echo "$as_me:1157: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0 test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
@@ -1146,7 +1162,7 @@ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
# Check whether --with-rel-version or --without-rel-version was given. # Check whether --with-rel-version or --without-rel-version was given.
if test "${with_rel_version+set}" = set; then if test "${with_rel_version+set}" = set; then
withval="$with_rel_version" withval="$with_rel_version"
- { echo "$as_me:1149: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5+ { echo "$as_me:1165: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;} echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
cf_cv_rel_version=$withval cf_cv_rel_version=$withval
fi; fi;
@@ -1159,13 +1175,13 @@ if test -n "$NCURSES_MAJOR" ; then
[0-9]*) #(vi [0-9]*) #(vi
;; ;;
*) *)
- { { echo "$as_me:1162: error: Release major-version is not a number: $NCURSES_MAJOR" >&5+ { { echo "$as_me:1178: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;} echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
;; ;;
esac esac
else else
- { { echo "$as_me:1168: error: Release major-version value is empty" >&5+ { { echo "$as_me:1184: error: Release major-version value is empty" >&5
echo "$as_me: error: Release major-version value is empty" >&2;} echo "$as_me: error: Release major-version value is empty" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@@ -1175,13 +1191,13 @@ if test -n "$NCURSES_MINOR" ; then
[0-9]*) #(vi [0-9]*) #(vi
;; ;;
*) *)
- { { echo "$as_me:1178: error: Release minor-version is not a number: $NCURSES_MINOR" >&5+ { { echo "$as_me:1194: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;} echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
;; ;;
esac esac
else else
- { { echo "$as_me:1184: error: Release minor-version value is empty" >&5+ { { echo "$as_me:1200: error: Release minor-version value is empty" >&5
echo "$as_me: error: Release minor-version value is empty" >&2;} echo "$as_me: error: Release minor-version value is empty" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@@ -1191,7 +1207,7 @@ test -z "$cf_cv_abi_version" && cf_cv_abi_version=0
# Check whether --with-abi-version or --without-abi-version was given. # Check whether --with-abi-version or --without-abi-version was given.
if test "${with_abi_version+set}" = set; then if test "${with_abi_version+set}" = set; then
withval="$with_abi_version" withval="$with_abi_version"
- { echo "$as_me:1194: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5+ { echo "$as_me:1210: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;} echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
cf_cv_abi_version=$withval cf_cv_abi_version=$withval
fi; fi;
@@ -1201,13 +1217,13 @@ if test -n "$cf_cv_abi_version" ; then
[0-9]*) #(vi [0-9]*) #(vi
;; ;;
*) *)
- { { echo "$as_me:1204: error: ABI version is not a number: $cf_cv_abi_version" >&5+ { { echo "$as_me:1220: error: ABI version is not a number: $cf_cv_abi_version" >&5
echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;} echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
;; ;;
esac esac
else else
- { { echo "$as_me:1210: error: ABI version value is empty" >&5+ { { echo "$as_me:1226: error: ABI version value is empty" >&5
echo "$as_me: error: ABI version value is empty" >&2;} echo "$as_me: error: ABI version value is empty" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@@ -1229,7 +1245,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
fi fi
done done
if test -z "$ac_aux_dir"; then if test -z "$ac_aux_dir"; then
- { { echo "$as_me:1232: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5+ { { echo "$as_me:1248: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@@ -1239,11 +1255,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
# Make sure we can run config.sub. # Make sure we can run config.sub.
$ac_config_sub sun4 >/dev/null 2>&1 || $ac_config_sub sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:1242: error: cannot run $ac_config_sub" >&5+ { { echo "$as_me:1258: error: cannot run $ac_config_sub" >&5
echo "$as_me: error: cannot run $ac_config_sub" >&2;} echo "$as_me: error: cannot run $ac_config_sub" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
-echo "$as_me:1246: checking build system type" >&5+echo "$as_me:1262: checking build system type" >&5
echo $ECHO_N "checking build system type... $ECHO_C" >&6 echo $ECHO_N "checking build system type... $ECHO_C" >&6
if test "${ac_cv_build+set}" = set; then if test "${ac_cv_build+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1252,23 +1268,23 @@ else
test -z "$ac_cv_build_alias" && test -z "$ac_cv_build_alias" &&
ac_cv_build_alias=`$ac_config_guess` ac_cv_build_alias=`$ac_config_guess`
test -z "$ac_cv_build_alias" && test -z "$ac_cv_build_alias" &&
- { { echo "$as_me:1255: error: cannot guess build type; you must specify one" >&5+ { { echo "$as_me:1271: error: cannot guess build type; you must specify one" >&5
echo "$as_me: error: cannot guess build type; you must specify one" >&2;} echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
- { { echo "$as_me:1259: error: $ac_config_sub $ac_cv_build_alias failed." >&5+ { { echo "$as_me:1275: error: $ac_config_sub $ac_cv_build_alias failed." >&5
echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
-echo "$as_me:1264: result: $ac_cv_build" >&5+echo "$as_me:1280: result: $ac_cv_build" >&5
echo "${ECHO_T}$ac_cv_build" >&6 echo "${ECHO_T}$ac_cv_build" >&6
build=$ac_cv_build build=$ac_cv_build
build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$as_me:1271: checking host system type" >&5+echo "$as_me:1287: checking host system type" >&5
echo $ECHO_N "checking host system type... $ECHO_C" >&6 echo $ECHO_N "checking host system type... $ECHO_C" >&6
if test "${ac_cv_host+set}" = set; then if test "${ac_cv_host+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1277,12 +1293,12 @@ else
test -z "$ac_cv_host_alias" && test -z "$ac_cv_host_alias" &&
ac_cv_host_alias=$ac_cv_build_alias ac_cv_host_alias=$ac_cv_build_alias
ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
- { { echo "$as_me:1280: error: $ac_config_sub $ac_cv_host_alias failed" >&5+ { { echo "$as_me:1296: error: $ac_config_sub $ac_cv_host_alias failed" >&5
echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
-echo "$as_me:1285: result: $ac_cv_host" >&5+echo "$as_me:1301: result: $ac_cv_host" >&5
echo "${ECHO_T}$ac_cv_host" >&6 echo "${ECHO_T}$ac_cv_host" >&6
host=$ac_cv_host host=$ac_cv_host
host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1290,7 +1306,7 @@ host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
- echo "$as_me:1293: checking target system type" >&5+ echo "$as_me:1309: checking target system type" >&5
echo $ECHO_N "checking target system type... $ECHO_C" >&6 echo $ECHO_N "checking target system type... $ECHO_C" >&6
if test "${ac_cv_target+set}" = set; then if test "${ac_cv_target+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1299,12 +1315,12 @@ else
test "x$ac_cv_target_alias" = "x" && test "x$ac_cv_target_alias" = "x" &&
ac_cv_target_alias=$ac_cv_host_alias ac_cv_target_alias=$ac_cv_host_alias
ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
- { { echo "$as_me:1302: error: $ac_config_sub $ac_cv_target_alias failed" >&5+ { { echo "$as_me:1318: error: $ac_config_sub $ac_cv_target_alias failed" >&5
echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
-echo "$as_me:1307: result: $ac_cv_target" >&5+echo "$as_me:1323: result: $ac_cv_target" >&5
echo "${ECHO_T}$ac_cv_target" >&6 echo "${ECHO_T}$ac_cv_target" >&6
target=$ac_cv_target target=$ac_cv_target
target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1324,7 +1340,8 @@ else
system_name="`(hostname) 2>/dev/null`" system_name="`(hostname) 2>/dev/null`"
fi fi
fi fi
-test -n "$system_name" && cat >>confdefs.h <<EOF+test -n "$system_name" &&
+cat >>confdefs.h <<EOF
#define SYSTEM_NAME "$system_name" #define SYSTEM_NAME "$system_name"
EOF EOF
@@ -1335,13 +1352,13 @@ else
fi fi
test -z "$system_name" && system_name="$cf_cv_system_name" test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1338: result: Configuring for $cf_cv_system_name" >&5+test -n "$cf_cv_system_name" && echo "$as_me:1355: result: Configuring for $cf_cv_system_name" >&5
echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
if test ".$system_name" != ".$cf_cv_system_name" ; then if test ".$system_name" != ".$cf_cv_system_name" ; then
- echo "$as_me:1342: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5+ echo "$as_me:1359: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
- { { echo "$as_me:1344: error: \"Please remove config.cache and try again.\"" >&5+ { { echo "$as_me:1361: error: \"Please remove config.cache and try again.\"" >&5
echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@@ -1349,9 +1366,11 @@ fi
# Check whether --with-system-type or --without-system-type was given. # Check whether --with-system-type or --without-system-type was given.
if test "${with_system_type+set}" = set; then if test "${with_system_type+set}" = set; then
withval="$with_system_type" withval="$with_system_type"
- { echo "$as_me:1352: WARNING: overriding system type to $withval" >&5+ { echo "$as_me:1369: WARNING: overriding system type to $withval" >&5
echo "$as_me: WARNING: overriding system type to $withval" >&2;} echo "$as_me: WARNING: overriding system type to $withval" >&2;}
- cf_cv_system_name=$withval+ cf_cv_system_name=$withval
+ host_os=$withval
+
fi; fi;
### Save the given $CFLAGS to allow user-override. ### Save the given $CFLAGS to allow user-override.
@@ -1359,23 +1378,23 @@ cf_user_CFLAGS="$CFLAGS"
### Default install-location ### Default install-location
-echo "$as_me:1362: checking for prefix" >&5+echo "$as_me:1381: checking for prefix" >&5
echo $ECHO_N "checking for prefix... $ECHO_C" >&6 echo $ECHO_N "checking for prefix... $ECHO_C" >&6
if test "x$prefix" = "xNONE" ; then if test "x$prefix" = "xNONE" ; then
case "$cf_cv_system_name" in case "$cf_cv_system_name" in
# non-vendor systems don't have a conflict # non-vendor systems don't have a conflict
- openbsd*|freebsd*|linux*|cygwin*|k*bsd*-gnu)+ openbsd*|freebsd*|mirbsd*|linux*|cygwin*|msys*|k*bsd*-gnu|mingw*)
prefix=/usr prefix=/usr
;; ;;
*) prefix=$ac_default_prefix *) prefix=$ac_default_prefix
;; ;;
esac esac
fi fi
-echo "$as_me:1374: result: $prefix" >&5+echo "$as_me:1393: result: $prefix" >&5
echo "${ECHO_T}$prefix" >&6 echo "${ECHO_T}$prefix" >&6
if test "x$prefix" = "xNONE" ; then if test "x$prefix" = "xNONE" ; then
-echo "$as_me:1378: checking for default include-directory" >&5+echo "$as_me:1397: checking for default include-directory" >&5
echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
test -n "$verbose" && echo 1>&6 test -n "$verbose" && echo 1>&6
for cf_symbol in \ for cf_symbol in \
@@ -1398,11 +1417,26 @@ do
fi fi
test -n "$verbose" && echo " tested $cf_dir" 1>&6 test -n "$verbose" && echo " tested $cf_dir" 1>&6
done done
-echo "$as_me:1401: result: $includedir" >&5+echo "$as_me:1420: result: $includedir" >&5
echo "${ECHO_T}$includedir" >&6 echo "${ECHO_T}$includedir" >&6
fi fi
### Checks for programs. ### Checks for programs.
+
+# Check whether --with-ada or --without-ada was given.
+if test "${with_ada+set}" = set; then
+ withval="$with_ada"
+ cf_with_ada=$withval
+else
+ cf_with_ada=yes
+fi;
+if test "x$cf_with_ada" = xyes
+then
+ cf_PROG_CC="gnatgcc gcc cc"
+else
+ cf_PROG_CC="gcc cc"
+fi
+
ac_ext=c ac_ext=c
ac_cpp='$CPP $CPPFLAGS' ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -1410,213 +1444,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_main_return=return ac_main_return=return
if test -n "$ac_tool_prefix"; then 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.+ for ac_prog in $cf_PROG_CC
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1415: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1430: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:1438: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:1441: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:1450: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1465: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:1473: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
- echo "$as_me:1476: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1489: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1504: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:1512: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:1515: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:1524: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1539: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:1547: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
- echo "$as_me:1550: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:1563: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
-fi
-ac_cv_prog_CC="cc"
-echo "$as_me:1583: found $ac_dir/$ac_word" >&5
-break
-done
-
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- set dummy "$ac_dir/$ac_word" ${1+"$@"}
- shift
- ac_cv_prog_CC="$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:1605: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:1608: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl
do do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. # 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 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1619: checking for $ac_word" >&5+echo "$as_me:1451: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1631,7 +1463,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue $as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="$ac_tool_prefix$ac_prog" ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1634: found $ac_dir/$ac_word" >&5+echo "$as_me:1466: found $ac_dir/$ac_word" >&5
break break
done done
@@ -1639,10 +1471,10 @@ fi
fi fi
CC=$ac_cv_prog_CC CC=$ac_cv_prog_CC
if test -n "$CC"; then if test -n "$CC"; then
- echo "$as_me:1642: result: $CC" >&5+ echo "$as_me:1474: result: $CC" >&5
echo "${ECHO_T}$CC" >&6 echo "${ECHO_T}$CC" >&6
else else
- echo "$as_me:1645: result: no" >&5+ echo "$as_me:1477: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
@@ -1651,11 +1483,11 @@ fi
fi fi
if test -z "$CC"; then if test -z "$CC"; then
ac_ct_CC=$CC ac_ct_CC=$CC
- for ac_prog in cl+ for ac_prog in $cf_PROG_CC
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1658: checking for $ac_word" >&5+echo "$as_me:1490: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1670,7 +1502,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue $as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="$ac_prog" ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1673: found $ac_dir/$ac_word" >&5+echo "$as_me:1505: found $ac_dir/$ac_word" >&5
break break
done done
@@ -1678,10 +1510,10 @@ fi
fi fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then if test -n "$ac_ct_CC"; then
- echo "$as_me:1681: result: $ac_ct_CC" >&5+ echo "$as_me:1513: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6 echo "${ECHO_T}$ac_ct_CC" >&6
else else
- echo "$as_me:1684: result: no" >&5+ echo "$as_me:1516: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
@@ -1691,34 +1523,32 @@ done
CC=$ac_ct_CC CC=$ac_ct_CC
fi fi
-fi+test -z "$CC" && { { echo "$as_me:1526: error: no acceptable cc found in \$PATH" >&5
-
-test -z "$CC" && { { echo "$as_me:1696: error: no acceptable cc found in \$PATH" >&5
echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
# Provide some information about the compiler. # Provide some information about the compiler.
-echo "$as_me:1701:" \+echo "$as_me:1531:" \
"checking for C compiler version" >&5 "checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2` ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1704: \"$ac_compiler --version </dev/null >&5\"") >&5+{ (eval echo "$as_me:1534: \"$ac_compiler --version </dev/null >&5\"") >&5
(eval $ac_compiler --version </dev/null >&5) 2>&5 (eval $ac_compiler --version </dev/null >&5) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:1707: \$? = $ac_status" >&5+ echo "$as_me:1537: \$? = $ac_status" >&5
(exit $ac_status); } (exit $ac_status); }
-{ (eval echo "$as_me:1709: \"$ac_compiler -v </dev/null >&5\"") >&5+{ (eval echo "$as_me:1539: \"$ac_compiler -v </dev/null >&5\"") >&5
(eval $ac_compiler -v </dev/null >&5) 2>&5 (eval $ac_compiler -v </dev/null >&5) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:1712: \$? = $ac_status" >&5+ echo "$as_me:1542: \$? = $ac_status" >&5
(exit $ac_status); } (exit $ac_status); }
-{ (eval echo "$as_me:1714: \"$ac_compiler -V </dev/null >&5\"") >&5+{ (eval echo "$as_me:1544: \"$ac_compiler -V </dev/null >&5\"") >&5
(eval $ac_compiler -V </dev/null >&5) 2>&5 (eval $ac_compiler -V </dev/null >&5) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:1717: \$? = $ac_status" >&5+ echo "$as_me:1547: \$? = $ac_status" >&5
(exit $ac_status); } (exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
-#line 1721 "configure"+#line 1551 "configure"
#include "confdefs.h" #include "confdefs.h"
int int
@@ -1734,13 +1564,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
# Try to create an executable without -o first, disregard a.out. # Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition # It will help us diagnose broken compilers, and finding out an intuition
# of exeext. # of exeext.
-echo "$as_me:1737: checking for C compiler default output" >&5+echo "$as_me:1567: checking for C compiler default output" >&5
echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1740: \"$ac_link_default\"") >&5+if { (eval echo "$as_me:1570: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5 (eval $ac_link_default) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:1743: \$? = $ac_status" >&5+ echo "$as_me:1573: \$? = $ac_status" >&5
(exit $ac_status); }; then (exit $ac_status); }; then
# Find the output, starting from the most likely. This scheme is # Find the output, starting from the most likely. This scheme is
# not robust to junk in `.', hence go to wildcards (a.*) only as a last # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1763,34 +1593,34 @@ done
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1766: error: C compiler cannot create executables" >&5+{ { echo "$as_me:1596: error: C compiler cannot create executables" >&5
echo "$as_me: error: C compiler cannot create executables" >&2;} echo "$as_me: error: C compiler cannot create executables" >&2;}
{ (exit 77); exit 77; }; } { (exit 77); exit 77; }; }
fi fi
ac_exeext=$ac_cv_exeext ac_exeext=$ac_cv_exeext
-echo "$as_me:1772: result: $ac_file" >&5+echo "$as_me:1602: result: $ac_file" >&5
echo "${ECHO_T}$ac_file" >&6 echo "${ECHO_T}$ac_file" >&6
# Check the compiler produces executables we can run. If not, either # Check the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile. # the compiler is broken, or we cross compile.
-echo "$as_me:1777: checking whether the C compiler works" >&5+echo "$as_me:1607: checking whether the C compiler works" >&5
echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # 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 not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then if test "$cross_compiling" != yes; then
if { ac_try='./$ac_file' if { ac_try='./$ac_file'
- { (eval echo "$as_me:1783: \"$ac_try\"") >&5+ { (eval echo "$as_me:1613: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:1786: \$? = $ac_status" >&5+ echo "$as_me:1616: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
cross_compiling=no cross_compiling=no
else else
if test "$cross_compiling" = maybe; then if test "$cross_compiling" = maybe; then
cross_compiling=yes cross_compiling=yes
else else
- { { echo "$as_me:1793: error: cannot run C compiled programs.+ { { echo "$as_me:1623: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'." >&5 If you meant to cross compile, use \`--host'." >&5
echo "$as_me: error: cannot run C compiled programs. echo "$as_me: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'." >&2;} If you meant to cross compile, use \`--host'." >&2;}
@@ -1798,24 +1628,24 @@ If you meant to cross compile, use \`--host'." >&2;}
fi fi
fi fi
fi fi
-echo "$as_me:1801: result: yes" >&5+echo "$as_me:1631: result: yes" >&5
echo "${ECHO_T}yes" >&6 echo "${ECHO_T}yes" >&6
rm -f a.out a.exe conftest$ac_cv_exeext rm -f a.out a.exe conftest$ac_cv_exeext
ac_clean_files=$ac_clean_files_save ac_clean_files=$ac_clean_files_save
# Check the compiler produces executables we can run. If not, either # Check the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile. # the compiler is broken, or we cross compile.
-echo "$as_me:1808: checking whether we are cross compiling" >&5+echo "$as_me:1638: checking whether we are cross compiling" >&5
echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1810: result: $cross_compiling" >&5+echo "$as_me:1640: result: $cross_compiling" >&5
echo "${ECHO_T}$cross_compiling" >&6 echo "${ECHO_T}$cross_compiling" >&6
-echo "$as_me:1813: checking for executable suffix" >&5+echo "$as_me:1643: checking for executable suffix" >&5
echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1815: \"$ac_link\"") >&5+if { (eval echo "$as_me:1645: \"$ac_link\"") >&5
(eval $ac_link) 2>&5 (eval $ac_link) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:1818: \$? = $ac_status" >&5+ echo "$as_me:1648: \$? = $ac_status" >&5
(exit $ac_status); }; then (exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable) # If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
@@ -1831,25 +1661,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
esac esac
done done
else else
- { { echo "$as_me:1834: error: cannot compute EXEEXT: cannot compile and link" >&5+ { { echo "$as_me:1664: error: cannot compute EXEEXT: cannot compile and link" >&5
echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
rm -f conftest$ac_cv_exeext rm -f conftest$ac_cv_exeext
-echo "$as_me:1840: result: $ac_cv_exeext" >&5+echo "$as_me:1670: result: $ac_cv_exeext" >&5
echo "${ECHO_T}$ac_cv_exeext" >&6 echo "${ECHO_T}$ac_cv_exeext" >&6
rm -f conftest.$ac_ext rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT ac_exeext=$EXEEXT
-echo "$as_me:1846: checking for object suffix" >&5+echo "$as_me:1676: checking for object suffix" >&5
echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
if test "${ac_cv_objext+set}" = set; then if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
-#line 1852 "configure"+#line 1682 "configure"
#include "confdefs.h" #include "confdefs.h"
int int
@@ -1861,10 +1691,10 @@ main ()
} }
_ACEOF _ACEOF
rm -f conftest.o conftest.obj rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1864: \"$ac_compile\"") >&5+if { (eval echo "$as_me:1694: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:1867: \$? = $ac_status" >&5+ echo "$as_me:1697: \$? = $ac_status" >&5
(exit $ac_status); }; then (exit $ac_status); }; then
for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
case $ac_file in case $ac_file in
@@ -1876,24 +1706,24 @@ done
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1879: error: cannot compute OBJEXT: cannot compile" >&5+{ { echo "$as_me:1709: error: cannot compute OBJEXT: cannot compile" >&5
echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi fi
-echo "$as_me:1886: result: $ac_cv_objext" >&5+echo "$as_me:1716: result: $ac_cv_objext" >&5
echo "${ECHO_T}$ac_cv_objext" >&6 echo "${ECHO_T}$ac_cv_objext" >&6
OBJEXT=$ac_cv_objext OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT ac_objext=$OBJEXT
-echo "$as_me:1890: checking whether we are using the GNU C compiler" >&5+echo "$as_me:1720: checking whether we are using the GNU C compiler" >&5
echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
if test "${ac_cv_c_compiler_gnu+set}" = set; then if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
-#line 1896 "configure"+#line 1726 "configure"
#include "confdefs.h" #include "confdefs.h"
int int
@@ -1908,16 +1738,16 @@ main ()
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1911: \"$ac_compile\"") >&5+if { (eval echo "$as_me:1741: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:1914: \$? = $ac_status" >&5+ echo "$as_me:1744: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext' { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1917: \"$ac_try\"") >&5+ { (eval echo "$as_me:1747: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:1920: \$? = $ac_status" >&5+ echo "$as_me:1750: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
ac_compiler_gnu=yes ac_compiler_gnu=yes
else else
@@ -1929,19 +1759,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi fi
-echo "$as_me:1932: result: $ac_cv_c_compiler_gnu" >&5+echo "$as_me:1762: result: $ac_cv_c_compiler_gnu" >&5
echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
GCC=`test $ac_compiler_gnu = yes && echo yes` GCC=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CFLAGS=${CFLAGS+set} ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS ac_save_CFLAGS=$CFLAGS
CFLAGS="-g" CFLAGS="-g"
-echo "$as_me:1938: checking whether $CC accepts -g" >&5+echo "$as_me:1768: checking whether $CC accepts -g" >&5
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
if test "${ac_cv_prog_cc_g+set}" = set; then if test "${ac_cv_prog_cc_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
-#line 1944 "configure"+#line 1774 "configure"
#include "confdefs.h" #include "confdefs.h"
int int
@@ -1953,16 +1783,16 @@ main ()
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1956: \"$ac_compile\"") >&5+if { (eval echo "$as_me:1786: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:1959: \$? = $ac_status" >&5+ echo "$as_me:1789: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext' { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1962: \"$ac_try\"") >&5+ { (eval echo "$as_me:1792: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:1965: \$? = $ac_status" >&5+ echo "$as_me:1795: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes ac_cv_prog_cc_g=yes
else else
@@ -1972,7 +1802,7 @@ ac_cv_prog_cc_g=no
fi fi
rm -f conftest.$ac_objext conftest.$ac_ext rm -f conftest.$ac_objext conftest.$ac_ext
fi fi
-echo "$as_me:1975: result: $ac_cv_prog_cc_g" >&5+echo "$as_me:1805: result: $ac_cv_prog_cc_g" >&5
echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
if test "$ac_test_CFLAGS" = set; then if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS CFLAGS=$ac_save_CFLAGS
@@ -1999,16 +1829,16 @@ cat >conftest.$ac_ext <<_ACEOF
#endif #endif
_ACEOF _ACEOF
rm -f conftest.$ac_objext rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2002: \"$ac_compile\"") >&5+if { (eval echo "$as_me:1832: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:2005: \$? = $ac_status" >&5+ echo "$as_me:1835: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext' { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2008: \"$ac_try\"") >&5+ { (eval echo "$as_me:1838: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:2011: \$? = $ac_status" >&5+ echo "$as_me:1841: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
for ac_declaration in \ for ac_declaration in \
''\ ''\
@@ -2020,7 +1850,7 @@ if { (eval echo "$as_me:2002: \"$ac_compile\"") >&5
'void exit (int);' 'void exit (int);'
do do
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
-#line 2023 "configure"+#line 1853 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
$ac_declaration $ac_declaration
@@ -2033,16 +1863,16 @@ exit (42);
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2036: \"$ac_compile\"") >&5+if { (eval echo "$as_me:1866: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:2039: \$? = $ac_status" >&5+ echo "$as_me:1869: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext' { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2042: \"$ac_try\"") >&5+ { (eval echo "$as_me:1872: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:2045: \$? = $ac_status" >&5+ echo "$as_me:1875: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
: :
else else
@@ -2052,7 +1882,7 @@ continue
fi fi
rm -f conftest.$ac_objext conftest.$ac_ext rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
-#line 2055 "configure"+#line 1885 "configure"
#include "confdefs.h" #include "confdefs.h"
$ac_declaration $ac_declaration
int int
@@ -2064,16 +1894,16 @@ exit (42);
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2067: \"$ac_compile\"") >&5+if { (eval echo "$as_me:1897: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:2070: \$? = $ac_status" >&5+ echo "$as_me:1900: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext' { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2073: \"$ac_try\"") >&5+ { (eval echo "$as_me:1903: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:2076: \$? = $ac_status" >&5+ echo "$as_me:1906: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
break break
else else
@@ -2103,60 +1933,251 @@ ac_main_return=return
GCC_VERSION=none GCC_VERSION=none
if test "$GCC" = yes ; then if test "$GCC" = yes ; then
- echo "$as_me:2106: checking version of $CC" >&5+ echo "$as_me:1936: checking version of $CC" >&5
echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
- GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"+ GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
test -z "$GCC_VERSION" && GCC_VERSION=unknown test -z "$GCC_VERSION" && GCC_VERSION=unknown
- echo "$as_me:2110: result: $GCC_VERSION" >&5+ echo "$as_me:1940: result: $GCC_VERSION" >&5
echo "${ECHO_T}$GCC_VERSION" >&6 echo "${ECHO_T}$GCC_VERSION" >&6
fi fi
-ac_ext=c+echo "$as_me:1944: checking for $CC option to accept ANSI C" >&5
-ac_cpp='$CPP $CPPFLAGS'+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'+if test "${ac_cv_prog_cc_stdc+set}" = set; then
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_main_return=return
-echo "$as_me:2120: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
- # Double quotes because CPP needs to be expanded+ ac_cv_prog_cc_stdc=no
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"+ac_save_CC=$CC
- do+cat >conftest.$ac_ext <<_ACEOF
- ac_preproc_ok=false+#line 1952 "configure"
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # 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
-#line 2141 "configure"
#include "confdefs.h" #include "confdefs.h"
-#include <assert.h>+#include <stdarg.h>
- Syntax error+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
_ACEOF _ACEOF
-if { (eval echo "$as_me:2146: \"$ac_cpp conftest.$ac_ext\"") >&5+# Don't try gcc -ansi; that turns off useful extensions and
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1+# breaks some systems' header files.
+# AIX -qlanglvl=ansi
+# Ultrix and OSF/1 -std1
+# HP-UX 10.20 and later -Ae
+# HP-UX older versions -Aa -D_HPUX_SOURCE
+# SVR4 -Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2001: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err+ echo "$as_me:2004: \$? = $ac_status" >&5
- rm -f conftest.er1+ (exit $ac_status); } &&
- cat conftest.err >&5+ { ac_try='test -s conftest.$ac_objext'
- echo "$as_me:2152: \$? = $ac_status" >&5+ { (eval echo "$as_me:2007: \"$ac_try\"") >&5
- (exit $ac_status); } >/dev/null; then+ (eval $ac_try) 2>&5
- if test -s conftest.err; then+ ac_status=$?
- ac_cpp_err=$ac_c_preproc_warn_flag+ echo "$as_me:2010: \$? = $ac_status" >&5
- else+ (exit $ac_status); }; }; then
- ac_cpp_err=+ ac_cv_prog_cc_stdc=$ac_arg
- fi+break
-else+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext
+done
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
+
+fi
+
+case "x$ac_cv_prog_cc_stdc" in
+ x|xno)
+ echo "$as_me:2027: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+ *)
+ echo "$as_me:2030: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
+esac
+
+# This should have been defined by AC_PROG_CC
+: ${CC:=cc}
+
+echo "$as_me:2038: checking \$CC variable" >&5
+echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+case "$CC" in #(vi
+*[\ \ ]-[IUD]*)
+ echo "$as_me:2042: result: broken" >&5
+echo "${ECHO_T}broken" >&6
+ { echo "$as_me:2044: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
+ # humor him...
+ cf_flags=`echo "$CC" | sed -e 's/^[^ ]*[ ]//'`
+ CC=`echo "$CC" | sed -e 's/[ ].*//'`
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_flags
+do
+case $cf_fix_cppflags in
+no)
+ case $cf_add_cflags in #(vi
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+ case $cf_add_cflags in
+ -D*)
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=yes
+
+ if test $cf_fix_cppflags = yes ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ elif test "${cf_tst_cflags}" = "\"'" ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ fi
+ ;;
+ esac
+ case "$CPPFLAGS" in
+ *$cf_add_cflags) #(vi
+ ;;
+ *) #(vi
+ case $cf_add_cflags in #(vi
+ -D*)
+ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'`
+
+ ;;
+ esac
+ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+ ;;
+ esac
+ ;;
+ *)
+ cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+ ;;
+ esac
+ ;;
+yes)
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=no
+ ;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+ CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+ ;;
+*)
+ echo "$as_me:2130: result: ok" >&5
+echo "${ECHO_T}ok" >&6
+ ;;
+esac
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_main_return=return
+echo "$as_me:2141: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+ if test "${ac_cv_prog_CPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # 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
+#line 2162 "configure"
+#include "confdefs.h"
+#include <assert.h>
+ Syntax error
+_ACEOF
+if { (eval echo "$as_me:2167: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2173: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
ac_cpp_err=yes ac_cpp_err=yes
fi fi
if test -z "$ac_cpp_err"; then if test -z "$ac_cpp_err"; then
@@ -2172,17 +2193,17 @@ rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether non-existent headers # OK, works on sane cases. Now check whether non-existent headers
# can be detected and how. # can be detected and how.
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
-#line 2175 "configure"+#line 2196 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ac_nonexistent.h> #include <ac_nonexistent.h>
_ACEOF _ACEOF
-if { (eval echo "$as_me:2179: \"$ac_cpp conftest.$ac_ext\"") >&5+if { (eval echo "$as_me:2200: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$? ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1 rm -f conftest.er1
cat conftest.err >&5 cat conftest.err >&5
- echo "$as_me:2185: \$? = $ac_status" >&5+ echo "$as_me:2206: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then (exit $ac_status); } >/dev/null; then
if test -s conftest.err; then if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2219,7 +2240,7 @@ fi
else else
ac_cv_prog_CPP=$CPP ac_cv_prog_CPP=$CPP
fi fi
-echo "$as_me:2222: result: $CPP" >&5+echo "$as_me:2243: result: $CPP" >&5
echo "${ECHO_T}$CPP" >&6 echo "${ECHO_T}$CPP" >&6
ac_preproc_ok=false ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes for ac_c_preproc_warn_flag in '' yes
@@ -2229,18 +2250,18 @@ do
# On the NeXT, cc -E runs the code through the compiler's parser, # 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. # not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
-#line 2232 "configure"+#line 2253 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax error Syntax error
_ACEOF _ACEOF
-if { (eval echo "$as_me:2237: \"$ac_cpp conftest.$ac_ext\"") >&5+if { (eval echo "$as_me:2258: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$? ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1 rm -f conftest.er1
cat conftest.err >&5 cat conftest.err >&5
- echo "$as_me:2243: \$? = $ac_status" >&5+ echo "$as_me:2264: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then (exit $ac_status); } >/dev/null; then
if test -s conftest.err; then if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2263,17 +2284,17 @@ rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether non-existent headers # OK, works on sane cases. Now check whether non-existent headers
# can be detected and how. # can be detected and how.
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
-#line 2266 "configure"+#line 2287 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ac_nonexistent.h> #include <ac_nonexistent.h>
_ACEOF _ACEOF
-if { (eval echo "$as_me:2270: \"$ac_cpp conftest.$ac_ext\"") >&5+if { (eval echo "$as_me:2291: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$? ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1 rm -f conftest.er1
cat conftest.err >&5 cat conftest.err >&5
- echo "$as_me:2276: \$? = $ac_status" >&5+ echo "$as_me:2297: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then (exit $ac_status); } >/dev/null; then
if test -s conftest.err; then if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2301,7 +2322,7 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then if $ac_preproc_ok; then
: :
else else
- { { echo "$as_me:2304: error: C preprocessor \"$CPP\" fails sanity check" >&5+ { { echo "$as_me:2325: error: C preprocessor \"$CPP\" fails sanity check" >&5
echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@@ -2314,14 +2335,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_main_return=return ac_main_return=return
if test $ac_cv_c_compiler_gnu = yes; then if test $ac_cv_c_compiler_gnu = yes; then
- echo "$as_me:2317: checking whether $CC needs -traditional" >&5+ echo "$as_me:2338: checking whether $CC needs -traditional" >&5
echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
if test "${ac_cv_prog_gcc_traditional+set}" = set; then if test "${ac_cv_prog_gcc_traditional+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_pattern="Autoconf.*'x'" ac_pattern="Autoconf.*'x'"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
-#line 2324 "configure"+#line 2345 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sgtty.h> #include <sgtty.h>
int Autoconf = TIOCGETP; int Autoconf = TIOCGETP;
@@ -2336,7 +2357,7 @@ rm -rf conftest*
if test $ac_cv_prog_gcc_traditional = no; then if test $ac_cv_prog_gcc_traditional = no; then
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
-#line 2339 "configure"+#line 2360 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <termio.h> #include <termio.h>
int Autoconf = TCGETA; int Autoconf = TCGETA;
@@ -2349,14 +2370,14 @@ rm -rf conftest*
fi fi
fi fi
-echo "$as_me:2352: result: $ac_cv_prog_gcc_traditional" >&5+echo "$as_me:2373: result: $ac_cv_prog_gcc_traditional" >&5
echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
if test $ac_cv_prog_gcc_traditional = yes; then if test $ac_cv_prog_gcc_traditional = yes; then
CC="$CC -traditional" CC="$CC -traditional"
fi fi
fi fi
-echo "$as_me:2359: checking whether $CC understands -c and -o together" >&5+echo "$as_me:2380: checking whether $CC understands -c and -o together" >&5
echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
if test "${cf_cv_prog_CC_c_o+set}" = set; then if test "${cf_cv_prog_CC_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2372,15 +2393,15 @@ CF_EOF
# We do the test twice because some compilers refuse to overwrite an # We do the test twice because some compilers refuse to overwrite an
# existing .o file with -o, though they will create one. # existing .o file with -o, though they will create one.
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-if { (eval echo "$as_me:2375: \"$ac_try\"") >&5+if { (eval echo "$as_me:2396: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:2378: \$? = $ac_status" >&5+ echo "$as_me:2399: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } &&
- test -f conftest2.$ac_objext && { (eval echo "$as_me:2380: \"$ac_try\"") >&5+ test -f conftest2.$ac_objext && { (eval echo "$as_me:2401: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:2383: \$? = $ac_status" >&5+ echo "$as_me:2404: \$? = $ac_status" >&5
(exit $ac_status); }; (exit $ac_status); };
then then
eval cf_cv_prog_CC_c_o=yes eval cf_cv_prog_CC_c_o=yes
@@ -2391,581 +2412,287 @@ rm -rf conftest*
fi fi
if test $cf_cv_prog_CC_c_o = yes; then if test $cf_cv_prog_CC_c_o = yes; then
- echo "$as_me:2394: result: yes" >&5+ echo "$as_me:2415: result: yes" >&5
echo "${ECHO_T}yes" >&6 echo "${ECHO_T}yes" >&6
else else
- echo "$as_me:2397: result: no" >&5+ echo "$as_me:2418: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
-echo "$as_me:2401: checking for POSIXized ISC" >&5+if test "$cross_compiling" = yes ; then
-echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6+ LDCONFIG=:
-if test -d /etc/conf/kconfig.d &&+else
- grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1+case "$cf_cv_system_name" in #(vi
-then+dragonfly*|mirbsd*|freebsd*) #(vi
- echo "$as_me:2406: result: yes" >&5+ test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R"
-echo "${ECHO_T}yes" >&6+ ;;
- ISC=yes # If later tests want to check for ISC.+*) LDPATH=$PATH:/sbin:/usr/sbin
+ # Extract the first word of "ldconfig", so it can be a program name with args.
+set dummy ldconfig; ac_word=$2
+echo "$as_me:2432: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_LDCONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $LDCONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_LDCONFIG="$LDCONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$LDPATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
+ echo "$as_me:2449: found $ac_dir/$ac_word" >&5
+ break
+fi
+done
-cat >>confdefs.h <<\EOF+ ;;
-#define _POSIX_SOURCE 1+esac
-EOF+fi
+LDCONFIG=$ac_cv_path_LDCONFIG
- if test "$GCC" = yes; then+if test -n "$LDCONFIG"; then
- CC="$CC -posix"+ echo "$as_me:2460: result: $LDCONFIG" >&5
- else+echo "${ECHO_T}$LDCONFIG" >&6
- CC="$CC -Xp"
- fi
else else
- echo "$as_me:2420: result: no" >&5+ echo "$as_me:2463: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
- ISC=
fi fi
-echo "$as_me:2425: checking for ${CC:-cc} option to accept ANSI C" >&5+ ;;
-echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6+esac
-if test "${cf_cv_ansi_cc+set}" = set; then+fi
+
+echo "$as_me:2471: checking if you want to ensure bool is consistent with C++" >&5
+echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
+
+# Check whether --with-cxx or --without-cxx was given.
+if test "${with_cxx+set}" = set; then
+ withval="$with_cxx"
+ cf_with_cxx=$withval
+else
+ cf_with_cxx=yes
+fi;
+echo "$as_me:2481: result: $cf_with_cxx" >&5
+echo "${ECHO_T}$cf_with_cxx" >&6
+if test "X$cf_with_cxx" = Xno ; then
+ CXX=""
+ GXX=""
+else
+ # with autoconf 2.13, we can change the error to a warning:
+ ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ac_main_return=return
+if test -n "$ac_tool_prefix"; then
+ for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+echo "$as_me:2499: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
+ if test -n "$CXX"; then
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+echo "$as_me:2514: found $ac_dir/$ac_word" >&5
+break
+done
-cf_cv_ansi_cc=no+fi
-cf_save_CFLAGS="$CFLAGS"+fi
-cf_save_CPPFLAGS="$CPPFLAGS"+CXX=$ac_cv_prog_CXX
-# Don't try gcc -ansi; that turns off useful extensions and+if test -n "$CXX"; then
-# breaks some systems' header files.+ echo "$as_me:2522: result: $CXX" >&5
-# AIX -qlanglvl=ansi+echo "${ECHO_T}$CXX" >&6
-# Ultrix and OSF/1 -std1+else
-# HP-UX -Aa -D_HPUX_SOURCE+ echo "$as_me:2525: result: no" >&5
-# SVR4 -Xc+echo "${ECHO_T}no" >&6
-# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes)+fi
-for cf_arg in "-DCC_HAS_PROTOS" \
- "" \
- -qlanglvl=ansi \
- -std1 \
- -Ae \
- "-Aa -D_HPUX_SOURCE" \
- -Xc
-do
-cf_fix_cppflags=no+ test -n "$CXX" && break
-cf_new_cflags=+ done
-cf_new_cppflags=+fi
-cf_new_extra_cppflags=+if test -z "$CXX"; then
-+ ac_ct_CXX=$CXX
-for cf_add_cflags in $cf_arg+ for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
do do
-case $cf_fix_cppflags in+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-no)+set dummy $ac_prog; ac_word=$2
- case $cf_add_cflags in #(vi+echo "$as_me:2538: checking for $ac_word" >&5
- -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- case $cf_add_cflags in+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
- -D*)+ echo $ECHO_N "(cached) $ECHO_C" >&6
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`+else
-+ if test -n "$ac_ct_CXX"; then
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
- && test -z "${cf_tst_cflags}" \+else
- && cf_fix_cppflags=yes+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
- if test $cf_fix_cppflags = yes ; then+for ac_dir in $ac_dummy; do
- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"+ IFS=$ac_save_IFS
- continue+ test -z "$ac_dir" && ac_dir=.
- elif test "${cf_tst_cflags}" = "\"'" ; then+ $as_executable_p "$ac_dir/$ac_word" || continue
- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"+ac_cv_prog_ac_ct_CXX="$ac_prog"
- continue+echo "$as_me:2553: found $ac_dir/$ac_word" >&5
- fi+break
- ;;
- esac
- case "$CPPFLAGS" in
- *$cf_add_cflags) #(vi
- ;;
- *) #(vi
- case $cf_add_cflags in #(vi
- -D*)
- cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
-
-CPPFLAGS=`echo "$CPPFLAGS" | \
- sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \
- -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'`
-
- ;;
- esac
- cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
- ;;
- esac
- ;;
- *)
- cf_new_cflags="$cf_new_cflags $cf_add_cflags"
- ;;
- esac
- ;;
-yes)
- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
-
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
-
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=no
- ;;
-esac
done done
-if test -n "$cf_new_cflags" ; then
-
- CFLAGS="$CFLAGS $cf_new_cflags"
fi fi
-+fi
-if test -n "$cf_new_cppflags" ; then+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-+if test -n "$ac_ct_CXX"; then
- CPPFLAGS="$CPPFLAGS $cf_new_cppflags"+ echo "$as_me:2561: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6
+else
+ echo "$as_me:2564: result: no" >&5
+echo "${ECHO_T}no" >&6
fi fi
-if test -n "$cf_new_extra_cppflags" ; then+ test -n "$ac_ct_CXX" && break
+done
+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
- EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"+ CXX=$ac_ct_CXX
fi fi
- cat >conftest.$ac_ext <<_ACEOF+# Provide some information about the compiler.
-#line 2529 "configure"+echo "$as_me:2576:" \
-#include "confdefs.h"+ "checking for C++ compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:2579: \"$ac_compiler --version </dev/null >&5\"") >&5
+ (eval $ac_compiler --version </dev/null >&5) 2>&5
+ ac_status=$?
+ echo "$as_me:2582: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (eval echo "$as_me:2584: \"$ac_compiler -v </dev/null >&5\"") >&5
+ (eval $ac_compiler -v </dev/null >&5) 2>&5
+ ac_status=$?
+ echo "$as_me:2587: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (eval echo "$as_me:2589: \"$ac_compiler -V </dev/null >&5\"") >&5
+ (eval $ac_compiler -V </dev/null >&5) 2>&5
+ ac_status=$?
+ echo "$as_me:2592: \$? = $ac_status" >&5
+ (exit $ac_status); }
-#ifndef CC_HAS_PROTOS+echo "$as_me:2595: checking whether we are using the GNU C++ compiler" >&5
-#if !defined(__STDC__) || (__STDC__ != 1)+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-choke me+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-#endif+ echo $ECHO_N "(cached) $ECHO_C" >&6
-#endif+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2601 "configure"
+#include "confdefs.h"
int int
main () main ()
{ {
+#ifndef __GNUC__
+ choke me
+#endif
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2550: \"$ac_compile\"") >&5+if { (eval echo "$as_me:2616: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:2553: \$? = $ac_status" >&5+ echo "$as_me:2619: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext' { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2556: \"$ac_try\"") >&5+ { (eval echo "$as_me:2622: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:2559: \$? = $ac_status" >&5+ echo "$as_me:2625: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
- cf_cv_ansi_cc="$cf_arg"; break+ ac_compiler_gnu=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
+ac_compiler_gnu=no
fi fi
rm -f conftest.$ac_objext conftest.$ac_ext rm -f conftest.$ac_objext conftest.$ac_ext
-done+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-CFLAGS="$cf_save_CFLAGS"
-CPPFLAGS="$cf_save_CPPFLAGS"
-
-fi
-echo "$as_me:2572: result: $cf_cv_ansi_cc" >&5
-echo "${ECHO_T}$cf_cv_ansi_cc" >&6
-
-if test "$cf_cv_ansi_cc" != "no"; then
-if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then
-
-cf_fix_cppflags=no
-cf_new_cflags=
-cf_new_cppflags=
-cf_new_extra_cppflags=
-
-for cf_add_cflags in $cf_cv_ansi_cc
-do
-case $cf_fix_cppflags in
-no)
- case $cf_add_cflags in #(vi
- -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
- case $cf_add_cflags in
- -D*)
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
-
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=yes
-
- if test $cf_fix_cppflags = yes ; then
- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
- continue
- elif test "${cf_tst_cflags}" = "\"'" ; then
- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
- continue
- fi
- ;;
- esac
- case "$CPPFLAGS" in
- *$cf_add_cflags) #(vi
- ;;
- *) #(vi
- case $cf_add_cflags in #(vi
- -D*)
- cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
-
-CPPFLAGS=`echo "$CPPFLAGS" | \
- sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \
- -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'`
-
- ;;
- esac
- cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
- ;;
- esac
- ;;
- *)
- cf_new_cflags="$cf_new_cflags $cf_add_cflags"
- ;;
- esac
- ;;
-yes)
- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
-
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
-
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=no
- ;;
-esac
-done
-
-if test -n "$cf_new_cflags" ; then
-
- CFLAGS="$CFLAGS $cf_new_cflags"
-fi
-
-if test -n "$cf_new_cppflags" ; then
- CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
fi fi
+echo "$as_me:2637: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+GXX=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="-g"
+echo "$as_me:2643: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cxx_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2649 "configure"
+#include "confdefs.h"
-if test -n "$cf_new_extra_cppflags" ; then+int
-+main ()
- EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"+{
-fi
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2661: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:2664: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:2667: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:2670: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_prog_cxx_g=yes
else else
- cat >>confdefs.h <<\EOF+ echo "$as_me: failed program was:" >&5
-#define CC_HAS_PROTOS 1+cat conftest.$ac_ext >&5
-EOF+ac_cv_prog_cxx_g=no
-
fi fi
+rm -f conftest.$ac_objext conftest.$ac_ext
fi fi
-+echo "$as_me:2680: result: $ac_cv_prog_cxx_g" >&5
-if test "$cf_cv_ansi_cc" = "no"; then+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
- { { echo "$as_me:2665: error: Your compiler does not appear to recognize prototypes.+if test "$ac_test_CXXFLAGS" = set; then
-You have the following choices:+ CXXFLAGS=$ac_save_CXXFLAGS
- a. adjust your compiler options+elif test $ac_cv_prog_cxx_g = yes; then
- b. get an up-to-date compiler+ if test "$GXX" = yes; then
- c. use a wrapper such as unproto" >&5+ CXXFLAGS="-g -O2"
-echo "$as_me: error: Your compiler does not appear to recognize prototypes.+ else
-You have the following choices:+ CXXFLAGS="-g"
- a. adjust your compiler options+ fi
- b. get an up-to-date compiler+else
- c. use a wrapper such as unproto" >&2;}+ if test "$GXX" = yes; then
- { (exit 1); exit 1; }; }+ CXXFLAGS="-O2"
-fi+ else
-+ CXXFLAGS=
-case $cf_cv_system_name in+ fi
-os2*)
- CFLAGS="$CFLAGS -Zmt"
- CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
- CXXFLAGS="$CXXFLAGS -Zmt"
- # autoconf's macro sets -Zexe and suffix both, which conflict:w
- LDFLAGS="$LDFLAGS -Zmt -Zcrtdll"
- ac_cv_exeext=.exe
- ;;
-esac
-
-PROG_EXT="$EXEEXT"
-
-test -n "$PROG_EXT" && cat >>confdefs.h <<EOF
-#define PROG_EXT "$PROG_EXT"
-EOF
-
-if test "$cross_compiling" = yes ; then
- LDCONFIG=:
-else
-case "$cf_cv_system_name" in #(vi
-dragonfly*|freebsd*) #(vi
- test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R"
- ;;
-*) LDPATH=$PATH:/sbin:/usr/sbin
- # Extract the first word of "ldconfig", so it can be a program name with args.
-set dummy ldconfig; ac_word=$2
-echo "$as_me:2705: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_LDCONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $LDCONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_LDCONFIG="$LDCONFIG" # Let the user override the test with a path.
- ;;
- *)
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$LDPATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- if $as_executable_p "$ac_dir/$ac_word"; then
- ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
- echo "$as_me:2722: found $ac_dir/$ac_word" >&5
- break
-fi
-done
-
- ;;
-esac
-fi
-LDCONFIG=$ac_cv_path_LDCONFIG
-
-if test -n "$LDCONFIG"; then
- echo "$as_me:2733: result: $LDCONFIG" >&5
-echo "${ECHO_T}$LDCONFIG" >&6
-else
- echo "$as_me:2736: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- ;;
-esac
-fi
-
-echo "$as_me:2744: checking if you want to ensure bool is consistent with C++" >&5
-echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
-
-# Check whether --with-cxx or --without-cxx was given.
-if test "${with_cxx+set}" = set; then
- withval="$with_cxx"
- cf_with_cxx=$withval
-else
- cf_with_cxx=yes
-fi;
-echo "$as_me:2754: result: $cf_with_cxx" >&5
-echo "${ECHO_T}$cf_with_cxx" >&6
-if test "X$cf_with_cxx" = Xno ; then
- CXX=""
- GXX=""
-else
- # with autoconf 2.13, we can change the error to a warning:
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-ac_main_return=return
-if test -n "$ac_tool_prefix"; then
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:2772: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:2787: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
- echo "$as_me:2795: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
-else
- echo "$as_me:2798: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- test -n "$CXX" && break
- done
-fi
-if test -z "$CXX"; then
- ac_ct_CXX=$CXX
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:2811: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CXX"; then
- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:2826: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
- echo "$as_me:2834: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
-else
- echo "$as_me:2837: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- test -n "$ac_ct_CXX" && break
-done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
-
- CXX=$ac_ct_CXX
-fi
-
-# Provide some information about the compiler.
-echo "$as_me:2849:" \
- "checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:2852: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:2855: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:2857: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:2860: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:2862: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:2865: \$? = $ac_status" >&5
- (exit $ac_status); }
-
-echo "$as_me:2868: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 2874 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2889: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2892: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2895: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2898: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_compiler_gnu=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_compiler_gnu=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:2910: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:2916: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cxx_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 2922 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2934: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2937: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2940: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2943: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_prog_cxx_g=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:2953: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
- else
- CXXFLAGS="-g"
- fi
-else
- if test "$GXX" = yes; then
- CXXFLAGS="-O2"
- else
- CXXFLAGS=
- fi
fi fi
for ac_declaration in \ for ac_declaration in \
''\ ''\
@@ -2977,7 +2704,7 @@ for ac_declaration in \
'void exit (int);' 'void exit (int);'
do do
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
-#line 2980 "configure"+#line 2707 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
$ac_declaration $ac_declaration
@@ -2990,16 +2717,16 @@ exit (42);
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2993: \"$ac_compile\"") >&5+if { (eval echo "$as_me:2720: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:2996: \$? = $ac_status" >&5+ echo "$as_me:2723: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext' { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2999: \"$ac_try\"") >&5+ { (eval echo "$as_me:2726: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:3002: \$? = $ac_status" >&5+ echo "$as_me:2729: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
: :
else else
@@ -3009,7 +2736,7 @@ continue
fi fi
rm -f conftest.$ac_objext conftest.$ac_ext rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
-#line 3012 "configure"+#line 2739 "configure"
#include "confdefs.h" #include "confdefs.h"
$ac_declaration $ac_declaration
int int
@@ -3021,16 +2748,16 @@ exit (42);
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3024: \"$ac_compile\"") >&5+if { (eval echo "$as_me:2751: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:3027: \$? = $ac_status" >&5+ echo "$as_me:2754: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext' { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3030: \"$ac_try\"") >&5+ { (eval echo "$as_me:2757: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
- echo "$as_me:3033: \$? = $ac_status" >&5+ echo "$as_me:2760: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
break break
else else
@@ -3053,11 +2780,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_main_return=return ac_main_return=return
- # autoconf 2.5x removed the error - by hardcoding it to g++.+ # autoconf 2.5x removed the error (hardcoding it to g++, or just blank)
if test "$CXX" = "g++" ; then if test "$CXX" = "g++" ; then
# Extract the first word of "g++", so it can be a program name with args. # Extract the first word of "g++", so it can be a program name with args.
set dummy g++; ac_word=$2 set dummy g++; ac_word=$2
-echo "$as_me:3060: checking for $ac_word" >&5+echo "$as_me:2787: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_CXX+set}" = set; then if test "${ac_cv_path_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3074,7 +2801,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_CXX="$ac_dir/$ac_word" ac_cv_path_CXX="$ac_dir/$ac_word"
- echo "$as_me:3077: found $ac_dir/$ac_word" >&5+ echo "$as_me:2804: found $ac_dir/$ac_word" >&5
break break
fi fi
done done
@@ -3085,28 +2812,30 @@ fi
CXX=$ac_cv_path_CXX CXX=$ac_cv_path_CXX
if test -n "$CXX"; then if test -n "$CXX"; then
- echo "$as_me:3088: result: $CXX" >&5+ echo "$as_me:2815: result: $CXX" >&5
echo "${ECHO_T}$CXX" >&6 echo "${ECHO_T}$CXX" >&6
else else
- echo "$as_me:3091: result: no" >&5+ echo "$as_me:2818: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
fi fi
- if test "$CXX" = "g++" ; then+ case "x$CXX" in #(vi
- { echo "$as_me:3097: WARNING: ignoring hardcoded g++" >&5+ x|xg++)
-echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}+ { echo "$as_me:2825: WARNING: You don't have any C++ compiler, too bad" >&5
+echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;}
cf_with_cxx=no; CXX=""; GXX=""; cf_with_cxx=no; CXX=""; GXX="";
- fi+ ;;
+ esac
fi fi
GXX_VERSION=none GXX_VERSION=none
if test "$GXX" = yes; then if test "$GXX" = yes; then
- echo "$as_me:3105: checking version of g++" >&5+ echo "$as_me:2834: checking version of ${CXX:-g++}" >&5
-echo $ECHO_N "checking version of g++... $ECHO_C" >&6+echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
test -z "$GXX_VERSION" && GXX_VERSION=unknown test -z "$GXX_VERSION" && GXX_VERSION=unknown
- echo "$as_me:3109: result: $GXX_VERSION" >&5+ echo "$as_me:2838: result: $GXX_VERSION" >&5
echo "${ECHO_T}$GXX_VERSION" >&6 echo "${ECHO_T}$GXX_VERSION" >&6
fi fi
@@ -3114,12 +2843,12 @@ case $GXX_VERSION in
1*|2.[0-6]*) 1*|2.[0-6]*)
# GXX=""; CXX=""; ac_cv_prog_gxx=no # GXX=""; CXX=""; ac_cv_prog_gxx=no
# cf_cxx_library=no # cf_cxx_library=no
- { echo "$as_me:3117: WARNING: templates do not work" >&5+ { echo "$as_me:2846: WARNING: templates do not work" >&5
echo "$as_me: WARNING: templates do not work" >&2;} echo "$as_me: WARNING: templates do not work" >&2;}
;; ;;
esac esac
-echo "$as_me:3122: checking if you want to build C++ binding and demo" >&5+echo "$as_me:2851: checking if you want to build C++ binding and demo" >&5
echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
# Check whether --with-cxx-binding or --without-cxx-binding was given. # Check whether --with-cxx-binding or --without-cxx-binding was given.
@@ -3129,23 +2858,28 @@ if test "${with_cxx_binding+set}" = set; then
else else
cf_with_cxx_binding=$cf_with_cxx cf_with_cxx_binding=$cf_with_cxx
fi; fi;
-echo "$as_me:3132: result: $cf_with_cxx_binding" >&5+echo "$as_me:2861: result: $cf_with_cxx_binding" >&5
echo "${ECHO_T}$cf_with_cxx_binding" >&6 echo "${ECHO_T}$cf_with_cxx_binding" >&6
-echo "$as_me:3135: checking if you want to build with Ada95" >&5+echo "$as_me:2864: checking if you want to build with Ada95" >&5
echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
+echo "$as_me:2866: result: $cf_with_ada" >&5
+echo "${ECHO_T}$cf_with_ada" >&6
-# Check whether --with-ada or --without-ada was given.+echo "$as_me:2869: checking if you want to install terminal database" >&5
-if test "${with_ada+set}" = set; then+echo $ECHO_N "checking if you want to install terminal database... $ECHO_C" >&6
- withval="$with_ada"+
- cf_with_ada=$withval+# Check whether --enable-db-install or --disable-db-install was given.
+if test "${enable_db_install+set}" = set; then
+ enableval="$enable_db_install"
+ cf_with_db_install=$enableval
else else
- cf_with_ada=yes+ cf_with_db_install=yes
fi; fi;
-echo "$as_me:3145: result: $cf_with_ada" >&5+echo "$as_me:2879: result: $cf_with_db_install" >&5
-echo "${ECHO_T}$cf_with_ada" >&6+echo "${ECHO_T}$cf_with_db_install" >&6
-echo "$as_me:3148: checking if you want to install manpages" >&5+echo "$as_me:2882: checking if you want to install manpages" >&5
echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6 echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6
# Check whether --with-manpages or --without-manpages was given. # Check whether --with-manpages or --without-manpages was given.
@@ -3155,10 +2889,10 @@ if test "${with_manpages+set}" = set; then
else else
cf_with_manpages=yes cf_with_manpages=yes
fi; fi;
-echo "$as_me:3158: result: $cf_with_manpages" >&5+echo "$as_me:2892: result: $cf_with_manpages" >&5
echo "${ECHO_T}$cf_with_manpages" >&6 echo "${ECHO_T}$cf_with_manpages" >&6
-echo "$as_me:3161: checking if you want to build programs such as tic" >&5+echo "$as_me:2895: checking if you want to build programs such as tic" >&5
echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
# Check whether --with-progs or --without-progs was given. # Check whether --with-progs or --without-progs was given.
@@ -3168,10 +2902,10 @@ if test "${with_progs+set}" = set; then
else else
cf_with_progs=yes cf_with_progs=yes
fi; fi;
-echo "$as_me:3171: result: $cf_with_progs" >&5+echo "$as_me:2905: result: $cf_with_progs" >&5
echo "${ECHO_T}$cf_with_progs" >&6 echo "${ECHO_T}$cf_with_progs" >&6
-echo "$as_me:3174: checking if you want to build test-programs" >&5+echo "$as_me:2908: checking if you want to build test-programs" >&5
echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6
# Check whether --with-tests or --without-tests was given. # Check whether --with-tests or --without-tests was given.
@@ -3181,10 +2915,10 @@ if test "${with_tests+set}" = set; then
else else
cf_with_tests=yes cf_with_tests=yes
fi; fi;
-echo "$as_me:3184: result: $cf_with_tests" >&5+echo "$as_me:2918: result: $cf_with_tests" >&5
echo "${ECHO_T}$cf_with_tests" >&6 echo "${ECHO_T}$cf_with_tests" >&6
-echo "$as_me:3187: checking if you wish to install curses.h" >&5+echo "$as_me:2921: checking if you wish to install curses.h" >&5
echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
# Check whether --with-curses-h or --without-curses-h was given. # Check whether --with-curses-h or --without-curses-h was given.
@@ -3194,7 +2928,7 @@ if test "${with_curses_h+set}" = set; then
else else
with_curses_h=yes with_curses_h=yes
fi; fi;
-echo "$as_me:3197: result: $with_curses_h" >&5+echo "$as_me:2931: result: $with_curses_h" >&5
echo "${ECHO_T}$with_curses_h" >&6 echo "${ECHO_T}$with_curses_h" >&6
modules_to_build="ncurses" modules_to_build="ncurses"
@@ -3220,7 +2954,7 @@ for ac_prog in mawk gawk nawk awk
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3223: checking for $ac_word" >&5+echo "$as_me:2957: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_AWK+set}" = set; then if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3235,7 +2969,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue $as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_AWK="$ac_prog" ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:3238: found $ac_dir/$ac_word" >&5+echo "$as_me:2972: found $ac_dir/$ac_word" >&5
break break
done done
@@ -3243,21 +2977,21 @@ fi
fi fi
AWK=$ac_cv_prog_AWK AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then if test -n "$AWK"; then
- echo "$as_me:3246: result: $AWK" >&5+ echo "$as_me:2980: result: $AWK" >&5
echo "${ECHO_T}$AWK" >&6 echo "${ECHO_T}$AWK" >&6
else else
- echo "$as_me:3249: result: no" >&5+ echo "$as_me:2983: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
test -n "$AWK" && break test -n "$AWK" && break
done done
-test -z "$AWK" && { { echo "$as_me:3256: error: No awk program found" >&5+test -z "$AWK" && { { echo "$as_me:2990: error: No awk program found" >&5
echo "$as_me: error: No awk program found" >&2;} echo "$as_me: error: No awk program found" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
-echo "$as_me:3260: checking for egrep" >&5+echo "$as_me:2994: checking for egrep" >&5
echo $ECHO_N "checking for egrep... $ECHO_C" >&6 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
if test "${ac_cv_prog_egrep+set}" = set; then if test "${ac_cv_prog_egrep+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3267,11 +3001,11 @@ else
else ac_cv_prog_egrep='egrep' else ac_cv_prog_egrep='egrep'
fi fi
fi fi
-echo "$as_me:3270: result: $ac_cv_prog_egrep" >&5+echo "$as_me:3004: result: $ac_cv_prog_egrep" >&5
echo "${ECHO_T}$ac_cv_prog_egrep" >&6 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
EGREP=$ac_cv_prog_egrep EGREP=$ac_cv_prog_egrep
-test -z "$EGREP" && { { echo "$as_me:3274: error: No egrep program found" >&5+test -z "$EGREP" && { { echo "$as_me:3008: error: No egrep program found" >&5
echo "$as_me: error: No egrep program found" >&2;} echo "$as_me: error: No egrep program found" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@@ -3287,7 +3021,7 @@ echo "$as_me: error: No egrep program found" >&2;}
# AFS /usr/afsws/bin/install, which mishandles nonexistent args # AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:3290: checking for a BSD compatible install" >&5+echo "$as_me:3024: checking for a BSD compatible install" >&5
echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then if test "${ac_cv_path_install+set}" = set; then
@@ -3336,7 +3070,7 @@ fi
INSTALL=$ac_install_sh INSTALL=$ac_install_sh
fi fi
fi fi
-echo "$as_me:3339: result: $INSTALL" >&5+echo "$as_me:3073: result: $INSTALL" >&5
echo "${ECHO_T}$INSTALL" >&6 echo "${ECHO_T}$INSTALL" >&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}. # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3361,7 +3095,7 @@ for ac_prog in tdlint lint alint splint lclint
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3364: checking for $ac_word" >&5+echo "$as_me:3098: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_LINT+set}" = set; then if test "${ac_cv_prog_LINT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3376,7 +3110,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue $as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_LINT="$ac_prog" ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3379: found $ac_dir/$ac_word" >&5+echo "$as_me:3113: found $ac_dir/$ac_word" >&5
break break
done done
@@ -3384,28 +3118,28 @@ fi
fi fi
LINT=$ac_cv_prog_LINT LINT=$ac_cv_prog_LINT
if test -n "$LINT"; then if test -n "$LINT"; then
- echo "$as_me:3387: result: $LINT" >&5+ echo "$as_me:3121: result: $LINT" >&5
echo "${ECHO_T}$LINT" >&6 echo "${ECHO_T}$LINT" >&6
else else
- echo "$as_me:3390: result: no" >&5+ echo "$as_me:3124: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
test -n "$LINT" && break test -n "$LINT" && break
done done
-echo "$as_me:3397: checking whether ln -s works" >&5+echo "$as_me:3131: checking whether ln -s works" >&5
echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
LN_S=$as_ln_s LN_S=$as_ln_s
if test "$LN_S" = "ln -s"; then if test "$LN_S" = "ln -s"; then
- echo "$as_me:3401: result: yes" >&5+ echo "$as_me:3135: result: yes" >&5
echo "${ECHO_T}yes" >&6 echo "${ECHO_T}yes" >&6
else else
- echo "$as_me:3404: result: no, using $LN_S" >&5+ echo "$as_me:3138: result: no, using $LN_S" >&5
echo "${ECHO_T}no, using $LN_S" >&6 echo "${ECHO_T}no, using $LN_S" >&6
fi fi
-echo "$as_me:3408: checking if $LN_S -f options work" >&5+echo "$as_me:3142: checking if $LN_S -f options work" >&5
echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6 echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
rm -f conf$$.src conf$$dst rm -f conf$$.src conf$$dst
@@ -3417,12 +3151,12 @@ else
cf_prog_ln_sf=no cf_prog_ln_sf=no
fi fi
rm -f conf$$.dst conf$$src rm -f conf$$.dst conf$$src
-echo "$as_me:3420: result: $cf_prog_ln_sf" >&5+echo "$as_me:3154: result: $cf_prog_ln_sf" >&5
echo "${ECHO_T}$cf_prog_ln_sf" >&6 echo "${ECHO_T}$cf_prog_ln_sf" >&6
test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
-echo "$as_me:3425: checking for long file names" >&5+echo "$as_me:3159: checking for long file names" >&5
echo $ECHO_N "checking for long file names... $ECHO_C" >&6 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
if test "${ac_cv_sys_long_file_names+set}" = set; then if test "${ac_cv_sys_long_file_names+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3461,7 +3195,7 @@ for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
rm -rf $ac_xdir 2>/dev/null rm -rf $ac_xdir 2>/dev/null
done done
fi fi
-echo "$as_me:3464: result: $ac_cv_sys_long_file_names" >&5+echo "$as_me:3198: result: $ac_cv_sys_long_file_names" >&5
echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
if test $ac_cv_sys_long_file_names = yes; then if test $ac_cv_sys_long_file_names = yes; then
@@ -3473,7 +3207,7 @@ fi
# if we find pkg-config, check if we should install the ".pc" files. # if we find pkg-config, check if we should install the ".pc" files.
-echo "$as_me:3476: checking if you want to use pkg-config" >&5+echo "$as_me:3210: checking if you want to use pkg-config" >&5
echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
# Check whether --with-pkg-config or --without-pkg-config was given. # Check whether --with-pkg-config or --without-pkg-config was given.
@@ -3483,7 +3217,7 @@ if test "${with_pkg_config+set}" = set; then
else else
cf_pkg_config=yes cf_pkg_config=yes
fi; fi;
-echo "$as_me:3486: result: $cf_pkg_config" >&5+echo "$as_me:3220: result: $cf_pkg_config" >&5
echo "${ECHO_T}$cf_pkg_config" >&6 echo "${ECHO_T}$cf_pkg_config" >&6
case $cf_pkg_config in #(vi case $cf_pkg_config in #(vi
@@ -3491,10 +3225,11 @@ no) #(vi
PKG_CONFIG=none PKG_CONFIG=none
;; ;;
yes) #(vi yes) #(vi
- if test -n "$ac_tool_prefix"; then+
+if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:3497: checking for $ac_word" >&5+echo "$as_me:3232: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3511,7 +3246,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
- echo "$as_me:3514: found $ac_dir/$ac_word" >&5+ echo "$as_me:3249: found $ac_dir/$ac_word" >&5
break break
fi fi
done done
@@ -3522,10 +3257,10 @@ fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG"; then
- echo "$as_me:3525: result: $PKG_CONFIG" >&5+ echo "$as_me:3260: result: $PKG_CONFIG" >&5
echo "${ECHO_T}$PKG_CONFIG" >&6 echo "${ECHO_T}$PKG_CONFIG" >&6
else else
- echo "$as_me:3528: result: no" >&5+ echo "$as_me:3263: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
@@ -3534,7 +3269,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
ac_pt_PKG_CONFIG=$PKG_CONFIG ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args. # Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2 set dummy pkg-config; ac_word=$2
-echo "$as_me:3537: checking for $ac_word" >&5+echo "$as_me:3272: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3551,7 +3286,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
- echo "$as_me:3554: found $ac_dir/$ac_word" >&5+ echo "$as_me:3289: found $ac_dir/$ac_word" >&5
break break
fi fi
done done
@@ -3563,10 +3298,10 @@ fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then if test -n "$ac_pt_PKG_CONFIG"; then
- echo "$as_me:3566: result: $ac_pt_PKG_CONFIG" >&5+ echo "$as_me:3301: result: $ac_pt_PKG_CONFIG" >&5
echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
else else
- echo "$as_me:3569: result: no" >&5+ echo "$as_me:3304: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
@@ -3597,7 +3332,7 @@ case ".$PKG_CONFIG" in #(vi
;; ;;
.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
;; ;;
-.\${*prefix}*) #(vi+.\${*prefix}*|.\${*dir}*) #(vi
eval PKG_CONFIG="$PKG_CONFIG" eval PKG_CONFIG="$PKG_CONFIG"
case ".$PKG_CONFIG" in #(vi case ".$PKG_CONFIG" in #(vi
.NONE/*) .NONE/*)
@@ -3609,7 +3344,7 @@ case ".$PKG_CONFIG" in #(vi
PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
;; ;;
*) *)
- { { echo "$as_me:3612: error: expected a pathname, not \"$PKG_CONFIG\"" >&5+ { { echo "$as_me:3347: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
;; ;;
@@ -3617,16 +3352,51 @@ esac
fi fi
-if test "$PKG_CONFIG" != no ; then+if test "$PKG_CONFIG" != none ; then
[diff truncated]