[build] Rename build/unix/ftconfig.in' to
ftconfig.h.in'.
Since we are no longer limited to 8.3 file names, it is simpler to follow the usual conventions for template files. * builds/unix/ftconfig.in: Renamed to... * builds/unix/ftconfig.h.in: ...this. * CMakeLists.txt, builds/unix/configure.raw: Updated.
This commit is contained in:
parent
3bb512bc9f
commit
a4d9206754
@ -241,7 +241,7 @@ if (UNIX)
|
||||
check_include_file("unistd.h" HAVE_UNISTD_H)
|
||||
check_include_file("fcntl.h" HAVE_FCNTL_H)
|
||||
|
||||
file(READ "${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.in"
|
||||
file(READ "${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.h.in"
|
||||
FTCONFIG_H)
|
||||
if (HAVE_UNISTD_H)
|
||||
string(REGEX REPLACE
|
||||
|
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
||||
2020-07-05 David Turner <david@freetype.org>
|
||||
|
||||
[build] Rename `build/unix/ftconfig.in' to `ftconfig.h.in'.
|
||||
|
||||
Since we are no longer limited to 8.3 file names, it is simpler to
|
||||
follow the usual conventions for template files.
|
||||
|
||||
* builds/unix/ftconfig.in: Renamed to...
|
||||
* builds/unix/ftconfig.h.in: ...this.
|
||||
|
||||
* CMakeLists.txt, builds/unix/configure.raw: Updated.
|
||||
|
||||
2020-07-03 Alexei Podtelezhnikov <apodtele@gmail.com>
|
||||
|
||||
[smooth] Introduce direct oversampling for overlaps.
|
||||
|
@ -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])
|
||||
|
Loading…
Reference in New Issue
Block a user