diff options
| author | drochner <drochner@pkgsrc.org> | 2010-04-13 17:28:34 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2010-04-13 17:28:34 +0000 |
| commit | 8f15d583b9cd4cbaac51daedb4a92fc3d4efc6b6 (patch) | |
| tree | a2f9cd411058bc9bea288bbeac0628a5c18e8336 /math/qalculate-gtk/patches | |
| parent | c3ffed422f9b637a7c653f5ddd060fa433bf943f (diff) | |
| download | pkgsrc-8f15d583b9cd4cbaac51daedb4a92fc3d4efc6b6.tar.gz | |
update to 0.9.7
changes:
General build updates and bug fixes, including the ability to
build against cln >= 1.2
Diffstat (limited to 'math/qalculate-gtk/patches')
| -rw-r--r-- | math/qalculate-gtk/patches/patch-ac | 39 |
1 files changed, 5 insertions, 34 deletions
diff --git a/math/qalculate-gtk/patches/patch-ac b/math/qalculate-gtk/patches/patch-ac index 69ac4d500da..265b1a4869c 100644 --- a/math/qalculate-gtk/patches/patch-ac +++ b/math/qalculate-gtk/patches/patch-ac @@ -1,16 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2009/09/06 15:15:53 asau Exp $ +$NetBSD: patch-ac,v 1.4 2010/04/13 17:28:34 drochner Exp $ ---- configure.in.orig 2007-05-18 12:36:10.000000000 +0400 -+++ configure.in 2009-09-06 19:11:00.000000000 +0400 -@@ -24,6 +24,7 @@ - AC_HEADER_STDC - AC_PROG_INTLTOOL - AM_PROG_LIBTOOL -+PKG_PROG_PKG_CONFIG - - dnl ------------------------------------ - dnl | check for compiler characteristics |------------------------------------- -@@ -55,6 +56,35 @@ +--- configure.in.orig 2010-01-05 15:43:49.000000000 +0000 ++++ configure.in +@@ -55,6 +55,35 @@ fi changequote([,])dnl @@ -46,28 +38,7 @@ $NetBSD: patch-ac,v 1.3 2009/09/06 15:15:53 asau Exp $ dnl -------------------------------- dnl | check for neccessary libraries |----------------------------------------- dnl -------------------------------- -@@ -63,11 +93,16 @@ - - AC_LANG([C++]) - --AC_PATH_CLN(1.1.0, [ -- LIBS="$LIBS $CLN_LIBS" -- CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS" -+if pkg-config --atleast-version=1.1.0 cln; then -+ CLN_CPPFLAGS="`pkg-config --cflags cln`" -+ CLN_LIBS="`pkg-config --libs cln`" -+ LIBS="$LIBS `pkg-config --libs cln`" -+ CPPFLAGS="$CPPFLAGS `pkg-config --cflags cln`" - AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used]) --], AC_MSG_ERROR([No suitable installed version of CLN could be found.])) -+else AC_MSG_ERROR([No suitable installed version of CLN could be found.]) -+fi -+AC_SUBST(CLN_CPPFLAGS) -+AC_SUBST(CLN_LIBS) - - PKG_CHECK_MODULES(GLIB, [ - glib-2.0 >= 2.4 -@@ -137,35 +172,6 @@ +@@ -142,35 +171,6 @@ AC_SUBST(QALCULATE_GTK) AC_SUBST(LN_QALCULATE) |