/pidgin/main: 78fc5cfbe275: Fixed out of source tree building

Changeset: 78fc5cfbe275a92d5be92ee0871934b78a00981c
Author:	 James Geboski <[email protected]>
Date:	 2016-01-06 14:25 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/78fc5cfbe275

Description:

Fixed out of source tree building

This addresses:
  - The autogen script not switching to the source directory
  - Various missing header include paths

diffstat:

 autogen.sh                               |  14 ++++++++++++--
 finch/Makefile.am                        |   2 ++
 finch/libgnt/wms/Makefile.am             |   1 +
 libpurple/protocols/facebook/Makefile.am |   1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diffs (71 lines):

diff --git a/autogen.sh b/autogen.sh
--- a/autogen.sh
+++ b/autogen.sh
@@ -149,6 +149,15 @@ else
 fi
 
 ###############################################################################
+# Work inside the source directory
+##############################################################################
+test -z "$SRCDIR" && SRCDIR=`dirname "$0"`
+test -z "$SRCDIR" && SRCDIR=.
+
+OLDDIR=`pwd`
+cd "$SRCDIR"
+
+###############################################################################
 # Check for our required helpers
 ###############################################################################
 check "$libtoolize";		LIBTOOLIZE=${BIN};
@@ -180,7 +189,8 @@ run_or_die ${AUTOCONF} ${AUTOCONF_FLAGS}
 ###############################################################################
 # Run configure
 ###############################################################################
+cd "$OLDDIR"
 if test -z "$NOCONFIGURE"; then
-	echo "running ./configure ${CONFIGURE_FLAGS} $@"
-	./configure ${CONFIGURE_FLAGS} $@
+	echo "running $SRCDIR/configure ${CONFIGURE_FLAGS} $@"
+	"$SRCDIR/configure" ${CONFIGURE_FLAGS} $@
 fi
diff --git a/finch/Makefile.am b/finch/Makefile.am
--- a/finch/Makefile.am
+++ b/finch/Makefile.am
@@ -111,6 +111,7 @@ endif
 AM_CPPFLAGS = \
 	-DSTANDALONE \
 	-I$(top_srcdir)/libpurple/ \
+	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir) \
 	-I$(srcdir)/libgnt/ \
 	$(DEBUG_CFLAGS) \
@@ -152,6 +153,7 @@ Finch_3_0_gir_CFLAGS = \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-I$(top_srcdir)/libpurple/ \
+	-I$(top_builddir)/libpurple/ \
 	-I$(top_srcdir) \
 	-I$(srcdir)/libgnt/ \
 	$(GLIB_CFLAGS) \
diff --git a/finch/libgnt/wms/Makefile.am b/finch/libgnt/wms/Makefile.am
--- a/finch/libgnt/wms/Makefile.am
+++ b/finch/libgnt/wms/Makefile.am
@@ -30,6 +30,7 @@ EXTRA_DIST =
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/finch \
 	-I$(top_srcdir)/finch/libgnt \
 	$(DEBUG_CFLAGS) \
diff --git a/libpurple/protocols/facebook/Makefile.am b/libpurple/protocols/facebook/Makefile.am
--- a/libpurple/protocols/facebook/Makefile.am
+++ b/libpurple/protocols/facebook/Makefile.am
@@ -59,6 +59,7 @@ endif
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
+	-I$(top_srcdir) \
 	$(GLIB_CFLAGS) \
 	$(JSON_CFLAGS) \
 	$(ZLIB_CFLAGS) \

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