diff options
Diffstat (limited to 'graphics/gd1/files/patch-ac')
| -rw-r--r-- | graphics/gd1/files/patch-ac | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/graphics/gd1/files/patch-ac b/graphics/gd1/files/patch-ac index d7f41e301594..de989ae7c0e6 100644 --- a/graphics/gd1/files/patch-ac +++ b/graphics/gd1/files/patch-ac @@ -1,6 +1,6 @@ ---- Makefile.orig Wed Mar 8 14:54:37 2000 -+++ Makefile Fri Mar 10 21:09:49 2000 -@@ -3,35 +3,45 @@ +--- Makefile.orig Mon Mar 13 13:25:57 2000 ++++ Makefile Mon Mar 13 15:33:49 2000 +@@ -3,35 +3,44 @@ #If you do not have gcc, change the setting for COMPILER, but you must #use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc #compiler; get gcc if you are still using it). @@ -19,27 +19,28 @@ #If you don't have FreeType, libjpeg and/or Xpm installed, including the #header files, uncomment this (default). - #CFLAGS=-O +-CFLAGS=-O ++#CFLAGS=-O #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a #variation of this and comment out the line above. See also LIBS below. --CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF -- +-#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +.if defined(WANT_X11) +CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +.else +CFLAGS+=-DHAVE_JPEG +.endif -+ + #If you don't have FreeType and/or Xpm fully installed, uncomment this #(default). --#LIBS=-lm -lgd -lpng -lz +-LIBS=-lm -lgd -lpng -lz +LIBS=-lm -lgd -lpng -lz -ljpeg #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a #variation of this and comment out the line above. Note that #Xpm requires X11. See also CFLAGS above. +-#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 +.if defined(WANT_X11) - LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 ++LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 +.endif #Typical install locations for freetype, zlib, xpm, libjpeg and libpng header files. @@ -49,11 +50,10 @@ +.if defined(WANT_X11) +CFLAGS+=-I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11 +.endif -+ #Typical install locations for freetype, zlib, xpm and libpng libraries. #If yours are somewhere else, other than a standard location -@@ -39,16 +49,19 @@ +@@ -39,16 +48,19 @@ #-L. as this allows the gd library itself to be found. #Put -L. first so that old versions of the gd library elsewhere #on your system can't cause conflicts while building a new one. @@ -77,7 +77,7 @@ # # -@@ -58,34 +71,41 @@ +@@ -58,34 +70,41 @@ VERSION=1.7 @@ -139,7 +139,7 @@ gddemo: gddemo.o libgd.a $(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS) -@@ -120,16 +140,19 @@ +@@ -120,16 +139,19 @@ gdtestttf: gdtestttf.o libgd.a $(CC) gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS) |