diff options
| -rw-r--r-- | buildlib/environment.mak.in | 2 | ||||
| -rw-r--r-- | buildlib/makefile.in | 5 | ||||
| -rw-r--r-- | configure.in | 10 |
3 files changed, 12 insertions, 5 deletions
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index d31e19385..43827d508 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -29,3 +29,5 @@ GPMLIB = @GPMLIB@ SLANGLIB = @SLANGLIB@ XPMLIB = @XPMLIB@ PTHREADLIB = @PTHREADLIB@ + +HAVE_C9X = @HAVE_C9X@ diff --git a/buildlib/makefile.in b/buildlib/makefile.in index 6e28f754d..7fceb9f4a 100644 --- a/buildlib/makefile.in +++ b/buildlib/makefile.in @@ -35,3 +35,8 @@ ifneq ($(words $(MISSING_DIRS)),0) else @echo > /dev/null endif +ifneq ($(HAVE_C9X),yes) + -@rm include/inttypes.h +else + @cp $(SRCDIR)/buildlib/inttypes.h.in include/inttypes.h +endif diff --git a/configure.in b/configure.in index 8e052ed49..3b8e52989 100644 --- a/configure.in +++ b/configure.in @@ -105,11 +105,15 @@ fi AC_C_BIGENDIAN dnl We do not need this if we have inttypes.. +HAVE_C9X=yes if test x"$c9x_ints" = x"no"; then AC_CHECK_SIZEOF(char,$size_char) AC_CHECK_SIZEOF(int,$size_int) AC_CHECK_SIZEOF(short,$size_short) AC_CHECK_SIZEOF(long,$size_long) + + HAVE_C9X= + AC_SUBST(HAVE_C9X) fi @@ -120,8 +124,4 @@ AC_CHECK_PROG(DEBIANDOC_TEXT,debiandoc2text,"yes","") dnl Check for YODL AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","") -if test x"$c9x_ints" = x"no"; then - AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in include/inttypes.h:buildlib/inttypes.h.in,make dirs) -else - AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make dirs) -fi +AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make dirs) |