projects
/
ncurses.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ncurses 6.0 - patch 20160220
[ncurses.git]
/
Ada95
/
configure.in
diff --git
a/Ada95/configure.in
b/Ada95/configure.in
index d1a29acb099d8bd91df338c1152a146927e2c59b..19698c5ab7fb6e8bcd3acc9b6e1b71f7b6859821 100644
(file)
--- a/
Ada95/configure.in
+++ b/
Ada95/configure.in
@@
-1,5
+1,5
@@
dnl***************************************************************************
dnl***************************************************************************
-dnl Copyright (c) 2010-201
1,2012
Free Software Foundation, Inc. *
+dnl Copyright (c) 2010-201
4,2015
Free Software Foundation, Inc. *
dnl *
dnl Permission is hereby granted, free of charge, to any person obtaining a *
dnl copy of this software and associated documentation files (the *
dnl *
dnl Permission is hereby granted, free of charge, to any person obtaining a *
dnl copy of this software and associated documentation files (the *
@@
-28,24
+28,20
@@
dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey
dnl
dnl
dnl Author: Thomas E. Dickey
dnl
-dnl $Id: configure.in,v 1.
40 2012/03/31 22:57:57
tom Exp $
+dnl $Id: configure.in,v 1.
61 2015/09/19 20:33:36
tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See http://invisible-island.net/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See http://invisible-island.net/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
-AC_PREREQ(2.
13.20020210
)
-AC_REVISION($Revision: 1.
40
$)
+AC_PREREQ(2.
52.20030208
)
+AC_REVISION($Revision: 1.
61
$)
AC_INIT(gen/gen.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
CF_TOP_BUILDDIR
AC_INIT(gen/gen.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
CF_TOP_BUILDDIR
-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])
+CF_WITH_SYSTYPE
### Save the given $CFLAGS to allow user-override.
cf_user_CFLAGS="$CFLAGS"
### Save the given $CFLAGS to allow user-override.
cf_user_CFLAGS="$CFLAGS"
@@
-54,15
+50,10
@@
cf_user_CFLAGS="$CFLAGS"
CF_CFG_DEFAULTS
### Checks for programs.
CF_CFG_DEFAULTS
### Checks for programs.
-AC_PROG_CC(gnatgcc gcc cc)
-CF_GCC_VERSION
-
+CF_PROG_CC(gnatgcc gcc cc)
AC_PROG_CPP
AC_PROG_GCC_TRADITIONAL
CF_PROG_CC_C_O(CC)
AC_PROG_CPP
AC_PROG_GCC_TRADITIONAL
CF_PROG_CC_C_O(CC)
-AC_ISC_POSIX
-CF_ANSI_CC_REQD
-CF_PROG_EXT
AC_ARG_PROGRAM
AC_ARG_PROGRAM
@@
-76,7
+67,6
@@
AC_SYS_LONG_FILE_NAMES
# if we find pkg-config, check if we should install the ".pc" files.
CF_PKG_CONFIG
CF_WITH_PKG_CONFIG_LIBDIR
# if we find pkg-config, check if we should install the ".pc" files.
CF_PKG_CONFIG
CF_WITH_PKG_CONFIG_LIBDIR
-CF_ENABLE_PC_FILES
AC_MSG_CHECKING(if you want to build test-programs)
AC_ARG_WITH(tests,
AC_MSG_CHECKING(if you want to build test-programs)
AC_ARG_WITH(tests,
@@
-92,12
+82,12
@@
AC_ARG_ENABLE(mixed-case,
[enable_mixedcase=auto])
AC_MSG_RESULT($enable_mixedcase)
if test "$enable_mixedcase" = "auto" ; then
[enable_mixedcase=auto])
AC_MSG_RESULT($enable_mixedcase)
if test "$enable_mixedcase" = "auto" ; then
- CF_MIXEDCASE_FILENAMES
+
CF_MIXEDCASE_FILENAMES
else
else
- cf_cv_mixedcase=$enable_mixedcase
- if test "$enable_mixedcase" = "yes" ; then
- AC_DEFINE(MIXEDCASE_FILENAMES)
- fi
+
cf_cv_mixedcase=$enable_mixedcase
+
if test "$enable_mixedcase" = "yes" ; then
+
AC_DEFINE(MIXEDCASE_FILENAMES)
+
fi
fi
# do this after mixed-case option (tags/TAGS is not as important as tic).
fi
# do this after mixed-case option (tags/TAGS is not as important as tic).
@@
-110,6
+100,7
@@
AC_CHECK_TOOL(RANLIB, ranlib, ':')
AC_CHECK_TOOL(LD, ld, ld)
AC_CHECK_TOOL(AR, ar, ar)
CF_AR_FLAGS
AC_CHECK_TOOL(LD, ld, ld)
AC_CHECK_TOOL(AR, ar, ar)
CF_AR_FLAGS
+CF_PATHSEP
dnl Special option for use by system-builders: the install-prefix is used to
dnl adjust the location into which the actual install is done, so that an
dnl Special option for use by system-builders: the install-prefix is used to
dnl adjust the location into which the actual install is done, so that an
@@
-117,10
+108,10
@@
dnl archive can be built without modifying the host system's configuration.
AC_MSG_CHECKING(if you have specified an install-prefix)
AC_ARG_WITH(install-prefix,
[ --with-install-prefix prefixes actual install-location ($DESTDIR)],
AC_MSG_CHECKING(if you have specified an install-prefix)
AC_ARG_WITH(install-prefix,
[ --with-install-prefix prefixes actual install-location ($DESTDIR)],
- [case "$withval" in
#(vi
- yes|no) #(vi
+ [case "$withval" in
+ (yes|no)
;;
;;
-
*)
DESTDIR="$withval"
+
(*)
DESTDIR="$withval"
;;
esac])
AC_MSG_RESULT($DESTDIR)
;;
esac])
AC_MSG_RESULT($DESTDIR)
@@
-183,10
+174,10
@@
AC_SUBST(CC_G_OPT)
AC_MSG_CHECKING(for default loader flags)
case $DFT_LWR_MODEL in
AC_MSG_CHECKING(for default loader flags)
case $DFT_LWR_MODEL in
-normal) LD_MODEL='' ;;
-debug) LD_MODEL=$CC_G_OPT ;;
-profile) LD_MODEL='-pg';;
-shared) LD_MODEL='' ;;
+
(
normal) LD_MODEL='' ;;
+
(
debug) LD_MODEL=$CC_G_OPT ;;
+
(
profile) LD_MODEL='-pg';;
+
(
shared) LD_MODEL='' ;;
esac
AC_SUBST(LD_MODEL)dnl the type of link (e.g., -g or -pg)
AC_MSG_RESULT($LD_MODEL)
esac
AC_SUBST(LD_MODEL)dnl the type of link (e.g., -g or -pg)
AC_MSG_RESULT($LD_MODEL)
@@
-226,8
+217,8
@@
if test "$with_broken_linker" = yes ; then
AC_DEFINE(BROKEN_LINKER)
BROKEN_LINKER=1
elif test "$DFT_LWR_MODEL" = shared ; then
AC_DEFINE(BROKEN_LINKER)
BROKEN_LINKER=1
elif test "$DFT_LWR_MODEL" = shared ; then
- case $cf_cv_system_name in
#(vi
- cygwin*)
+ case $cf_cv_system_name in
+
(
cygwin*)
AC_DEFINE(BROKEN_LINKER)
BROKEN_LINKER=1
CF_VERBOSE(cygwin linker is broken anyway)
AC_DEFINE(BROKEN_LINKER)
BROKEN_LINKER=1
CF_VERBOSE(cygwin linker is broken anyway)
@@
-248,7
+239,7
@@
AC_ARG_WITH(rcs-ids,
[with_rcs_ids=$withval],
[with_rcs_ids=no])
AC_MSG_RESULT($with_rcs_ids)
[with_rcs_ids=$withval],
[with_rcs_ids=no])
AC_MSG_RESULT($with_rcs_ids)
-test "$with_rcs_ids" = yes && AC_DEFINE(USE_RCS_IDS)
+test "$with_rcs_ids" = yes && AC_DEFINE(USE_RCS_IDS
,1,[Define to 1 if RCS identifiers should be compiled-in)]
)
###############################################################################
CF_HELP_MESSAGE(Extensions:)
###############################################################################
CF_HELP_MESSAGE(Extensions:)
@@
-262,8
+253,8
@@
AC_ARG_ENABLE(ext-funcs,
AC_MSG_RESULT($with_ext_funcs)
if test "$with_ext_funcs" = yes ; then
NCURSES_EXT_FUNCS=1
AC_MSG_RESULT($with_ext_funcs)
if test "$with_ext_funcs" = yes ; then
NCURSES_EXT_FUNCS=1
- AC_DEFINE(HAVE_USE_DEFAULT_COLORS)
- AC_DEFINE(NCURSES_EXT_FUNCS)
+ AC_DEFINE(HAVE_USE_DEFAULT_COLORS
,1,[Define to 1 if we have use_default_colors function]
)
+ AC_DEFINE(NCURSES_EXT_FUNCS
,1,[Define to 1 if we have ncurses extended functions]
)
else
NCURSES_EXT_FUNCS=0
fi
else
NCURSES_EXT_FUNCS=0
fi
@@
-302,27
+293,27
@@
CF_WITH_PTHREAD
AC_MSG_CHECKING(if you want to use weak-symbols for pthreads)
AC_ARG_ENABLE(weak-symbols,
AC_MSG_CHECKING(if you want to use weak-symbols for pthreads)
AC_ARG_ENABLE(weak-symbols,
- [ --enable-weak-symbols enable weak-symbols for pthreads],
- [use_weak_symbols=$withval],
- [use_weak_symbols=no])
+
[ --enable-weak-symbols enable weak-symbols for pthreads],
+
[use_weak_symbols=$withval],
+
[use_weak_symbols=no])
AC_MSG_RESULT($use_weak_symbols)
if test "$use_weak_symbols" = yes ; then
AC_MSG_RESULT($use_weak_symbols)
if test "$use_weak_symbols" = yes ; then
- CF_WEAK_SYMBOLS
+
CF_WEAK_SYMBOLS
else
else
- cf_cv_weak_symbols=no
+
cf_cv_weak_symbols=no
fi
if test $cf_cv_weak_symbols = yes ; then
fi
if test $cf_cv_weak_symbols = yes ; then
-
AC_DEFINE(USE_WEAK_SYMBOLS
)
+
AC_DEFINE(USE_WEAK_SYMBOLS,1,[Define to 1 to enable weak-symbols for pthreads]
)
fi
PTHREAD=
if test "$with_pthread" = "yes" ; then
fi
PTHREAD=
if test "$with_pthread" = "yes" ; then
-
AC_DEFINE(USE_PTHREADS
)
- enable_reentrant=yes
- if test $cf_cv_weak_symbols = yes ; then
- PTHREAD=-lpthread
- fi
+
AC_DEFINE(USE_PTHREADS,1,[Define to 1 to use the pthreads library]
)
+
enable_reentrant=yes
+
if test $cf_cv_weak_symbols = yes ; then
+
PTHREAD=-lpthread
+
fi
fi
AC_SUBST(PTHREAD)
fi
AC_SUBST(PTHREAD)
@@
-346,7
+337,7
@@
if test "$with_reentrant" = yes ; then
elif test "$assume_reentrant" = no ; then
LIB_SUFFIX="t${LIB_SUFFIX}"
fi
elif test "$assume_reentrant" = no ; then
LIB_SUFFIX="t${LIB_SUFFIX}"
fi
- AC_DEFINE(USE_REENTRANT)
+ AC_DEFINE(USE_REENTRANT
,1,[Define to 1 to compile with experimental reentrant code]
)
else
cf_cv_enable_reentrant=0
fi
else
cf_cv_enable_reentrant=0
fi
@@
-364,7
+355,7
@@
else
NCURSES_WRAP_PREFIX=_nc_
fi
AC_SUBST(NCURSES_WRAP_PREFIX)
NCURSES_WRAP_PREFIX=_nc_
fi
AC_SUBST(NCURSES_WRAP_PREFIX)
-AC_DEFINE_UNQUOTED(NCURSES_WRAP_PREFIX,"$NCURSES_WRAP_PREFIX")
+AC_DEFINE_UNQUOTED(NCURSES_WRAP_PREFIX,"$NCURSES_WRAP_PREFIX"
,[Define to override _nc_ ncurses internal prefix]
)
###############################################################################
CF_HELP_MESSAGE(Testing/development Options:)
###############################################################################
CF_HELP_MESSAGE(Testing/development Options:)
@@
-381,7
+372,7
@@
AC_MSG_RESULT($with_warnings)
if test "x$with_warnings" = "xyes"; then
CF_ADD_ADAFLAGS(-gnatg)
if test "x$with_warnings" = "xyes"; then
CF_ADD_ADAFLAGS(-gnatg)
- CF_GCC_WARNINGS(W
declaration-after-statement Wextra W
no-unknown-pragmas Wswitch-enum)
+ CF_GCC_WARNINGS(Wno-unknown-pragmas Wswitch-enum)
fi
CF_GCC_ATTRIBUTES
fi
CF_GCC_ATTRIBUTES
@@
-396,7
+387,6
@@
if test -n "$GCC"
then
if test "$with_assertions" = no
then
then
if test "$with_assertions" = no
then
- AC_DEFINE(NDEBUG)
CPPFLAGS="$CPPFLAGS -DNDEBUG"
else
CF_ADD_ADAFLAGS(-gnata)
CPPFLAGS="$CPPFLAGS -DNDEBUG"
else
CF_ADD_ADAFLAGS(-gnata)
@@
-404,23
+394,23
@@
then
fi
### use option --disable-leaks to suppress "permanent" leaks, for testing
fi
### use option --disable-leaks to suppress "permanent" leaks, for testing
-AC_DEFINE(HAVE_NC_ALLOC_H)
+AC_DEFINE(HAVE_NC_ALLOC_H
,1,[Define to 1 if we have nc_alloc.h header]
)
### use option --enable-expanded to generate certain macros as functions
AC_ARG_ENABLE(expanded,
[ --enable-expanded test: generate functions for certain macros],
### use option --enable-expanded to generate certain macros as functions
AC_ARG_ENABLE(expanded,
[ --enable-expanded test: generate functions for certain macros],
- [test "$enableval" = yes && AC_DEFINE(NCURSES_EXPANDED)])
+ [test "$enableval" = yes && AC_DEFINE(NCURSES_EXPANDED
,1,[Define to 1 if ncurses macros should be expanded as functions]
)])
### use option --disable-macros to suppress macros in favor of functions
AC_ARG_ENABLE(macros,
[ --disable-macros test: use functions rather than macros],
### use option --disable-macros to suppress macros in favor of functions
AC_ARG_ENABLE(macros,
[ --disable-macros test: use functions rather than macros],
- [test "$enableval" = no && AC_DEFINE(NCURSES_NOMACROS)])
+ [test "$enableval" = no && AC_DEFINE(NCURSES_NOMACROS
,1,[Define to 1 if ncurses macros should be expanded as functions]
)])
# Normally we only add trace() to the debug-library. Allow this to be
# extended to all models of the ncurses library:
cf_all_traces=no
case "$CFLAGS $CPPFLAGS" in
# Normally we only add trace() to the debug-library. Allow this to be
# extended to all models of the ncurses library:
cf_all_traces=no
case "$CFLAGS $CPPFLAGS" in
-*-DTRACE*)
+
(
*-DTRACE*)
cf_all_traces=yes
;;
esac
cf_all_traces=yes
;;
esac
@@
-441,21
+431,24
@@
fi
AC_SUBST(ADA_TRACE)
AC_SUBST(ADA_TRACE)
+CF_DISABLE_GNAT_PROJECTS
+
### Checks for libraries.
### Checks for libraries.
-case $cf_cv_system_name in
#(vi
-*mingw32*) #(vi
+case $cf_cv_system_name in
+(*mingw32*)
;;
;;
-*)
+
(
*)
AC_CHECK_FUNC(gettimeofday,
AC_DEFINE(HAVE_GETTIMEOFDAY),[
AC_CHECK_LIB(bsd, gettimeofday,
AC_CHECK_FUNC(gettimeofday,
AC_DEFINE(HAVE_GETTIMEOFDAY),[
AC_CHECK_LIB(bsd, gettimeofday,
- AC_DEFINE(HAVE_GETTIMEOFDAY)
+ AC_DEFINE(HAVE_GETTIMEOFDAY
,1,[Define to 1 if we have gettimeofday]
)
LIBS="$LIBS -lbsd")])dnl CLIX: bzero, select, gettimeofday
;;
esac
### Checks for header files.
LIBS="$LIBS -lbsd")])dnl CLIX: bzero, select, gettimeofday
;;
esac
### Checks for header files.
+AC_CHECK_SIZEOF([signed char], 0)
AC_STDC_HEADERS
AC_HEADER_DIRENT
AC_HEADER_TIME
AC_STDC_HEADERS
AC_HEADER_DIRENT
AC_HEADER_TIME
@@
-470,8
+463,6
@@
CF_LINK_DATAONLY
### Checks for library functions.
CF_MKSTEMP
### Checks for library functions.
CF_MKSTEMP
-AC_TYPE_SIGNAL
-
dnl We'll do our own -g libraries, unless the user's overridden via $CFLAGS
if test -z "$cf_user_CFLAGS" && test "$with_no_leaks" = no ; then
CF_STRIP_G_OPT(CFLAGS)
dnl We'll do our own -g libraries, unless the user's overridden via $CFLAGS
if test -z "$cf_user_CFLAGS" && test "$with_no_leaks" = no ; then
CF_STRIP_G_OPT(CFLAGS)
@@
-487,9
+478,10
@@
if test "$cf_with_ada" != "no" ; then
if test "$cf_cv_prog_gnat_correct" = yes; then
CF_FIXUP_ADAFLAGS
if test "$cf_cv_prog_gnat_correct" = yes; then
CF_FIXUP_ADAFLAGS
+ CF_GNATPREP_OPT_T
+
CF_GNAT_GENERICS
CF_GNAT_SIGINT
CF_GNAT_GENERICS
CF_GNAT_SIGINT
- CF_GNAT_PRAGMA_UNREF
CF_GNAT_PROJECTS
CF_WITH_ADA_COMPILER
CF_GNAT_PROJECTS
CF_WITH_ADA_COMPILER
@@
-538,36
+530,31
@@
AC_MSG_RESULT($DFT_OBJ_SUBDIR)
### Set up low-level terminfo dependencies for makefiles.
if test "$DFT_LWR_MODEL" = shared ; then
### Set up low-level terminfo dependencies for makefiles.
if test "$DFT_LWR_MODEL" = shared ; then
- case $cf_cv_system_name in
#(vi
- cygwin*)
+ case $cf_cv_system_name in
+
(
cygwin*)
# "lib" files have ".dll.a" suffix, "cyg" files have ".dll"
;;
# "lib" files have ".dll.a" suffix, "cyg" files have ".dll"
;;
+ (msys*)
+ # "lib" files have ".dll.a" suffix, "msys-" files have ".dll"
+ ;;
esac
fi
esac
fi
+USE_CFG_SUFFIX=${DFT_ARG_SUFFIX}
+AC_SUBST(USE_CFG_SUFFIX)
+
### Construct the list of subdirectories for which we'll customize makefiles
### with the appropriate compile-rules.
### Construct the list of subdirectories for which we'll customize makefiles
### with the appropriate compile-rules.
-SUB_MAKEFILES="gen/adacurses${
DFT
_ARG_SUFFIX}-config:gen/adacurses-config.in"
+SUB_MAKEFILES="gen/adacurses${
USE
_ARG_SUFFIX}-config:gen/adacurses-config.in"
-AC_DEFINE_UNQUOTED(NCURSES_PATHSEP,'$PATH_SEPARATOR')
+AC_DEFINE_UNQUOTED(NCURSES_PATHSEP,'$PATH_SEPARATOR'
,[Define to override ':' as the library path-separator]
)
### Now that we're done running tests, add the compiler-warnings, if any
CF_ADD_CFLAGS($EXTRA_CFLAGS)
################################################################################
### Now that we're done running tests, add the compiler-warnings, if any
CF_ADD_CFLAGS($EXTRA_CFLAGS)
################################################################################
-if test x"$enable_pc_files" = xyes ; then \
-SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
-MAKE_PC_FILES=
-else
-MAKE_PC_FILES="#"
-fi
-AC_SUBST(MAKE_PC_FILES)
-AC_SUBST(cross_compiling)
-
-################################################################################
-
TEST_ARG2=
AC_SUBST(TEST_ARG2)
TEST_ARG2=
AC_SUBST(TEST_ARG2)
@@
-598,6
+585,14
@@
AC_SUBST(EXTERNAL_TREE)
ADAHTML_DIR=../doc/ada
AC_SUBST(ADAHTML_DIR)
ADAHTML_DIR=../doc/ada
AC_SUBST(ADAHTML_DIR)
+if test "x$cross_compiling" = xyes ; then
+ ADAGEN_LDFLAGS='$(CROSS_LDFLAGS)'
+else
+ ADAGEN_LDFLAGS='$(NATIVE_LDFLAGS)'
+fi
+
+AC_SUBST(ADAGEN_LDFLAGS)
+
AC_OUTPUT( \
$SUB_MAKEFILES \
doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in \
AC_OUTPUT( \
$SUB_MAKEFILES \
doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in \