components/gnuplot/patches/libpng12.patch
author David Marx <David.M.Marx@Oracle.Com>
Tue, 26 Apr 2011 14:07:49 -0700
changeset 204 78dfe4707c7c
child 778 9d5e4d6466cd
permissions -rw-r--r--
7028339 Desire to have gnuplot in userland gate
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
204
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
     1
--- gnuplot-4.4.0/src/Makefile.am.orig	Fri Mar  5 18:09:39 2010
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
     2
+++ gnuplot-4.4.0/src/Makefile.am	Tue Apr 19 15:59:18 2011
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
     3
@@ -51,7 +51,7 @@
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
     4
 template.h term_api.h term.c term.h time.c unset.c util.c util.h \
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
     5
 util3d.c util3d.h variable.c variable.h version.c version.h
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
     6
 
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
     7
-gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS)
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
     8
+gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g)
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
     9
 
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
    10
 pkglibexec_PROGRAMS = 
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
    11
 
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
    12
--- gnuplot-4.4.0/src/Makefile.in.orig	Sat Mar 13 13:20:04 2010
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
    13
+++ gnuplot-4.4.0/src/Makefile.in	Tue Apr 19 16:46:03 PDT 2011
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
    14
@@ -347,7 +347,7 @@
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
    15
 	template.h term_api.h term.c term.h time.c unset.c util.c \
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
    16
 	util.h util3d.c util3d.h variable.c variable.h version.c \
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
    17
 	version.h $(am__append_2) $(am__append_3)
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
    18
-gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS)
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
    19
+gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g)
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
    20
 @[email protected]_x11_SOURCES = gplt_x11.c gplt_x11.h gpexecute.c gpexecute.h mousecmn.h
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
    21
 @[email protected] = @[email protected]
78dfe4707c7c 7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff changeset
    22
 @[email protected]_x11_LDADD = getcolor_x11.o $(XLIBS)