head 1.5; access; symbols pkgsrc-2019Q3:1.4.0.78 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.76 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.74 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.72 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.70 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.68 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.66 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.64 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.62 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.58 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.56 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.54 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.52 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.50 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.48 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.46 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.44 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.42 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.40 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.38 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.36 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.34 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.32 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.30 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.28 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.26 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.24 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.22 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.20 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.18 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.16 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.14 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.12 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.10 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.8 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.6 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.4 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.2 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.3.0.6 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.4 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.2 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.2.0.24 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.22 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.20 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.18 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.16 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.14 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.12 pkgsrc-2008Q1:1.2.0.10 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.8 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.6 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.4 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.2 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.1.0.6 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.4 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.2 pkgsrc-2006Q2-base:1.1; locks; strict; comment @# @; 1.5 date 2019.11.20.22.15.28; author markd; state dead; branches; next 1.4; commitid NGZ5hEbli0F1JDLB; 1.4 date 2010.04.13.17.25.22; author drochner; state Exp; branches; next 1.3; 1.3 date 2009.09.06.12.17.17; author asau; state Exp; branches; next 1.2; 1.2 date 2007.02.22.16.15.14; author joerg; state Exp; branches; next 1.1; 1.1 date 2006.06.22.18.52.00; author jlam; state Exp; branches; next ; desc @@ 1.5 log @qalculate: update to 3.5.0 10 years worth of development. @ text @$NetBSD: patch-ad,v 1.4 2010/04/13 17:25:22 drochner Exp $ --- configure.in.orig 2010-01-05 15:15:27.000000000 +0000 +++ configure.in @@@@ -34,6 +34,7 @@@@ AC_PROG_LN_S AC_HEADER_STDC AC_PROG_INTLTOOL AM_PROG_LIBTOOL +PKG_PROG_PKG_CONFIG dnl ------------------------------------ dnl | check for compiler characteristics |------------------------------------- @@@@ -87,8 +88,6 @@@@ dnl -------------------------------- dnl | check for neccessary libraries |----------------------------------------- dnl -------------------------------- -AC_CHECK_LIB(pthread, pthread_create, [LIBS="$LIBS -lpthread"]) - AC_LANG([C++]) PKG_CHECK_MODULES(GLIB, [ @ 1.4 log @update to 0.9.7 changes: -General build updates and bug fixes -Bug fix for segfaults with some uses of integrate() -New Simplified Chinese translation -Fix crash with unsupported operator in RPN syntax -Fix reduction of vector size @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @ Fix breakage after CLN update. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.2 2007/02/22 16:15:14 joerg Exp $ d3 3 a5 3 --- configure.in.orig 2007-05-18 12:08:26.000000000 +0400 +++ configure.in 2009-09-06 16:03:10.000000000 +0400 @@@@ -34,6 +34,7 @@@@ d13 3 a15 2 @@@@ -84,28 +85,6 @@@@ a16 4 dnl -------------------------------- -dnl | check for neccessary libraries |----------------------------------------- -dnl -------------------------------- - d19 1 a19 23 -AC_LANG([C++]) - -AC_PATH_CLN(1.1.0, [ - LIBS="$LIBS $CLN_LIBS" - CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS" - AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used]) -], AC_MSG_ERROR([No suitable installed version of CLN could be found.])) - - -PKG_CHECK_MODULES(GLIB, [ - glib-2.0 - libxml-2.0 >= 2.3.8 - ]) -AC_SUBST(GLIB_CFLAGS) -AC_SUBST(GLIB_LIBS) - -dnl -------------------------------- dnl | check for readline |----------------------------------------- dnl -------------------------------- @@@@ -230,6 +209,30 @@@@ INTLTOOL_QALCULATE_DEFINITIONS_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po-defs/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-defs/.intltool-merge-cache $(top_srcdir)/po-defs $< [$]@@' AC_SUBST(INTLTOOL_QALCULATE_DEFINITIONS_RULE) d21 1 a21 27 +dnl -------------------------------- +dnl | check for neccessary libraries |----------------------------------------- +dnl -------------------------------- + +AC_LANG([C++]) + +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]) +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 + libxml-2.0 >= 2.3.8 + ]) +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) + dnl -------- dnl | output |----------------------------------------------------------------- dnl -------- @ 1.2 log @Drop the pthrea check in configure completely and just set PTHREAD_AUTO_VARS. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1 2006/06/22 18:52:00 jlam Exp $ d3 11 a13 3 --- configure.in.orig 2006-04-13 06:24:58.000000000 -0400 +++ configure.in @@@@ -84,28 +84,6 @@@@ AC_SUBST(QALCULATE_AGE) d42 1 a42 1 @@@@ -230,6 +208,26 @@@@ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, " d52 5 a56 3 +AC_PATH_CLN(1.1.0, [ + LIBS="$LIBS $CLN_LIBS" + CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS" d58 4 a61 2 +], AC_MSG_ERROR([No suitable installed version of CLN could be found.])) + @ 1.1 log @Reorder the linker tests in the configure script so that we test for C libraries *before* we throw the AC_LANG([C++]) switch. This makes the generated configure script use the C compiler/linker instead of the C++ compiler/linker when running tests. This avoids errors like these based on not correctly getting the function signature correct: conftest.cc:36: error: nonnull argument with out-of-range operand number (arg 1, operand 2) This error was causing the configure script to not detect *gettext() routines and not building and installing the *.mo files. This fixes the error noted in the bulk build results: http://mail-index.netbsd.org/pkgsrc-bulk/2006/06/20/0000.html @ text @d1 1 a1 1 $NetBSD$ d34 1 a34 1 @@@@ -230,6 +208,28 @@@@ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, " a41 2 +AC_CHECK_LIB(pthread, pthread_create, [LIBS="$LIBS -lpthread"]) + @