X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Ada95%2Fconfigure.in;h=06188a500ff12136086d1f41d65d2d05f6d1faca;hp=24eaee628917cc6a9fe7336f4031a64b8aba7211;hb=4298026c68384077462178f8018c8c1add0c3cdf;hpb=c3e8eb8e7407c4173394c2f52c635ed86327edc6 diff --git a/Ada95/configure.in b/Ada95/configure.in index 24eaee62..06188a50 100644 --- a/Ada95/configure.in +++ b/Ada95/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright (c) 2010-2011,2012 Free Software Foundation, Inc. * +dnl Copyright (c) 2010-2015,2016 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 * @@ -28,24 +28,20 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: configure.in,v 1.45 2012/10/06 22:42:31 tom Exp $ +dnl $Id: configure.in,v 1.62 2016/05/21 22:25:03 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 --------------------------------------------------------------------------- AC_PREREQ(2.52.20030208) -AC_REVISION($Revision: 1.45 $) +AC_REVISION($Revision: 1.62 $) 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" @@ -57,7 +53,7 @@ CF_CFG_DEFAULTS CF_PROG_CC(gnatgcc gcc cc) AC_PROG_CPP AC_PROG_GCC_TRADITIONAL -CF_PROG_CC_C_O(CC) +CF_PROG_CC_C_O(CC,[$CFLAGS $CPPFLAGS]) AC_ARG_PROGRAM @@ -71,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 -CF_ENABLE_PC_FILES AC_MSG_CHECKING(if you want to build test-programs) AC_ARG_WITH(tests, @@ -87,12 +82,12 @@ AC_ARG_ENABLE(mixed-case, [enable_mixedcase=auto]) AC_MSG_RESULT($enable_mixedcase) if test "$enable_mixedcase" = "auto" ; then - CF_MIXEDCASE_FILENAMES + CF_MIXEDCASE_FILENAMES 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). @@ -113,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)], - [case "$withval" in #(vi - yes|no) #(vi + [case "$withval" in + (yes|no) ;; - *) DESTDIR="$withval" + (*) DESTDIR="$withval" ;; esac]) AC_MSG_RESULT($DESTDIR) @@ -179,10 +174,10 @@ AC_SUBST(CC_G_OPT) 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) @@ -222,8 +217,8 @@ if test "$with_broken_linker" = yes ; 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) @@ -298,27 +293,27 @@ CF_WITH_PTHREAD 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 - CF_WEAK_SYMBOLS + CF_WEAK_SYMBOLS else - cf_cv_weak_symbols=no + cf_cv_weak_symbols=no fi if test $cf_cv_weak_symbols = yes ; then - AC_DEFINE(USE_WEAK_SYMBOLS,1,[Define to 1 to enable weak-symbols for pthreads]) + AC_DEFINE(USE_WEAK_SYMBOLS,1,[Define to 1 to enable weak-symbols for pthreads]) fi PTHREAD= if test "$with_pthread" = "yes" ; then - 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 + 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) @@ -377,7 +372,7 @@ AC_MSG_RESULT($with_warnings) if test "x$with_warnings" = "xyes"; then CF_ADD_ADAFLAGS(-gnatg) - CF_GCC_WARNINGS(Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum) + CF_GCC_WARNINGS(Wno-unknown-pragmas Wswitch-enum) fi CF_GCC_ATTRIBUTES @@ -415,7 +410,7 @@ AC_ARG_ENABLE(macros, # extended to all models of the ncurses library: cf_all_traces=no case "$CFLAGS $CPPFLAGS" in -*-DTRACE*) +(*-DTRACE*) cf_all_traces=yes ;; esac @@ -436,11 +431,13 @@ fi AC_SUBST(ADA_TRACE) +CF_DISABLE_GNAT_PROJECTS + ### 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),[ @@ -451,6 +448,7 @@ AC_CHECK_LIB(bsd, gettimeofday, esac ### Checks for header files. +AC_CHECK_SIZEOF([signed char], 0) AC_STDC_HEADERS AC_HEADER_DIRENT AC_HEADER_TIME @@ -465,8 +463,6 @@ CF_LINK_DATAONLY ### 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) @@ -482,9 +478,10 @@ if test "$cf_with_ada" != "no" ; then if test "$cf_cv_prog_gnat_correct" = yes; then CF_FIXUP_ADAFLAGS + CF_GNATPREP_OPT_T + CF_GNAT_GENERICS CF_GNAT_SIGINT - CF_GNAT_PRAGMA_UNREF CF_GNAT_PROJECTS CF_WITH_ADA_COMPILER @@ -533,17 +530,23 @@ AC_MSG_RESULT($DFT_OBJ_SUBDIR) ### 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" ;; + (msys*) + # "lib" files have ".dll.a" suffix, "msys-" files have ".dll" + ;; 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. -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',[Define to override ':' as the library path-separator]) @@ -552,17 +555,6 @@ 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) @@ -593,6 +585,14 @@ AC_SUBST(EXTERNAL_TREE) 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 \