Skip to content
This repository
Browse code

rename config.h to fontforge-config.h; clean configure-fontforge.h

  • Loading branch information...
commit 8c9f3ddd2f49fc942b0ca95d66771cb930fd2cc1 1 parent 9a5a151
Lu Wang coolwanglu authored
2  Unicode/ucharmap.c
@@ -25,7 +25,7 @@
25 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 26 */
27 27
28   -#include <config.h> /* FF config file */
  28 +#include <fontforge-config.h>
29 29 #include <gwwiconv.h>
30 30 #include <stddef.h>
31 31 #include <ustring.h>
2  configure.ac
@@ -36,7 +36,7 @@ AC_CONFIG_AUX_DIR([config])
36 36 AC_CONFIG_TESTDIR([tests],[fontforge])
37 37 AC_CANONICAL_BUILD
38 38 AC_CANONICAL_HOST
39   -AC_CONFIG_HEADERS([inc/config.h])
  39 +AC_CONFIG_HEADERS([inc/fontforge-config.h])
40 40 AM_INIT_AUTOMAKE([foreign -Wall])
41 41 AM_MAINTAINER_MODE([enable])
42 42 AC_USE_SYSTEM_EXTENSIONS
51 fontforge/configure-fontforge.h
@@ -100,57 +100,6 @@
100 100
101 101
102 102 /* ************************************************************************** */
103   -/* *********************** Set by configure script ************************** */
104   -/* ************************************************************************** */
105   -
106   -/* The following are expected to be set by the configure script, but I suppose*/
107   -/* you could set them here too */
108   -
109   -/* If you are on a Mac then set __Mac */
110   -/* If you are on a windows box with cygwin set __CygWin */
111   -
112   -/* If you are on a Mac where cursors are restricted to 16x16 pixel boxes then */
113   -/* set _CursorsMustBe16x16 */
114   -
115   -/* If you are on cygwin where even the modifier keys autorepeat then set */
116   -/* _ModKeysAutoRepeat */
117   -
118   -/* If you are on cygwin where some of the drawmode funtions (like AND) don't */
119   -/* work then set _BrokenBitmapImages */
120   -
121   -/* FontForge knows about 4 different keyboard settings, a windows keyboard, a */
122   -/* mac keyboard, a mac keyboard under SUSE linux, and a sun keyboard */
123   -/* When it starts up FontForge assumes that the keyboard is some default type*/
124   -/* You can override the type by setting _Keyboard to */
125   -/* 0 -- windows */
126   -/* 1 -- mac running mac osx */
127   -/* 3 -- mac running SUSE linux (7.1) */
128   -/* 2 -- sparc */
129   -/* Basically this affects the text that appears in menus. The sun keyboard */
130   -/* uses meta where the windows one uses alt, and the mac use command and */
131   -/* option. */
132   -
133   -/* If there are no freetype header files then define _NO_FREETYPE */
134   -/* If the freetype library has the bytecode debugger then define FREETYPE_HAS_DEBUGGER */
135   -/* If there is no mmap system call then define _NO_MMAP */
136   -
137   -/* If there is no ungif library (or if it is out of date) define _NO_LIBUNGIF */
138   -/* If there is no png (or z) library define _NO_LIBPNG */
139   -/* If there libpng is version 1.2 define _LIBPNG12 */
140   -/* If there is no jpeg library define _NO_LIBJPEG */
141   -/* If there is no tiff library define _NO_LIBTIFF */
142   -/* If there is no xml2 library define _NO_LIBXML */
143   -/* If there is no uninameslist library define _NO_LIBUNINAMESLIST */
144   -
145   -/* If there is no snprintf define _NO_SNPRINTF */
146   -
147   -/* If the XInput extension is not available define _NO_XINPUT */
148   -/* If the Xkb extension is not available define _NO_XKB */
149   -
150   -/* If the compiler supports long long define _HAS_LONGLONG */
151   -
152   -
153   -/* ************************************************************************** */
154 103 /* **************************** Numeric Settings **************************** */
155 104 /* ************************************************************************** */
156 105
2  fontforge/pluginloading.c
@@ -25,7 +25,7 @@
25 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 26 */
27 27
28   -#include <config.h>
  28 +#include <fontforge-config.h>
29 29 #include <intl.h>
30 30 #include <basics.h>
31 31 #include <pluginloading.h>
2  fontforge/python.c
@@ -26,7 +26,7 @@
26 26 */
27 27 /* Python Interface to FontForge */
28 28
29   -#include <config.h> /* FF config file */
  29 +#include <fontforge-config.h>
30 30
31 31 #ifndef _NO_PYTHON
32 32 #include "Python.h"
2  fontforge/pythonui.c
@@ -26,7 +26,7 @@
26 26 */
27 27 /* Python Interface to FontForge */
28 28
29   -#include <config.h> /* FF config file */
  29 +#include <fontforge-config.h>
30 30
31 31 #ifndef _NO_PYTHON
32 32 #include "Python.h"
2  fontforge/stamp.c
... ... @@ -1,7 +1,7 @@
1 1 /* This file was generated using stamper.c to create the next version release. */
2 2 /* If you need to update this to the next release version, see fontforge/GNUmakefile.in */
3 3
4   -#include "config.h"
  4 +#include <fontforge-config.h>
5 5 #include <time.h>
6 6
7 7 const time_t source_modtime = FONTFORGE_MODTIME; /* Seconds since 1970 (standard unix time) */
2  fontforge/startui.c
@@ -25,7 +25,7 @@
25 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 26 */
27 27
28   -#include "config.h"
  28 +#include <fontforge-config.h>
29 29 #include "fontforgeui.h"
30 30 #include "annotations.h"
31 31 #include <gfile.h>
2  fontforge/ufo.c
@@ -25,7 +25,7 @@
25 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 26 */
27 27
28   -#include <config.h> /* FF config file */
  28 +#include <fontforge-config.h>
29 29
30 30 #ifndef _NO_PYTHON
31 31 # include "Python.h"
2  gdraw/gxdrawP.h
@@ -58,7 +58,7 @@ capable of using composite.
58 58 #include <vms_x_fix.h>
59 59 #endif
60 60
61   -#include <config.h> /* FF config file */
  61 +#include <fontforge-config.h>
62 62
63 63 #ifndef X_DISPLAY_MISSING
64 64 # include <X11/X.h>
2  gutils/gimagereadgif.c
@@ -26,7 +26,7 @@
26 26 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 27 */
28 28
29   -#include <config.h> /* FF config file */
  29 +#include <fontforge-config.h>
30 30
31 31 #ifdef _NO_LIBUNGIF
32 32
2  gutils/gimagereadjpeg.c
@@ -25,7 +25,7 @@
25 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 26 */
27 27
28   -#include <config.h> /* FF config file */
  28 +#include <fontforge-config.h>
29 29
30 30 #ifdef _NO_LIBJPEG
31 31
2  gutils/gimagereadpng.c
@@ -25,7 +25,7 @@
25 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 26 */
27 27
28   -#include <config.h> /* FF config file */
  28 +#include <fontforge-config.h>
29 29
30 30 #ifdef _NO_LIBPNG
31 31
2  gutils/gimagereadtiff.c
@@ -26,7 +26,7 @@
26 26 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 27 */
28 28
29   -#include <config.h> /* FF config file */
  29 +#include <fontforge-config.h>
30 30
31 31 #ifdef _NO_LIBTIFF
32 32
2  gutils/gimagewritejpeg.c
@@ -25,7 +25,7 @@
25 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 26 */
27 27
28   -#include <config.h> /* FF config file */
  28 +#include <fontforge-config.h>
29 29
30 30 #ifdef _NO_LIBJPEG
31 31
2  gutils/gimagewritepng.c
@@ -25,7 +25,7 @@
25 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 26 */
27 27
28   -#include <config.h> /* FF config file */
  28 +#include <fontforge-config.h>
29 29
30 30 #ifdef _NO_LIBPNG
31 31
4 inc/Makefile.am
@@ -30,8 +30,8 @@
30 30 # installation. In particular, they ought to have <> instead of "" and
31 31 # they should require a "fontforge/" prefix.
32 32
33   -pkginclude_HEADERS = basics.h chardata.h charset.h config.h dynamic.h \
34   - fileutil.h gdraw.h gfile.h ggadget.h gicons.h gimage.h gio.h \
  33 +pkginclude_HEADERS = basics.h chardata.h charset.h dynamic.h \
  34 + fileutil.h fontforge-config.h gdraw.h gfile.h ggadget.h gicons.h gimage.h gio.h \
35 35 gkeysym.h gprogress.h gresedit.h gresource.h gwidget.h gwwiconv.h \
36 36 intl.h ustring.h utype.h annotations_base.h dlist.h carbon.h
37 37
2  inc/basics.h
@@ -27,7 +27,7 @@
27 27 #ifndef _BASICS_H
28 28 #define _BASICS_H
29 29
30   -# include <config.h> /* FF config file */
  30 +# include <fontforge-config.h>
31 31 #include <stdio.h> /* for NULL */
32 32 #ifdef HAVE_STDINT_H
33 33 # include <stdint.h>

6 comments on commit 8c9f3dd

Frank Trampe
Owner

Hi there. I think that you forgot to rename the files in inc. This broke the build for me. I have patched this in c583c1b.

Lu Wang
Collaborator

@frank-trampe No, the file is supposed to be generated by configure, you may notice that config.h was not in the git repo.

Frank Trampe
Owner

Hmm. It stopped working for me after your commit for some reason. Can you try checking out this commit in a fresh space and building?

Lu Wang
Collaborator
Frank Trampe
Owner

Oops. My apologies. I had gotten into the habit of calling autoconf manually, which seems not to achieve the desired results. I have reverted my change.

Lu Wang
Collaborator

@frank-trampe it's ok.

Please sign in to comment.
Something went wrong with that request. Please try again.