summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorHenry Stiles <henry.stiles@artifex.com>2011-03-01 16:43:56 +0000
committerHenry Stiles <henry.stiles@artifex.com>2011-03-01 16:43:56 +0000
commitd9781c396e2f0190fe8d07159deb7c8960dd2192 (patch)
tree13249878d3ed388a490ebd77e70f4c8ed2f3b2f2 /main
parent0d85e503442590b614c9d3d770e5bc146ab7f61a (diff)
Add a basic auto configuration template for PCL, XPS, and the language
switch build. It is a bit unconventional - autoconf generates config.mak (not Makefile) which is then included by pcl6_gcc.mak. Only a few configuration options have been moved to autoconf so far, we'll do this incrementally. The generated file config.mak is included in this commit for backward compatibility with using only make without configuration tools. git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@12219 a1074d23-0009-0410-80fe-cf8c14f379e6
Diffstat (limited to 'main')
-rw-r--r--main/pcl6_gcc.mak15
1 files changed, 5 insertions, 10 deletions
diff --git a/main/pcl6_gcc.mak b/main/pcl6_gcc.mak
index f816f0605..8459a5a0e 100644
--- a/main/pcl6_gcc.mak
+++ b/main/pcl6_gcc.mak
@@ -183,22 +183,17 @@ endif # PL_SCALER = afs
# long to enable large color indices.
GX_COLOR_INDEX_DEFINE?=-DGX_COLOR_INDEX_TYPE="unsigned long"
+include ../config.mak
+
HAVE_STDINT_H_DEFINE?=-DHAVE_STDINT_H
-HAVE_MKSTEMP_DEFINE?=-DHAVE_MKSTEMP
-HAVE_HYPOT_DEFINE?=-DHAVE_HYPOT
HAVE_NO_STRICT_ALIASING_WARNING?=-Wno-strict-aliasing
-# We assume SSE2 extensions here. This is a problem for non-x86 (or old
-# x86 builds). To avoid this use make HAVE_SSE2_DEFINE=""
-HAVE_SSE2_DEFINE?=-DHAVE_SSE2
-
GCFLAGS?=-Wall -Wundef -Wstrict-prototypes -Wmissing-declarations \
-Wmissing-prototypes -Wpointer-arith \
-Wwrite-strings $(HAVE_NO_STRICT_ALIASING_WARNING) \
- -fno-builtin -fno-common \
- $(HAVE_STDINT_H_DEFINE) $(HAVE_MKSTEMP_DEFINE) $(HAVE_HYPOT_DEFINE) \
- $(GX_COLOR_INDEX_DEFINE) $(PSICFLAGS) $(PDL_INCLUDE_FLAGS) \
- $(HAVE_SSE2_DEFINE)
+ -fno-builtin -fno-common $(CONFDEFS) \
+ $(HAVE_STDINT_H_DEFINE) $(GX_COLOR_INDEX_DEFINE) \
+ $(PSICFLAGS) $(PDL_INCLUDE_FLAGS)
CFLAGS?= $(GCFLAGS) $(XCFLAGS)