[packages/ghostscript.git] / ghostscript-config.patch

diff -Nur gs7.04.orig/Makefile.in gs7.04/Makefile.in
--- gs7.04.orig/Makefile.in	Fri Feb  1 04:30:13 2002
+++ gs7.04/Makefile.in	Thu Mar 14 12:23:23 2002
@@ -63,7 +63,7 @@
 man1ext = 1
 datadir = @datadir@
 gsdir = $(datadir)/ghostscript
-gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
+gsdatadir = $(gsdir)
 
 docdir=$(gsdatadir)/doc
 exdir=$(gsdatadir)/examples
@@ -72,7 +72,7 @@
 # Define the default directory/ies for the runtime
 # initialization and font files.  Separate multiple directories with a :.
 
-GS_LIB_DEFAULT=$(gsdatadir)/lib:$(gsdir)/fonts
+GS_LIB_DEFAULT=$(datadir)/lib:$(datadir)/fonts:/usr/share/fonts/Type1
 
 # Define whether or not searching for initialization files should always
 # look in the current directory first.  This leads to well-known security
diff -Nur gs7.04.orig/src/unix-gcc.mak gs7.04/src/unix-gcc.mak
--- gs7.04.orig/src/unix-gcc.mak	Fri Feb  1 07:27:58 2002
+++ gs7.04/src/unix-gcc.mak	Thu Mar 14 12:21:57 2002
@@ -65,7 +65,7 @@
 man1ext = 1
 datadir = $(prefix)/share
 gsdir = $(datadir)/ghostscript
-gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
+gsdatadir = $(gsdir)
 
 docdir=$(gsdatadir)/doc
 exdir=$(gsdatadir)/examples
@@ -74,7 +74,7 @@
 # Define the default directory/ies for the runtime
 # initialization and font files.  Separate multiple directories with a :.
 
-GS_LIB_DEFAULT=$(gsdatadir)/lib:$(gsdir)/fonts
+GS_LIB_DEFAULT=$(datadir)/lib:$(datadir)/fonts:/usr/share/fonts/Type1
 
 # Define whether or not searching for initialization files should always
 # look in the current directory first.  This leads to well-known security
@@ -157,26 +157,26 @@
 # You may need to change this if the libpng version changes.
 # See libpng.mak for more information.
 
-PSRCDIR=libpng
+PSRCDIR=/usr/include
 PVERSION=10202
 
 # Choose whether to use a shared version of the PNG library, and if so,
 # what its name is.
 # See gs.mak and Make.htm for more information.
 
-SHARE_LIBPNG=0
+SHARE_LIBPNG=1
 LIBPNG_NAME=png
 
 # Define the directory where the zlib sources are stored.
 # See zlib.mak for more information.
 
-ZSRCDIR=zlib
+ZSRCDIR=/usr/include
 
 # Choose whether to use a shared version of the zlib library, and if so,
 # what its name is (usually libz, but sometimes libgz).
 # See gs.mak and Make.htm for more information.
 
-SHARE_ZLIB=0
+SHARE_ZLIB=1
 #ZLIB_NAME=gz
 ZLIB_NAME=z
 
@@ -220,7 +220,7 @@
 # Define the added flags for standard, debugging, profiling 
 # and shared object builds.
 
-CFLAGS_STANDARD=-O2
+CFLAGS_STANDARD=
 CFLAGS_DEBUG=-g -O
 CFLAGS_PROFILE=-pg -O2
 CFLAGS_SO=-fPIC
@@ -236,7 +236,7 @@
 # We don't include -ansi, because this gets in the way of the platform-
 #   specific stuff that <math.h> typically needs; nevertheless, we expect
 #   gcc to accept ANSI-style function prototypes and function definitions.
-XCFLAGS=
+#XCFLAGS=
 
 CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
 
@@ -247,7 +247,7 @@
 #	-R /usr/local/xxx/lib:/usr/local/lib
 # giving the full path names of the shared library directories.
 # XLDFLAGS can be set from the command line.
-XLDFLAGS=
+#XLDFLAGS=
 
 LDFLAGS=$(XLDFLAGS) -fno-common
 
@@ -324,7 +324,7 @@
 
 # Choose the language feature(s) to include.  See gs.mak for details.
 
-FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev
+FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)cidfont.dev
 #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev
 #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(GLD)pipe.dev
 # The following is strictly for testing.
Commit	Line	Data
61966d06	1	diff -Nur gs7.04.orig/Makefile.in gs7.04/Makefile.in
	2	--- gs7.04.orig/Makefile.in Fri Feb 1 04:30:13 2002
	3	+++ gs7.04/Makefile.in Thu Mar 14 12:23:23 2002
	4	@@ -63,7 +63,7 @@
	5	man1ext = 1
	6	datadir = @datadir@
	7	gsdir = $(datadir)/ghostscript
	8	-gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
	9	+gsdatadir = $(gsdir)
	10
	11	docdir=$(gsdatadir)/doc
	12	exdir=$(gsdatadir)/examples
	13	@@ -72,7 +72,7 @@
	14	# Define the default directory/ies for the runtime
	15	# initialization and font files. Separate multiple directories with a :.
	16
	17	-GS_LIB_DEFAULT=$(gsdatadir)/lib:$(gsdir)/fonts
	18	+GS_LIB_DEFAULT=$(datadir)/lib:$(datadir)/fonts:/usr/share/fonts/Type1
	19
	20	# Define whether or not searching for initialization files should always
	21	# look in the current directory first. This leads to well-known security
	22	diff -Nur gs7.04.orig/src/unix-gcc.mak gs7.04/src/unix-gcc.mak
	23	--- gs7.04.orig/src/unix-gcc.mak Fri Feb 1 07:27:58 2002
	24	+++ gs7.04/src/unix-gcc.mak Thu Mar 14 12:21:57 2002
0b595015	25	@@ -65,7 +65,7 @@
e2253853	26	man1ext = 1
0b595015	27	datadir = $(prefix)/share
ca42399a	28	gsdir = $(datadir)/ghostscript
79151961	29	-gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
79151961	30	+gsdatadir = $(gsdir)
ca42399a	31
0b595015	32	docdir=$(gsdatadir)/doc
ca42399a	33	exdir=$(gsdatadir)/examples
0b595015 AM	34	@@ -74,7 +74,7 @@
	35	# Define the default directory/ies for the runtime
	36	# initialization and font files. Separate multiple directories with a :.
79151961	37
0b595015	38	-GS_LIB_DEFAULT=$(gsdatadir)/lib:$(gsdir)/fonts
e2253853	39	+GS_LIB_DEFAULT=$(datadir)/lib:$(datadir)/fonts:/usr/share/fonts/Type1
79151961	40
0b595015 AM	41	# Define whether or not searching for initialization files should always
0b595015 AM	42	# look in the current directory first. This leads to well-known security
cb863164	43	@@ -157,26 +157,26 @@
79151961	44	# You may need to change this if the libpng version changes.
	45	# See libpng.mak for more information.
	46
	47	-PSRCDIR=libpng
	48	+PSRCDIR=/usr/include
5b61fa55	49	PVERSION=10202
79151961	50
	51	# Choose whether to use a shared version of the PNG library, and if so,
	52	# what its name is.
	53	# See gs.mak and Make.htm for more information.
	54
	55	-SHARE_LIBPNG=0
	56	+SHARE_LIBPNG=1
	57	LIBPNG_NAME=png
	58
	59	# Define the directory where the zlib sources are stored.
	60	# See zlib.mak for more information.
	61
	62	-ZSRCDIR=zlib
	63	+ZSRCDIR=/usr/include
	64
	65	# Choose whether to use a shared version of the zlib library, and if so,
	66	# what its name is (usually libz, but sometimes libgz).
	67	# See gs.mak and Make.htm for more information.
	68
	69	-SHARE_ZLIB=0
	70	+SHARE_ZLIB=1
	71	#ZLIB_NAME=gz
	72	ZLIB_NAME=z
	73
e2253853	74	@@ -220,7 +220,7 @@
e2253853 JB	75	# Define the added flags for standard, debugging, profiling
e2253853 JB	76	# and shared object builds.
79151961	77
e2253853 JB	78	-CFLAGS_STANDARD=-O2
	79	+CFLAGS_STANDARD=
	80	CFLAGS_DEBUG=-g -O
	81	CFLAGS_PROFILE=-pg -O2
	82	CFLAGS_SO=-fPIC
cb863164	83	@@ -236,7 +236,7 @@
e2253853 JB	84	# We don't include -ansi, because this gets in the way of the platform-
	85	# specific stuff that <math.h> typically needs; nevertheless, we expect
	86	# gcc to accept ANSI-style function prototypes and function definitions.
	87	-XCFLAGS=
	88	+#XCFLAGS=
79151961	89
e2253853 JB	90	CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
e2253853 JB	91
cb863164	92	@@ -247,7 +247,7 @@
e2253853 JB	93	# -R /usr/local/xxx/lib:/usr/local/lib
	94	# giving the full path names of the shared library directories.
	95	# XLDFLAGS can be set from the command line.
	96	-XLDFLAGS=
	97	+#XLDFLAGS=
	98
	99	LDFLAGS=$(XLDFLAGS) -fno-common
79151961	100
cb863164	101	@@ -324,7 +324,7 @@
79151961	102
ca42399a	103	# Choose the language feature(s) to include. See gs.mak for details.
ca42399a	104
0b595015	105	-FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev
e2253853	106	+FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)cidfont.dev
0b595015 AM	107	#FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev
	108	#FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(GLD)pipe.dev
	109	# The following is strictly for testing.