kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/math/qalculate-gtk/patches/patch-ac

106 lines
3.5 KiB
Text
Raw Normal View History

Fix build after CLN update.
2009-09-06 17:15:53 +02:00
$NetBSD: patch-ac,v 1.3 2009/09/06 15:15:53 asau Exp $
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
2006-06-22 20:52:00 +02:00
Fix build after CLN update.
2009-09-06 17:15:53 +02:00
--- 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 @@
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
2006-06-22 20:52:00 +02:00
changequote([,])dnl
+dnl -------------------------------------
+dnl | internationalization (i18n) support |------------------------------------
+dnl -------------------------------------
+
+GETTEXT_PACKAGE=qalculate-gtk
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The package name for gettext])
+
+dnl Please keep this in alphabetical order
+ALL_LINGUAS="nl sv"
+AM_GLIB_GNU_GETTEXT
+
+dnl AM_GLIB_GNU_GETTEXT sets $DATADIRNAME
+AC_MSG_CHECKING(locale directory)
+if test "x$prefix" = "xNONE"; then
+ PACKAGE_LOCALE_DIR=$ac_default_prefix/share/locale
+else
+ PACKAGE_LOCALE_DIR=$prefix/share/locale
+fi
+
+AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "$PACKAGE_LOCALE_DIR",
+ [The directory in which qalculate's locale data will be stored])
+ AC_MSG_RESULT("$PACKAGE_LOCALE_DIR")
+
+
+
+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)
+
dnl --------------------------------
dnl | check for neccessary libraries |-----------------------------------------
dnl --------------------------------
Fix build after CLN update.
2009-09-06 17:15:53 +02:00
@@ -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 @@
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
2006-06-22 20:52:00 +02:00
AC_SUBST(LN_QALCULATE)
-dnl -------------------------------------
-dnl | internationalization (i18n) support |------------------------------------
-dnl -------------------------------------
-
-GETTEXT_PACKAGE=qalculate-gtk
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The package name for gettext])
-
-dnl Please keep this in alphabetical order
-ALL_LINGUAS="nl sv"
-AM_GLIB_GNU_GETTEXT
-
-dnl AM_GLIB_GNU_GETTEXT sets $DATADIRNAME
-AC_MSG_CHECKING(locale directory)
-if test "x$prefix" = "xNONE"; then
- PACKAGE_LOCALE_DIR=$ac_default_prefix/share/locale
-else
- PACKAGE_LOCALE_DIR=$prefix/share/locale
-fi
-
-AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "$PACKAGE_LOCALE_DIR",
- [The directory in which qalculate's locale data will be stored])
- AC_MSG_RESULT("$PACKAGE_LOCALE_DIR")
-
-
-
-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)
-
dnl --------
dnl | output |-----------------------------------------------------------------
dnl --------
Reference in a new issue Copy permalink