aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrozin <grozin@32389bae-6d03-0410-99cf-db05cde120eb>2008-05-02 22:04:50 +0000
committergrozin <grozin@32389bae-6d03-0410-99cf-db05cde120eb>2008-05-02 22:04:50 +0000
commit6f30127c78f26338fa5ffa4369bcc620d8e5de06 (patch)
tree6a483004c961a46d2d593b6ec429ee16b279e37f /sci-visualization/udav/files/udav-fltk.patch
parentmathgl-1.6.2 cleanup and improvements (diff)
downloadsci-6f30127c78f26338fa5ffa4369bcc620d8e5de06.tar.gz
sci-6f30127c78f26338fa5ffa4369bcc620d8e5de06.tar.bz2
sci-6f30127c78f26338fa5ffa4369bcc620d8e5de06.zip
udav-0.3.2: cleanup
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1036 32389bae-6d03-0410-99cf-db05cde120eb
Diffstat (limited to 'sci-visualization/udav/files/udav-fltk.patch')
-rw-r--r--sci-visualization/udav/files/udav-fltk.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/sci-visualization/udav/files/udav-fltk.patch b/sci-visualization/udav/files/udav-fltk.patch
index 96953820c..0c0650fdb 100644
--- a/sci-visualization/udav/files/udav-fltk.patch
+++ b/sci-visualization/udav/files/udav-fltk.patch
@@ -1,20 +1,20 @@
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-04-30 13:43:19.000000000 +0700
++++ udav-0.3.2/configure.ac 2008-05-03 12:49:16.000000000 +0700
@@ -18,6 +18,6 @@
)
-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-1.1/FL/Fl_Export.H],,[echo "Please install FLTK library"; exit])
-+AC_CHECK_LIB([fltk], [main], [FLTK_LIBS="-L/usr/lib/fltk-1.1 -lfltk -lfltk_images -lXft" 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-04-30 13:53:00.000000000 +0700
++++ udav-0.3.2/src/Makefile.am 2008-05-03 12:51:08.000000000 +0700
@@ -8,3 +8,3 @@
udav_LDADD = $(MGL_LIBS) $(FLTK_LIBS)
-udav_CPPFLAGS = -O2 -DDOC_DIR=\"$(docdir)/\"
-+udav_CPPFLAGS = -I/usr/include/fltk-1.1 -DDOC_DIR=\"$(docdir)/\"
++udav_CPPFLAGS = $(CPPFLASGS) @FLTK_FLAGS@ -DDOC_DIR=\"$(docdir)/\"