dnl***************************************************************************
-dnl Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+dnl Copyright (c) 1998-2010,2011 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 Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: configure.in,v 1.514 2010/11/28 00:12:45 tom Exp $
+dnl $Id: configure.in,v 1.526 2011/09/24 14:40:59 nix 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 ---------------------------------------------------------------------------
AC_PREREQ(2.13.20020210)
-AC_REVISION($Revision: 1.514 $)
+AC_REVISION($Revision: 1.526 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
# if we find pkg-config, check if we should install the ".pc" files.
CF_PKG_CONFIG
-
-if test "$PKG_CONFIG" != no ; then
- AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
-
- # Leave this as something that can be overridden in the environment.
- if test -z "$PKG_CONFIG_LIBDIR" ; then
- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`/lib/pkgconfig
- fi
- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
- 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)
- else
- AC_MSG_RESULT(no)
- AC_MSG_WARN(did not find library $PKG_CONFIG_LIBDIR)
- enable_pc_files=no
- fi
-fi
-AC_SUBST(PKG_CONFIG_LIBDIR)
+CF_WITH_PKG_CONFIG_LIBDIR
+CF_ENABLE_PC_FILES
AC_MSG_CHECKING(if we should assume mixed-case filenames)
AC_ARG_ENABLE(mixed-case,
esac
AC_SUBST(TERMINFO_SRC)
-CF_PATHSEP
if test "$use_database" != no ; then
AC_DEFINE(USE_DATABASE)
AC_MSG_RESULT($with_ext_funcs)
if test "$with_ext_funcs" = yes ; then
NCURSES_EXT_FUNCS=1
+ AC_DEFINE(HAVE_ASSUME_DEFAULT_COLORS)
AC_DEFINE(HAVE_CURSES_VERSION)
AC_DEFINE(HAVE_HAS_KEY)
AC_DEFINE(HAVE_RESIZETERM)
AC_DEFINE(HAVE_RESIZE_TERM)
AC_DEFINE(HAVE_TERM_ENTRY_H)
AC_DEFINE(HAVE_USE_DEFAULT_COLORS)
+ AC_DEFINE(HAVE_USE_SCREEN)
+ AC_DEFINE(HAVE_USE_WINDOW)
AC_DEFINE(HAVE_WRESIZE)
AC_DEFINE(NCURSES_EXT_FUNCS)
GENERATED_EXT_FUNCS=generated
getopt.h \
limits.h \
locale.h \
+math.h \
poll.h \
sys/bsdtypes.h \
sys/ioctl.h \
wctype.h \
)
+CF_GETOPT_HEADER
+
# check for ISC (this may also define _POSIX_SOURCE)
# Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
if test "$ISC" = yes ; then
if test "$cf_with_ada" != "no" ; then
CF_PROG_GNAT
if test "$cf_cv_prog_gnat_correct" = yes; then
- CF_ADD_ADAFLAGS(-O3 -gnatpn)
+ CF_ADD_ADAFLAGS(-gnatpn)
+ # make ADAFLAGS consistent with CFLAGS
+ case "$CFLAGS" in
+ *-g*)
+ CF_ADD_ADAFLAGS(-g)
+ ;;
+ esac
+ case "$CFLAGS" in
+ *-O*)
+ CF_ADD_ADAFLAGS(-O3)
+ ;;
+ esac
+
+ CF_GNAT_GENERICS
+ CF_GNAT_SIGINT
CF_GNAT_PRAGMA_UNREF
+ CF_GNAT_PROJECTS
CF_WITH_ADA_COMPILER
TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}"
fi
- TICS_ARGS="-L${LIB_DIR} -l${TICS_LIB_SUFFIX}"
+ TICS_LDFLAGS="-L${LIB_DIR}"
+ TICS_LIBS="-l${TICS_LIB_SUFFIX}"
else
- TICS_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
+ TICS_LDFLAGS="-L${LIB_DIR}"
+ TICS_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}"
fi
AC_SUBST(TICS_ARG_SUFFIX)
AC_SUBST(TICS_DEP_SUFFIX)
AC_SUBST(TICS_LIB_SUFFIX)
-AC_SUBST(TICS_ARGS)
+AC_SUBST(TICS_LDFLAGS)
+AC_SUBST(TICS_LIBS)
if test "$with_termlib" != no ; then
if test "$DFT_LWR_MODEL" = "libtool"; then
TEST_ARGS="${TEST_DEPS}"
TEST_ARG2="${TEST_DEP2}"
- TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
+ TINFO_LDFLAGS="-L${LIB_DIR}"
+ TINFO_LIBS="$TEST_ARGS"
TICS_LIST="$SHLIB_LIST $TEST_ARGS"
SHLIB_LIST="${SHLIB_LIST} $TEST_ARGS"
else
TEST_ARGS="-l${TINFO_ARG_SUFFIX}"
TEST_ARG2="-l${TINFO_ARG_SUFFIX}"
TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
- TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
+ TINFO_LDFLAGS="-L${LIB_DIR}"
+ TINFO_LIBS="$TEST_ARGS"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
else
TICS_LIST="$SHLIB_LIST"
fi
- TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
+ TINFO_LDFLAGS="-L${LIB_DIR}"
+ TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}"
fi
if test "$DFT_LWR_MODEL" = shared ; then
AC_SUBST(TINFO_ARG_SUFFIX)
AC_SUBST(TINFO_DEP_SUFFIX)
AC_SUBST(TINFO_LIB_SUFFIX)
-AC_SUBST(TINFO_ARGS)
+AC_SUBST(TINFO_LDFLAGS)
+AC_SUBST(TINFO_LIBS)
if test "$with_dlsym" = yes ; then
CF_REMOVE_LIB(TICS_LIST,$TICS_LIST,dl)
fi
# needed for Ada95
-TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`
-AC_SUBST(TINFO_ARGS2)
+TINFO_LDFLAGS2=`echo "$TINFO_LDFLAGS" | sed -e 's,-L\.\./,-L../../,'`
+AC_SUBST(TINFO_LDFLAGS2)
case $DFT_LWR_MODEL in
normal|debug|profile)
fi
AC_SUBST(MAKE_TESTS)
+ADAHTML_DIR=../../doc/html/ada
+AC_SUBST(ADAHTML_DIR)
+
SUB_SCRIPTS=
case $cf_cv_system_name in #(vi
*mingw32*) #(vi
projects / ncurses.git / blobdiff