summaryrefslogtreecommitdiff
path: root/math/qalculate-gtk/patches/patch-ac
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-06-22 18:52:00 +0000
committerjlam <jlam@pkgsrc.org>2006-06-22 18:52:00 +0000
commitf025f43fc4140349a95ace94617a8be52c10d395 (patch)
tree4984ae5d112ebb28c363b13efd5fba59fcd15451 /math/qalculate-gtk/patches/patch-ac
parent36c6544bbafc585d7f24f83810c8a335debb5be6 (diff)
downloadpkgsrc-f025f43fc4140349a95ace94617a8be52c10d395.tar.gz
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
Diffstat (limited to 'math/qalculate-gtk/patches/patch-ac')
-rw-r--r--math/qalculate-gtk/patches/patch-ac76
1 files changed, 76 insertions, 0 deletions
diff --git a/math/qalculate-gtk/patches/patch-ac b/math/qalculate-gtk/patches/patch-ac
new file mode 100644
index 00000000000..32439d90aef
--- /dev/null
+++ b/math/qalculate-gtk/patches/patch-ac
@@ -0,0 +1,76 @@
+$NetBSD: patch-ac,v 1.1 2006/06/22 18:52:00 jlam Exp $
+
+--- configure.in.orig 2006-04-13 06:27:37.000000000 -0400
++++ configure.in
+@@ -55,6 +55,35 @@ fi
+ 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 --------------------------------
+@@ -123,35 +152,6 @@ AC_SUBST(QALCULATE_GTK)
+
+ 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 --------