From 098a6834fb0dd802d16181ef18a0781c5762e836 Mon Sep 17 00:00:00 2001 From: Alex Smith Date: Wed, 1 Apr 2009 00:53:28 -0400 Subject: [PATCH] Build system improvements --- buildaux/Makefile.am | 8 +- buildaux/Makefile.in | 24 ++- buildaux/hostmak.in | 1 + configure | 412 +++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + etc/cftoec.sh | 7 +- src/configh.in | 3 + 7 files changed, 442 insertions(+), 14 deletions(-) diff --git a/buildaux/Makefile.am b/buildaux/Makefile.am index 0e18bd9..a201d60 100644 --- a/buildaux/Makefile.am +++ b/buildaux/Makefile.am @@ -36,13 +36,15 @@ oil_SOURCES = src/oil.y oil_YFLAGS = bin2c_SOURCES = src/bin2c.c oil$(EXEEXT_FOR_BUILD): oil-oil.c bconfig.h - $(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(INCLUDES) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o oil$(EXEEXT_FOR_BUILD) oil-oil.c + $(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(INCLUDES) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o oil$(EXEEXT_FOR_BUILD) oil-oil.c $(LIBS_FOR_BUILD) bin2c$(EXEEXT_FOR_BUILD): src/bin2c.c bconfig.h - $(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(INCLUDES) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o bin2c$(EXEEXT_FOR_BUILD) `test -f 'src/bin2c.c' || echo '$(srcdir)/'`src/bin2c.c + $(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(INCLUDES) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o bin2c$(EXEEXT_FOR_BUILD) `test -f 'src/bin2c.c' || echo '$(srcdir)/'`src/bin2c.c $(LIBS_FOR_BUILD) oil: bin2c: -lib_LIBRARIES = libick.a libickmt.a libickec.a libyuk.a +# Optional libraries are in lib_LIBRARIES, but with a null build rule. +lib_LIBRARIES = libick.a libickmt.a libickec.a libyuk.a libick_ecto_b98.a +libick_ecto_b98.a: libick_a_SOURCES = src/cesspool.c src/numerals.c src/ick_lose.c src/fiddle.c \ src/arrgghh.c src/clc-cset.c src/uncommon.c libick_a_LIBADD = atari.o baudot.o ebcdic.o latin1.o diff --git a/buildaux/Makefile.in b/buildaux/Makefile.in index b7a0c6f..09cf8d3 100644 --- a/buildaux/Makefile.in +++ b/buildaux/Makefile.in @@ -71,6 +71,10 @@ am_libick_a_OBJECTS = cesspool.$(OBJEXT) numerals.$(OBJEXT) \ ick_lose.$(OBJEXT) fiddle.$(OBJEXT) arrgghh.$(OBJEXT) \ clc-cset.$(OBJEXT) uncommon.$(OBJEXT) libick_a_OBJECTS = $(am_libick_a_OBJECTS) +libick_ecto_b98_a_AR = $(AR) $(ARFLAGS) +libick_ecto_b98_a_LIBADD = +libick_ecto_b98_a_SOURCES = libick_ecto_b98.c +libick_ecto_b98_a_OBJECTS = libick_ecto_b98.$(OBJEXT) libickec_a_AR = $(AR) $(ARFLAGS) libickec_a_DEPENDENCIES = atari.o baudot.o ebcdic.o latin1.o am_libickec_a_OBJECTS = cesspool.$(OBJEXT) numerals.$(OBJEXT) \ @@ -118,14 +122,14 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) YLWRAP = $(top_srcdir)/buildaux/ylwrap YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) -SOURCES = $(libick_a_SOURCES) $(libickec_a_SOURCES) \ +SOURCES = $(libick_a_SOURCES) libick_ecto_b98.c $(libickec_a_SOURCES) \ $(libickmt_a_SOURCES) $(libidiot_a_SOURCES) \ $(libyuk_a_SOURCES) $(bin2c_SOURCES) $(convickt_SOURCES) \ $(ick_SOURCES) $(nodist_ick_SOURCES) $(oil_SOURCES) -DIST_SOURCES = $(libick_a_SOURCES) $(libickec_a_SOURCES) \ - $(libickmt_a_SOURCES) $(libidiot_a_SOURCES) \ - $(libyuk_a_SOURCES) $(bin2c_SOURCES) $(convickt_SOURCES) \ - $(ick_SOURCES) $(oil_SOURCES) +DIST_SOURCES = $(libick_a_SOURCES) libick_ecto_b98.c \ + $(libickec_a_SOURCES) $(libickmt_a_SOURCES) \ + $(libidiot_a_SOURCES) $(libyuk_a_SOURCES) $(bin2c_SOURCES) \ + $(convickt_SOURCES) $(ick_SOURCES) $(oil_SOURCES) am__dirstamp = $(am__leading_dot)dirstamp INFO_DEPS = $(srcdir)/doc/ick.info TEXINFO_TEX = $(top_srcdir)/buildaux/texinfo.tex @@ -279,7 +283,9 @@ convickt_SOURCES = src/convickt.c src/clc-cset.c src/uncommon.c oil_SOURCES = src/oil.y oil_YFLAGS = bin2c_SOURCES = src/bin2c.c -lib_LIBRARIES = libick.a libickmt.a libickec.a libyuk.a + +# Optional libraries are in lib_LIBRARIES, but with a null build rule. +lib_LIBRARIES = libick.a libickmt.a libickec.a libyuk.a libick_ecto_b98.a libick_a_SOURCES = src/cesspool.c src/numerals.c src/ick_lose.c src/fiddle.c \ src/arrgghh.c src/clc-cset.c src/uncommon.c @@ -492,6 +498,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ick_ec.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ick_lose.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lexer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libick_ecto_b98.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/numerals.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oil-oil.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser.Po@am__quote@ @@ -1407,11 +1414,12 @@ libidiot.a: src/idiotism.oil oil$(EXEEXT) src/oil.h src/sizes.h src/ick.h \ @INCLUDE_HIDDEN_FROM_AUTOMAKE@ ./host.mak oil$(EXEEXT_FOR_BUILD): oil-oil.c bconfig.h - $(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(INCLUDES) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o oil$(EXEEXT_FOR_BUILD) oil-oil.c + $(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(INCLUDES) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o oil$(EXEEXT_FOR_BUILD) oil-oil.c $(LIBS_FOR_BUILD) bin2c$(EXEEXT_FOR_BUILD): src/bin2c.c bconfig.h - $(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(INCLUDES) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o bin2c$(EXEEXT_FOR_BUILD) `test -f 'src/bin2c.c' || echo '$(srcdir)/'`src/bin2c.c + $(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(INCLUDES) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o bin2c$(EXEEXT_FOR_BUILD) `test -f 'src/bin2c.c' || echo '$(srcdir)/'`src/bin2c.c $(LIBS_FOR_BUILD) oil: bin2c: +libick_ecto_b98.a: atari.o: bin2c$(EXEEXT_FOR_BUILD) src/atari.bin ./bin2c$(EXEEXT_FOR_BUILD) ick_clc_cset_atari < `test -f 'src/atari.bin' || echo '$(srcdir)/'`src/atari.bin > atari.c $(COMPILE) -c atari.c diff --git a/buildaux/hostmak.in b/buildaux/hostmak.in index 534ae1b..e05d4ae 100644 --- a/buildaux/hostmak.in +++ b/buildaux/hostmak.in @@ -3,3 +3,4 @@ CFLAGS_FOR_BUILD = @CFLAGS@ CPPFLAGS_FOR_BUILD = @CPPFLAGS@ EXEEXT_FOR_BUILD = @EXEEXT@ LDFLAGS_FOR_BUILD = @LDFLAGS@ +LIBS_FOR_BUILD = @LIBS@ diff --git a/configure b/configure index 33e71ab..f295d0f 100755 --- a/configure +++ b/configure @@ -5763,6 +5763,418 @@ cat >>confdefs.h <<_ACEOF _ACEOF +{ echo "$as_me:$LINENO: checking for sig_atomic_t" >&5 +echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6; } +if test "${ac_cv_type_sig_atomic_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +typedef sig_atomic_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_sig_atomic_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_sig_atomic_t=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5 +echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6; } + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of sig_atomic_t" >&5 +echo $ECHO_N "checking size of sig_atomic_t... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_sig_atomic_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + + typedef sig_atomic_t ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + + typedef sig_atomic_t ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + + typedef sig_atomic_t ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + + typedef sig_atomic_t ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + + typedef sig_atomic_t ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_sig_atomic_t=$ac_lo;; +'') if test "$ac_cv_type_sig_atomic_t" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (sig_atomic_t) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (sig_atomic_t) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_sig_atomic_t=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + + typedef sig_atomic_t ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_sig_atomic_t=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_sig_atomic_t" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (sig_atomic_t) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (sig_atomic_t) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_sig_atomic_t=0 + fi +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_sig_atomic_t" >&5 +echo "${ECHO_T}$ac_cv_sizeof_sig_atomic_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_SIG_ATOMIC_T $ac_cv_sizeof_sig_atomic_t +_ACEOF + + { echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } if test "${ac_cv_header_time+set}" = set; then diff --git a/configure.ac b/configure.ac index d46c5fd..78d8f6a 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,7 @@ AC_C_CONST AC_C_VOLATILE AC_CHECK_SIZEOF([long long int],[0]) AC_CHECK_SIZEOF([_Bool],[0]) +AC_CHECK_SIZEOF([sig_atomic_t],[0],[[#include ]]) AC_HEADER_TIME AC_EXEEXT AC_OBJEXT diff --git a/etc/cftoec.sh b/etc/cftoec.sh index b9fccf3..2899db7 100644 --- a/etc/cftoec.sh +++ b/etc/cftoec.sh @@ -54,9 +54,9 @@ test -f "$ICKSRC_PATH/etc/IFFI.spec" || ( echo Compiling cfunge into a library suitable for use with C-INTERCAL: -rm -rf temp || die "Failed to remove any old temp directory" -mkdir -p temp || die "Failed to create temp directory" -cd temp || die "Failed to change directory to temp directory" +rm -rf cftoec_temp || die "Failed to remove any old temp directory" +mkdir -p cftoec_temp || die "Failed to create temp directory" +cd cftoec_temp || die "Failed to change directory to temp directory" # Select compiler if [ -z "$CC" ]; then @@ -131,5 +131,6 @@ ranlib ../libick_ecto_b98.a echo " " Cleaning up... rm -rf * cd .. +rm -rf cftoec_temp echo Finished, unless there were errors. diff --git a/src/configh.in b/src/configh.in index 6a10a14..b1d75b2 100644 --- a/src/configh.in +++ b/src/configh.in @@ -90,6 +90,9 @@ /* The size of `long long int', as computed by sizeof. */ #undef SIZEOF_LONG_LONG_INT +/* The size of `sig_atomic_t', as computed by sizeof. */ +#undef SIZEOF_SIG_ATOMIC_T + /* The size of `_Bool', as computed by sizeof. */ #undef SIZEOF__BOOL -- 2.43.0