ref: 7e8e1761df141164d5d999de014486623810b403
parent: 337fcb6ad6ca9df4347fb57217836417db6cbf15
author: Werner Lemberg <[email protected]>
date: Fri Nov 30 08:45:47 EST 2012
[configure] Preserve customized `ftoption.h'. Problem reported by Del Merritt <[email protected]>. * builds/unix/configure.raw <cpp computation of bit length>: Don't remove existing FreeType configuration files.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-11-30 Werner Lemberg <[email protected]>
+
+ [configure] Preserve customized `ftoption.h'.
+
+ Problem reported by Del Merritt <[email protected]>.
+
+ * builds/unix/configure.raw <cpp computation of bit length>: Don't
+ remove existing FreeType configuration files.
+
2012-11-29 Werner Lemberg <[email protected]>
[type1] Fix Savannah bug #37831.
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -103,9 +103,15 @@
AC_MSG_CHECKING([whether cpp computation of bit length in ftconfig.in works])
orig_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="-I${srcdir} -I. ${CPPFLAGS}"-ac_clean_files="ft2build.h ftoption.h ftstdlib.h"
-touch ft2build.h ftoption.h ftstdlib.h
+ac_clean_files=
+for f in ft2build.h ftoption.h ftstdlib.h; do
+ if test ! -f $f; then
+ ac_clean_files="$ac_clean_files $f"
+ touch $f
+ fi
+done
+
cat > conftest.c <<\_ACEOF
#include <limits.h>
#define FT_CONFIG_OPTIONS_H "ftoption.h"
@@ -123,7 +129,7 @@
${CPP} ${CPPFLAGS} conftest.c | ${GREP} ac_cpp_ft > conftest.sheval `cat conftest.sh`
-rm -f conftest.c conftest.sh confft2build.h ftoption.h ftstdlib.h
+rm -f conftest.* $ac_clean_files
if test x != "x${ac_cpp_ft_sizeof_int}" \ -a x != x"${ac_cpp_ft_sizeof_long}"; then