/pidgin/main: 55b8e7f2f724: Merged in rw_grim/pidgin (pull reque...

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

Description:

Merged in rw_grim/pidgin (pull request #103)

Clean up autogen/configure on osx with homebrew

diffstat:

 autogen.sh   |  20 +++++++++++++++++++-
 configure.ac |   2 --
 2 files changed, 19 insertions(+), 3 deletions(-)

diffs (53 lines):

diff --git a/autogen.sh b/autogen.sh
--- a/autogen.sh
+++ b/autogen.sh
@@ -52,10 +52,28 @@ ARGS_FILE="autogen.args"
 export CFLAGS
 export LDFLAGS
 
+DEFAULT_ACLOCAL_FLAGS="-I m4macros"
+
 libtoolize="libtoolize"
 case $(uname -s) in
 	Darwin*)
 		libtoolize="glibtoolize"
+
+		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
 		;;
 	*)
 esac
@@ -180,7 +198,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"}
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1969,8 +1969,6 @@ if test "x$enable_nss" != "xno"; then
 	if test "x$have_nss" = "xyes"; then
 		AC_DEFINE(HAVE_NSS, 1, [Define if you have Mozilla NSS])
 		msg_nss="Mozilla NSS"
-	else
-		AC_MSG_ERROR([No SSL/TLS library available])
 	fi
 fi
 

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