Changeset 0c26a1 in git for factory/configure.ac


Ignore:
Timestamp:
Oct 15, 2021, 4:09:30 PM (3 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
3551885a5d35f5d806aa9a27ec225b51933cd05c
Parents:
69185ceb2807ebeacfe2824621e4b70e2ed19642
Message:
Revert "update configure stuff": requires autoconf 2.7.1

This reverts commit 69185ceb2807ebeacfe2824621e4b70e2ed19642.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • factory/configure.ac

    r69185ce r0c26a1  
    1313# - initialisation.
    1414#
    15 AC_INIT([factory],[4.2.1])
     15AC_INIT([factory], [4.2.1])
    1616AC_CONFIG_SRCDIR(canonicalform.cc)
    1717AC_CONFIG_MACRO_DIR([../m4])
    1818AC_CONFIG_AUX_DIR([../build-aux])
    19 AC_CONFIG_HEADERS([_config.h])
     19AC_CONFIG_HEADER([_config.h])
    2020
    2121AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
     
    228228#AC_CACHE_VAL(ac_cv_shift,
    229229#  [ LDFLAGS="-L$explicit_libdir $LDFLAGS"
    230 #       AC_RUN_IFELSE([AC_LANG_SOURCE([[#       int main() { if (-2 >> 1 == -1) return(0); else return(1); } ]])],[#      ac_cv_shift=yes],[ac_cv_shift=no],[ac_cv_shift=yes]) ])
     230#       AC_TRY_RUN(
     231#      [ int main() { if (-2 >> 1 == -1) return(0); else return(1); } ],
     232#      ac_cv_shift=yes, ac_cv_shift=no, ac_cv_shift=yes) ])
    231233#if test "x$ac_cv_shift" = xyes; then
    232234#  AC_MSG_RESULT(yes)
     
    238240# - check for header files.
    239241#
    240 AC_LANG([C++])
     242AC_LANG_CPLUSPLUS
    241243AC_LANG_PUSH([C++])
    242244
     
    271273# use C to check compiler characteristics instead of C++.  On
    272274# nextstep, checking with C++ may fail.
    273 # AC_LANG([C])
     275# AC_LANG_C
    274276
    275277# cross-compiling ?!
    276 #
     278#AC_C_CROSS
    277279#if test "x$cross_compiling" = xyes; then
    278280#  AC_MSG_WARN([you better specify a cache file to get the values for
     
    311313#
    312314#AC_LANG_SAVE
    313 #AC_LANG([C++])
     315#AC_LANG_CPLUSPLUS
    314316# check whether CXX accepts -fno-rtti
    315317#AC_MSG_CHECKING(whether gcc accepts -fno-rtti)
     
    317319#CXXFLAGS="${CXXFLAGS}"
    318320#AC_CACHE_VAL(ac_cv_cxx_have_rtti,
    319 #AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[ac_cv_cxx_have_rtti=yes],[ac_cv_cxx_have_rtti=no])
     321#AC_TRY_COMPILE(,,ac_cv_cxx_have_rtti=yes,ac_cv_cxx_have_rtti=no)
    320322#)
    321323#AC_MSG_RESULT(${ac_cv_cxx_have_rtti})
     
    328330#CXXFLAGS="${CXXFLAGS} -fno-exceptions"
    329331#AC_CACHE_VAL(ac_cv_cxx_have_exceptions,
    330 #AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[ac_cv_cxx_have_exceptions=yes],[ac_cv_cxx_have_exceptions=no])
     332#AC_TRY_LINK(,,ac_cv_cxx_have_exceptions=yes,ac_cv_cxx_have_exceptions=no)
    331333#)
    332334#AC_MSG_RESULT(${ac_cv_cxx_have_exceptions})
Note: See TracChangeset for help on using the changeset viewer.