Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

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

6 comments on commit 8c9f3dd

@frank-trampe

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.

@coolwanglu
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

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?

@coolwanglu
Collaborator
@frank-trampe

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.

@coolwanglu
Collaborator

@frank-trampe it's ok.

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