dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.536 2010/06/26 21:38:51 tom Exp $
+dnl $Id: aclocal.m4,v 1.544 2010/09/04 23:25:24 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
dnl $2 = variable to update (default $LIBS)
AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ADD_SUBDIR_PATH version: 2 updated: 2007/07/29 10:12:59
+dnl CF_ADD_SUBDIR_PATH version: 3 updated: 2010/07/03 20:58:12
dnl ------------------
dnl Append to a search-list for a nonstandard header/lib-file
dnl $1 = the variable to return as result
[
test "$4" != "$5" && \
test -d "$4" && \
-ifelse([$5],NONE,,[(test $5 = NONE || test -d $5) &&]) {
+ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) {
test -n "$verbose" && echo " ... testing for $3-directories under $4"
test -d $4/$3 && $1="[$]$1 $4/$3"
test -d $4/$3/$2 && $1="[$]$1 $4/$3/$2"
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_GPM_WGETCH version: 1 updated: 2007/04/28 14:38:06
+dnl CF_CHECK_GPM_WGETCH version: 2 updated: 2010/08/14 18:25:37
dnl -------------------
dnl Check if GPM is already linked with curses. If so - and if the linkage
dnl is not "weak" - warn about this because it can create problems linking
test -z "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=no
fi
fi
- rm -f conftest*
+ rm -rf conftest*
LIBS="$cf_save_LIBS"
fi
])
AC_SUBST(DIRS_TO_MAKE)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_LEAKS version: 5 updated: 2010/03/13 15:14:55
+dnl CF_DISABLE_LEAKS version: 6 updated: 2010/07/23 04:14:32
dnl ----------------
dnl Combine no-leak checks with the libraries or tools that are used for the
dnl checks.
if test "$with_no_leaks" = yes ; then
AC_DEFINE(NO_LEAKS)
+ AC_DEFINE(YY_NO_LEAKS)
fi
])dnl
dnl ---------------------------------------------------------------------------
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 25 updated: 2010/04/24 11:03:31
+dnl CF_GCC_WARNINGS version: 26 updated: 2010/08/14 18:25:37
dnl ---------------
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:
done
CFLAGS="$cf_save_CFLAGS"
fi
-rm -f conftest*
+rm -rf conftest*
AC_SUBST(EXTRA_CFLAGS)
])dnl
AC_SUBST(PRAGMA_UNREF)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GNAT_TRY_LINK version: 1 updated: 2004/08/21 19:02:08
+dnl CF_GNAT_TRY_LINK version: 2 updated: 2010/08/14 18:25:37
dnl ----------------
dnl Verify that a test program compiles/links with GNAT.
dnl $cf_ada_make is set to the program that compiles/links
dnl $4 is the shell command to execute if not successful
AC_DEFUN([CF_GNAT_TRY_LINK],
[
-rm -f conftest*
+rm -rf conftest*
cat >>conftest.ads <<CF_EOF
$1
CF_EOF
ifelse($4,,,[else
$4])
fi
-rm -f conftest*
+rm -rf conftest*
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GNAT_TRY_RUN version: 3 updated: 2004/08/21 19:02:08
+dnl CF_GNAT_TRY_RUN version: 4 updated: 2010/08/14 18:25:37
dnl ---------------
dnl Verify that a test program compiles and runs with GNAT
dnl $cf_ada_make is set to the program that compiles/links
dnl $4 is the shell command to execute if not successful
AC_DEFUN([CF_GNAT_TRY_RUN],
[
-rm -f conftest*
+rm -rf conftest*
cat >>conftest.ads <<CF_EOF
$1
CF_EOF
ifelse($4,,,[else
$4])
fi
-rm -f conftest*
+rm -rf conftest*
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GNAT_VERSION version: 13 updated: 2010/06/19 15:22:18
+dnl CF_GNAT_VERSION version: 14 updated: 2010/07/03 17:45:09
dnl ---------------
dnl Verify version of GNAT.
AC_DEFUN([CF_GNAT_VERSION],
cf_cv_prog_gnat_correct=no
;;
esac
+
case $cf_gnat_version in
3.[[1-9]]*|[[4-9]].*)
cf_compile_generics=generics
;;
esac
+case $cf_gnat_version in
+ 3.[[0-9]]*)
+ USE_OLD_MAKERULES=""
+ USE_GNAT_PROJECTS="#"
+ ;;
+ *)
+ USE_OLD_MAKERULES="#"
+ USE_GNAT_PROJECTS=""
+ ;;
+esac
+
AC_SUBST(cf_compile_generics)
AC_SUBST(cf_generic_objects)
+
+AC_SUBST(USE_OLD_MAKERULES)
+AC_SUBST(USE_GNAT_PROJECTS)
])
dnl ---------------------------------------------------------------------------
dnl CF_GNU_SOURCE version: 6 updated: 2005/07/09 13:23:07
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GXX_WARNINGS version: 5 updated: 2005/08/13 14:54:38
+dnl CF_GXX_WARNINGS version: 6 updated: 2010/08/14 18:25:37
dnl ---------------
dnl Check if the compiler supports useful warning options.
dnl
CXXFLAGS="$cf_save_CXXFLAGS"
fi
-rm -f conftest*
+rm -rf conftest*
AC_LANG_RESTORE
AC_SUBST(EXTRA_CXXFLAGS)
])dnl
AC_SUBST(LIB_PREFIX)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 56 updated: 2010/05/15 15:19:46
+dnl CF_LIB_RULES version: 59 updated: 2010/09/04 19:24:20
dnl ------------
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
TINFO_SUFFIX=.dll
fi
+if test -n "$TINFO_SUFFIX" ; then
+ case $TINFO_SUFFIX in
+ tw*)
+ TINFO_NAME="${TINFO_NAME}tw"
+ TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^tw//'`
+ ;;
+ t*)
+ TINFO_NAME="${TINFO_NAME}t"
+ TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^t//'`
+ ;;
+ w*)
+ TINFO_NAME="${TINFO_NAME}w"
+ TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^w//'`
+ ;;
+ esac
+fi
+
for cf_dir in $SRC_SUBDIRS
do
if test ! -d $srcdir/$cf_dir ; then
case "$cf_cv_system_name" in #(vi
darwin*)
case .${LIB_SUFFIX} in
+ .tw*)
+ cf_suffix=`echo $cf_suffix | sed 's/^tw//'`
+ cf_suffix=tw'.${REL_VERSION}'"$cf_suffix"
+ ;;
+ .t*)
+ cf_suffix=`echo $cf_suffix | sed 's/^t//'`
+ cf_suffix=t'.${REL_VERSION}'"$cf_suffix"
+ ;;
.w*)
cf_suffix=`echo $cf_suffix | sed 's/^w//'`
cf_suffix=w'.${REL_VERSION}'"$cf_suffix"
case "$cf_cv_system_name" in #(vi
darwin*)
case .${LIB_SUFFIX} in
+ .tw*)
+ cf_suffix=`echo $cf_suffix | sed 's/^tw//'`
+ cf_suffix=tw'.${ABI_VERSION}'"$cf_suffix"
+ ;;
+ .t*)
+ 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"
if test "$cf_cv_shlib_version_infix" = yes ; then
if test -n "$LIB_SUFFIX" ; then
case $LIB_SUFFIX in
+ tw*)
+ cf_libname=`echo $cf_libname | sed 's/tw$//'`
+ cf_suffix=`echo $cf_suffix | sed 's/^tw//'`
+ cf_dir_suffix=tw
+ ;;
+ t*)
+ cf_libname=`echo $cf_libname | sed 's/t$//'`
+ cf_suffix=`echo $cf_suffix | sed 's/^t//'`
+ cf_dir_suffix=t
+ ;;
w*)
cf_libname=`echo $cf_libname | sed 's/w$//'`
cf_suffix=`echo $cf_suffix | sed 's/^w//'`
prefix=$cf_prefix \
suffix=$cf_suffix \
subset=$cf_subset \
+ SymLink="$LN_S" \
TermlibRoot=$TINFO_NAME \
TermlibSuffix=$TINFO_SUFFIX \
ShlibVer=$cf_cv_shlib_version \
fi
fi
done
-
+AC_SUBST(LIBS_TO_MAKE)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LIB_SONAME version: 4 updated: 2010/05/29 16:31:02
+dnl CF_LIB_SONAME version: 5 updated: 2010/08/14 18:25:37
dnl -------------
dnl Find the and soname for the given shared library. Set the cache variable
dnl cf_cv_$3_soname to this, unless it is not found. Then set the cache
test -z "$cf_cv_$3_soname" && cf_cv_$3_soname=unknown
fi
fi
-rm -f conftest*
+rm -rf conftest*
LIBS="$cf_save_LIBS"
fi
])
AC_SUBST(MANPAGE_RENAMES)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MANPAGE_SYMLINKS version: 4 updated: 2003/12/13 18:01:58
+dnl CF_MANPAGE_SYMLINKS version: 5 updated: 2010/07/24 17:12:40
dnl -------------------
dnl Some people expect each tool to make all aliases for manpages in the
dnl man-directory. This accommodates the older, less-capable implementations
AC_MSG_RESULT($MANPAGE_ALIASES)
-if test "$LN_S" = "ln -s"; then
+case "x$LN_S" in #(vi
+xln*) #(vi
cf_use_symlinks=yes
-else
+ ;;
+*)
cf_use_symlinks=no
-fi
+ ;;
+esac
MANPAGE_SYMLINKS=no
if test "$MANPAGE_ALIASES" = yes ; then
AC_MSG_RESULT($MANPAGE_TBL)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 37 updated: 2010/05/15 16:05:34
+dnl CF_MAN_PAGES version: 38 updated: 2010/07/24 17:12:40
dnl ------------
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
cf_so_strip="Z"
cf_compress=compress
;;
-*gzip*) #(vi
+*gzip*)
cf_so_strip="gz"
cf_compress=gzip
;;
fi
fi
echo .. \$verb alias \$cf_alias\${suffix}
+CF_EOF
+case "x$LN_S" in #(vi
+*-f) #(vi
+cat >>$cf_edit_man <<CF_EOF
+ $LN_S \$cf_target \$cf_alias\${suffix}
+CF_EOF
+ ;;
+*)
+cat >>$cf_edit_man <<CF_EOF
rm -f \$cf_alias\${suffix}
$LN_S \$cf_target \$cf_alias\${suffix}
+CF_EOF
+ ;;
+esac
+cat >>$cf_edit_man <<CF_EOF
elif test "\$cf_target" != "\$cf_alias\${suffix}" ; then
echo ".so \$cf_source" >\$TMP
CF_EOF
test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MKSTEMP version: 6 updated: 2010/05/22 14:44:30
+dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37
dnl ----------
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).
AC_DEFUN([CF_MKSTEMP],[
AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[
-rm -f conftest*
+rm -rf conftest*
AC_TRY_RUN([
#include <sys/types.h>
#include <stdlib.h>
test -z "$AWK" && AC_MSG_ERROR(No awk program found)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_PROG_CC_C_O version: 2 updated: 2006/12/16 15:55:46
+dnl CF_PROG_CC_C_O version: 3 updated: 2010/08/14 18:25:37
dnl --------------
dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that
dnl the output file can be renamed, and allows for a shell variable that can
else
eval cf_cv_prog_$1_c_o=no
fi
-rm -f conftest*
+rm -rf conftest*
])dnl
if test $cf_cv_prog_$1_c_o = yes; then
AC_MSG_RESULT([yes])
AC_SUBST(LINT_OPTS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_REGEX version: 7 updated: 2010/05/29 16:31:02
+dnl CF_PROG_LN_S version: 2 updated: 2010/08/14 18:25:37
+dnl ------------
+dnl Combine checks for "ln -s" and "ln -sf", updating $LN_S to include "-f"
+dnl option if it is supported.
+AC_DEFUN([CF_PROG_LN_S],[
+AC_PROG_LN_S
+AC_MSG_CHECKING(if $LN_S -f options work)
+
+rm -f conf$$.src conf$$dst
+echo >conf$$.dst
+echo first >conf$$.src
+if $LN_S -f conf$$.src conf$$.dst 2>/dev/null; then
+ cf_prog_ln_sf=yes
+else
+ cf_prog_ln_sf=no
+fi
+rm -f conf$$.dst conf$$src
+AC_MSG_RESULT($cf_prog_ln_sf)
+
+test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_REGEX version: 8 updated: 2010/08/07 14:09:44
dnl --------
dnl Attempt to determine if we've got one of the flavors of regular-expression
dnl code that we can support.
cf_regex_func=no
+cf_regex_libs="regex re"
+case $host_os in #(vi
+mingw*)
+ cf_regex_libs="regex.dll $cf_regex_libs"
+ ;;
+esac
+
AC_CHECK_FUNC(regcomp,[cf_regex_func=regcomp],[
- for cf_regex_lib in regex re
+ for cf_regex_lib in $cf_regex_libs
do
AC_CHECK_LIB($cf_regex_lib,regcomp,[
CF_ADD_LIB($cf_regex_lib)
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_SRC_MODULES version: 20 updated: 2008/12/27 12:30:03
+dnl CF_SRC_MODULES version: 21 updated: 2010/09/04 17:37:40
dnl --------------
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
do
SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
done
-SRC_SUBDIRS="$SRC_SUBDIRS test"
+if test "x$cf_with_tests" != "xno" ; then
+ SRC_SUBDIRS="$SRC_SUBDIRS test"
+fi
test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc"
test "$cf_with_cxx_binding" != no && SRC_SUBDIRS="$SRC_SUBDIRS c++"
ADA_SUBDIRS=
if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then
SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
- ADA_SUBDIRS="gen src samples"
+ ADA_SUBDIRS="gen src"
+ if test "x$cf_with_tests" != "xno" ; then
+ ADA_SUBDIRS="$ADA_SUBDIRS samples"
+ fi
fi
SUB_MAKEFILES=