23170310 xml-parser-512 removal breaks building (running?) a bunch of things
authorCraig Mohrman <craig.mohrman@oracle.com>
Fri, 29 Apr 2016 07:47:39 -0700
changeset 5881 a24bda958288
parent 5880 caab292318a0
child 5884 ef644c2bdc65
23170310 xml-parser-512 removal breaks building (running?) a bunch of things
components/desktop/pidgin/Makefile
make-rules/configure.mk
--- a/components/desktop/pidgin/Makefile	Fri Apr 29 05:16:35 2016 -0700
+++ b/components/desktop/pidgin/Makefile	Fri Apr 29 07:47:39 2016 -0700
@@ -80,6 +80,8 @@
 CONFIGURE_OPTIONS +=	--disable-nm
 CONFIGURE_OPTIONS +=	--disable-consoleui
 CONFIGURE_OPTIONS +=	--disable-vv
+# 23200148 undo this once 23169155 Move developer/gnome/gettext to Userland
+CONFIGURE_OPTIONS +=	INTLTOOL_MERGE="$(PERL) /usr/bin/intltool-merge"
 
 # Always show the build and link lines for easier debugging.
 COMPONENT_BUILD_ARGS +=	V=1
--- a/make-rules/configure.mk	Fri Apr 29 05:16:35 2016 -0700
+++ b/make-rules/configure.mk	Fri Apr 29 07:47:39 2016 -0700
@@ -164,6 +164,10 @@
 CONFIGURE_ENV += "NM=/usr/gnu/bin/nm"
 COMPONENT_BUILD_ENV += "ac_cv_func_realloc_0_nonnull=yes"
 
+# 23200148 undo this once 23169155 Move developer/gnome/gettext to Userland
+CONFIGURE_ENV += INTLTOOL_PERL="$(PERL)"
+COMPONENT_BUILD_ENV += INTLTOOL_PERL="$(PERL)"
+
 # configure the unpacked source for building 32 and 64 bit version
 CONFIGURE_SCRIPT ?=	$(SOURCE_DIR)/configure
 $(BUILD_DIR)/%/.configured:	$(SOURCE_DIR)/.prep