/pidgin/main: e509583a39a9: Use homebrew to get the prefix inste...

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

Description:

Use homebrew to get the prefix instead of assuming it's in /usr/local/opt

diffstat:

 autogen.sh |  22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diffs (32 lines):

diff --git a/autogen.sh b/autogen.sh
--- a/autogen.sh
+++ b/autogen.sh
@@ -58,13 +58,21 @@ 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"
+
+		BREW=$(which brew)
+
+		if [ -n ${BREW} ] ; then
+			GETTEXT_PREFIX=$(${BREW} --prefix gettext 2>/dev/null)
+			if [ -n ${GETTEXT_PREFIX} ] ; then
+				PATH=${GETTEXT_PREFIX}/bin:$PATH
+				DEFAULT_ACLOCAL_FLAGS="${DEFAULT_ACLOCAL_FLAGS} -I ${GETTEXT_PREFIX}/share/aclocal"
+			fi
+
+			GI_PREFIX=$(${BREW} --prefix gobject-introspection)
+			if [ -n ${GI_PREFIX} ] ; then
+				PATH=${GI_PREFIX}/bin:$PATH
+				DEFAULT_ACLOCAL_FLAGS="${DEFAULT_ACLOCAL_FLAGS} -I ${GI_PREFIX}/share/aclocal"
+			fi
 		fi
 		;;
 	*)

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