Changeset 42336618


Ignore:
Timestamp:
May 27, 2015, 1:51:38 PM (7 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, string, with_gc
Children:
f7d59bf
Parents:
4d51835
Message:

fix automake fifth attempt

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    r4d51835 r42336618  
     1AUTOMAKE_OPTIONS=foreign
    12SUBDIRS = driver src libcfa  # order important, src before libcfa because cfa-cpp used to build prelude
    23
  • Makefile.in

    r4d51835 r42336618  
    3737        $(top_srcdir)/configure $(top_srcdir)/driver/Makefile.in \
    3838        $(top_srcdir)/libcfa/Makefile.in $(top_srcdir)/src/Makefile.in \
    39         $(top_srcdir)/src/examples/Makefile.in INSTALL install-sh \
    40         missing
     39        $(top_srcdir)/src/examples/Makefile.in COPYING INSTALL \
     40        install-sh missing
    4141ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    4242am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     
    204204top_builddir = @top_builddir@
    205205top_srcdir = @top_srcdir@
     206AUTOMAKE_OPTIONS = foreign
    206207SUBDIRS = driver src libcfa  # order important, src before libcfa because cfa-cpp used to build prelude
    207208
  • config.h.in

    r4d51835 r42336618  
    4646#undef HAVE_LIMITS_H
    4747
    48 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
    49    to 0 otherwise. */
    50 #undef HAVE_MALLOC
    51 
    5248/* Define to 1 if you have the <malloc.h> header file. */
    5349#undef HAVE_MALLOC_H
     
    6157/* Define to 1 if you have the `putenv' function. */
    6258#undef HAVE_PUTENV
    63 
    64 /* Define to 1 if your system has a GNU libc compatible `realloc' function,
    65    and to 0 otherwise. */
    66 #undef HAVE_REALLOC
    6759
    6860/* Define to 1 if stdbool.h conforms to C99. */
     
    165157#undef int8_t
    166158
    167 /* Define to rpl_malloc if the replacement function should be used. */
    168 #undef malloc
    169 
    170 /* Define to rpl_realloc if the replacement function should be used. */
    171 #undef realloc
    172 
    173159/* Define to the equivalent of the C99 'restrict' keyword, or to
    174160   nothing if this is not supported.  Do not define if restrict is
  • configure

    r4d51835 r42336618  
    53205320
    53215321# Checks for library functions.
    5322 for ac_header in stdlib.h
    5323 do :
    5324   ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
    5325 if test "x$ac_cv_header_stdlib_h" = xyes; then :
    5326   cat >>confdefs.h <<_ACEOF
    5327 #define HAVE_STDLIB_H 1
    5328 _ACEOF
    5329 
    5330 fi
    5331 
    5332 done
    5333 
    5334 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
    5335 $as_echo_n "checking for GNU libc compatible malloc... " >&6; }
    5336 if ${ac_cv_func_malloc_0_nonnull+:} false; then :
    5337   $as_echo_n "(cached) " >&6
    5338 else
    5339   if test "$cross_compiling" = yes; then :
    5340   ac_cv_func_malloc_0_nonnull=no
    5341 else
    5342   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    5343 /* end confdefs.h.  */
    5344 #if defined STDC_HEADERS || defined HAVE_STDLIB_H
    5345 # include <stdlib.h>
    5346 #else
    5347 char *malloc ();
    5348 #endif
    5349 
    5350 int
    5351 main ()
    5352 {
    5353 return ! malloc (0);
    5354   ;
    5355   return 0;
    5356 }
    5357 _ACEOF
    5358 if ac_fn_c_try_run "$LINENO"; then :
    5359   ac_cv_func_malloc_0_nonnull=yes
    5360 else
    5361   ac_cv_func_malloc_0_nonnull=no
    5362 fi
    5363 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
    5364   conftest.$ac_objext conftest.beam conftest.$ac_ext
    5365 fi
    5366 
    5367 fi
    5368 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
    5369 $as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
    5370 if test $ac_cv_func_malloc_0_nonnull = yes; then :
    5371 
    5372 $as_echo "#define HAVE_MALLOC 1" >>confdefs.h
    5373 
    5374 else
    5375   $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
    5376 
    5377    case " $LIBOBJS " in
    5378   *" malloc.$ac_objext "* ) ;;
    5379   *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
    5380  ;;
    5381 esac
    5382 
    5383 
    5384 $as_echo "#define malloc rpl_malloc" >>confdefs.h
    5385 
    5386 fi
    5387 
    5388 
    5389 for ac_header in stdlib.h
    5390 do :
    5391   ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
    5392 if test "x$ac_cv_header_stdlib_h" = xyes; then :
    5393   cat >>confdefs.h <<_ACEOF
    5394 #define HAVE_STDLIB_H 1
    5395 _ACEOF
    5396 
    5397 fi
    5398 
    5399 done
    5400 
    5401 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
    5402 $as_echo_n "checking for GNU libc compatible realloc... " >&6; }
    5403 if ${ac_cv_func_realloc_0_nonnull+:} false; then :
    5404   $as_echo_n "(cached) " >&6
    5405 else
    5406   if test "$cross_compiling" = yes; then :
    5407   ac_cv_func_realloc_0_nonnull=no
    5408 else
    5409   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    5410 /* end confdefs.h.  */
    5411 #if defined STDC_HEADERS || defined HAVE_STDLIB_H
    5412 # include <stdlib.h>
    5413 #else
    5414 char *realloc ();
    5415 #endif
    5416 
    5417 int
    5418 main ()
    5419 {
    5420 return ! realloc (0, 0);
    5421   ;
    5422   return 0;
    5423 }
    5424 _ACEOF
    5425 if ac_fn_c_try_run "$LINENO"; then :
    5426   ac_cv_func_realloc_0_nonnull=yes
    5427 else
    5428   ac_cv_func_realloc_0_nonnull=no
    5429 fi
    5430 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
    5431   conftest.$ac_objext conftest.beam conftest.$ac_ext
    5432 fi
    5433 
    5434 fi
    5435 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
    5436 $as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
    5437 if test $ac_cv_func_realloc_0_nonnull = yes; then :
    5438 
    5439 $as_echo "#define HAVE_REALLOC 1" >>confdefs.h
    5440 
    5441 else
    5442   $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
    5443 
    5444    case " $LIBOBJS " in
    5445   *" realloc.$ac_objext "* ) ;;
    5446   *) LIBOBJS="$LIBOBJS realloc.$ac_objext"
    5447  ;;
    5448 esac
    5449 
    5450 
    5451 $as_echo "#define realloc rpl_realloc" >>confdefs.h
    5452 
    5453 fi
    5454 
    5455 
    54565322for ac_func in memset putenv strchr strtol
    54575323do :
  • configure.ac

    r4d51835 r42336618  
    33
    44AC_PREREQ([2.68])
    5 AC_INIT(cfa-cc, 1.0.0, cforall@plg.uwaterloo.ca)
     5AC_INIT([cfa-cc],[1.0.0],[cforall@plg.uwaterloo.ca])
    66#AM_INIT_AUTOMAKE([foreign])            # do not follow GNU standard
    77AM_INIT_AUTOMAKE
     
    9494
    9595# Checks for library functions.
    96 AC_FUNC_MALLOC
    97 AC_FUNC_REALLOC
    9896AC_CHECK_FUNCS([memset putenv strchr strtol])
    9997
Note: See TracChangeset for help on using the changeset viewer.