diff options
Diffstat (limited to 'builds/unix/configure.raw')
| -rw-r--r-- | builds/unix/configure.raw | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 50f270119..615d5f893 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -12,7 +12,7 @@ # fully. AC_INIT([FreeType], [@VERSION@], [freetype@nongnu.org], [freetype]) -AC_CONFIG_SRCDIR([ftconfig.in]) +AC_CONFIG_SRCDIR([ftconfig.h.in]) # Don't forget to update `docs/VERSIONS.TXT'! @@ -109,9 +109,9 @@ AC_CHECK_SIZEOF([long]) AC_TYPE_LONG_LONG_INT -# check whether cpp computation of size of int and long in ftconfig.in works +# check whether cpp computation of size of int and long in ftconfig.h.in works -AC_MSG_CHECKING([whether cpp computation of bit length in ftconfig.in works]) +AC_MSG_CHECKING([whether cpp computation of bit length in ftconfig.h.in works]) orig_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="-I${srcdir} -I. -I${srcdir}/../../include/freetype/config ${CPPFLAGS}" @@ -127,7 +127,7 @@ cat > conftest.c <<\_ACEOF #define FT_CONFIG_STANDARD_LIBRARY_H "ftstdlib.h" #define FT_UINT_MAX UINT_MAX #define FT_ULONG_MAX ULONG_MAX -#include "ftconfig.in" +#include "ftconfig.h.in" _ACEOF echo >> conftest.c "#if FT_SIZEOF_INT == "${ac_cv_sizeof_int} echo >> conftest.c "ac_cpp_ft_sizeof_int="${ac_cv_sizeof_int} @@ -1158,12 +1158,10 @@ AC_CONFIG_FILES([ftoption.h:${srcdir}/../../include/freetype/config/ftoption.h], rm ftoption.tmp], [FTOPTION_H_SED="$FTOPTION_H_SED"]) -# configuration file -- stay in 8.3 limit -# # since #undef doesn't survive in configuration header files we replace # `/undef' with `#undef' after creating the output file -AC_CONFIG_HEADERS([ftconfig.h:ftconfig.in], +AC_CONFIG_HEADERS([ftconfig.h], [mv ftconfig.h ftconfig.tmp sed 's|/undef|#undef|' < ftconfig.tmp > ftconfig.h rm ftconfig.tmp]) |