diff options
| author |   grozin <grozin@32389bae-6d03-0410-99cf-db05cde120eb> | 2008-05-11 20:29:45 +0000 |
|---|---|---|
| committer | grozin <grozin@32389bae-6d03-0410-99cf-db05cde120eb> | 2008-05-11 20:29:45 +0000 |
| commit | 68ae5d2972150dba046b95bd5c4c6a51360356c9 (patch) | |
| tree | a687e4a5f7c9280af162b96aed6ad92932c13841 /sci-visualization/udav/files/udav-fltk.patch | |
| parent | mathgl-1.6.2: several improvements (diff) | |
| download | sci-68ae5d2972150dba046b95bd5c4c6a51360356c9.tar.gz sci-68ae5d2972150dba046b95bd5c4c6a51360356c9.tar.bz2 sci-68ae5d2972150dba046b95bd5c4c6a51360356c9.zip | |
udav-0.3.2: several improvements
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1047 32389bae-6d03-0410-99cf-db05cde120eb
Diffstat (limited to 'sci-visualization/udav/files/udav-fltk.patch')
| -rw-r--r-- | sci-visualization/udav/files/udav-fltk.patch | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/sci-visualization/udav/files/udav-fltk.patch b/sci-visualization/udav/files/udav-fltk.patch index 0c0650fdb..8bf35d2d7 100644 --- a/sci-visualization/udav/files/udav-fltk.patch +++ b/sci-visualization/udav/files/udav-fltk.patch @@ -1,20 +1,24 @@ -diff -U2 --recursive udav-0.3.2.orig/configure.ac udav-0.3.2/configure.ac ---- udav-0.3.2.orig/configure.ac 2008-04-03 01:24:14.000000000 +0700 -+++ udav-0.3.2/configure.ac 2008-05-03 12:49:16.000000000 +0700 -@@ -18,6 +18,6 @@ +--- configure.ac.orig 2008-04-03 07:24:14.000000000 +1300 ++++ configure.ac 2008-05-11 16:34:17.000000000 +1200 +@@ -17,10 +17,9 @@ + [echo "Please install MathGL library (libmgl)"; exit],\ ) -AC_CHECK_HEADERS([FL/Fl_Export.H],,[echo "Please install FLTK library"; exit]) -AC_CHECK_LIB([fltk], [main], [FLTK_LIBS="-lfltk -lfltk_images" AC_SUBST(FLTK_LIBS)], -+AC_CHECK_HEADERS([@FLTK_H@FL/Fl_Export.H],,[echo "Please install FLTK library"; exit]) -+AC_CHECK_LIB([fltk], [main], [FLTK_LIBS="@FLTK_LIBS@" AC_SUBST(FLTK_LIBS)], - [echo "Please install FLTK library (libfltk)"; exit],\ - ) -diff -U2 --recursive udav-0.3.2.orig/src/Makefile.am udav-0.3.2/src/Makefile.am ---- udav-0.3.2.orig/src/Makefile.am 2008-04-03 01:24:14.000000000 +0700 -+++ udav-0.3.2/src/Makefile.am 2008-05-03 12:51:08.000000000 +0700 -@@ -8,3 +8,3 @@ +- [echo "Please install FLTK library (libfltk)"; exit],\ +- ) ++AC_PATH_PROG(FLTKCONFIG,fltk-config) ++CXXFLAGS="`$FLTKCONFIG --cflags` $CXXFLAGS" ++LDFLAGS="`$FLTKCONFIG --use-images --ldflags` $LDFLAGS" + + + AC_OUTPUT(Makefile src/Makefile) +--- src/Makefile.am.orig 2008-05-11 16:39:57.000000000 +1200 ++++ src/Makefile.am 2008-05-11 16:40:28.000000000 +1200 +@@ -7,4 +7,4 @@ + data.cpp Fl_Table.cxx main.cpp option.cpp table.cpp udav_LDADD = $(MGL_LIBS) $(FLTK_LIBS) -udav_CPPFLAGS = -O2 -DDOC_DIR=\"$(docdir)/\" -+udav_CPPFLAGS = $(CPPFLASGS) @FLTK_FLAGS@ -DDOC_DIR=\"$(docdir)/\" ++udav_CPPFLAGS = $(CPPFLASGS) -DDOC_DIR=\"$(docdir)/\" |