/pidgin/main: db683ce5d8dc: Fix a bunch of weird stuff when tryi...

Changeset: db683ce5d8dcf119fc25b9a8183257d0c2d381a7
Author:	 Gary Kramlich <[email protected]>
Date:	 2016-08-23 15:23 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/db683ce5d8dc

Description:

Fix a bunch of weird stuff when trying to autogen/configure on osx with homebrew

diffstat:

 autogen.sh |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (33 lines):

diff --git a/autogen.sh b/autogen.sh
--- a/autogen.sh
+++ b/autogen.sh
@@ -52,10 +52,20 @@ ARGS_FILE="autogen.args"
 export CFLAGS
 export LDFLAGS
 
+DEFAULT_ACLOCAL_FLAGS="-I m4macros"
+
 libtoolize="libtoolize"
 case $(uname -s) in
 	Darwin*)
 		libtoolize="glibtoolize"
+		if [ -d /usr/local/opt/gettext ] ; then
+			PATH=/usr/local/opt/gettext/bin:$PATH
+			DEFAULT_ACLOCAL_FLAGS="${DEFAULT_ACLOCAL_FLAGS} -I /usr/local/opt/gettext/share/aclocal"
+		fi
+		if [ -d /usr/local/opt/gobject-introspection ] ; then
+			PATH=/usr/local/opt/gobject-introspection/bin:$PATH
+			DEFAULT_ACLOCAL_FLAGS="${DEFAULT_ACLOCAL_FLAGS} -I /usr/local/opt/gobject-introspection/share/aclocal"
+		fi
 		;;
 	*)
 esac
@@ -180,7 +190,7 @@ run_or_die ${INTLTOOLIZE} ${INTLTOOLIZE_
 run_or_die ${SED} -i -e "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" po/Makefile.in.in
 # glib-gettextize doesn't seems to use AM_V_GEN macro
 ${SED} -i -e "s:\\tfile=\`echo:\\t@echo -e \"  GEN\\\\t\$\@\"; file=\`echo:g" po/Makefile.in.in
-run_or_die ${ACLOCAL} ${ACLOCAL_FLAGS:-"-I m4macros"}
+run_or_die ${ACLOCAL} ${ACLOCAL_FLAGS:-"${DEFAULT_ACLOCAL_FLAGS}"}
 run_or_die ${AUTOHEADER} ${AUTOHEADER_FLAGS}
 check_gtkdoc
 run_or_die ${AUTOMAKE} ${AUTOMAKE_FLAGS:-"-a -c --gnu"}

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits