mcabber-isbear-patches: fix-separate-build.diff@8f5cf5969e25 (annotated)

55 8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	1	# HG changeset patch
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	2	# Parent 1466c4a807787958dcb35e478de1e812999d97c9
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	3	Fix building from separate directory
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	4
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	5	diff -r 1466c4a80778 mcabber/hgcset.sh
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	6	--- a/mcabber/hgcset.sh Thu Nov 22 00:50:00 2012 +0200
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	7	+++ b/mcabber/hgcset.sh Thu Nov 22 00:52:30 2012 +0200
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	8	@@ -1,19 +1,24 @@
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	9	#! /bin/sh
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	10
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	11	-if [ ! -f logprint.h ]; then
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	12	- echo "You are not in the mcabber directory" >&2
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	13	+srcdir="$1"
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	14	+builddir="$2"
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	15	+
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	16	+if [ ! -f "$srcdir/logprint.h" ]; then
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	17	+ echo "Unable to find mcabber sources!" >&2
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	18	exit 1
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	19	fi
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	20
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	21	+cd "$srcdir"
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	22	+
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	23	if which hg > /dev/null 2>&1; then
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	24	cs=$(hg id 2> /dev/null \| cut -d' ' -f1)
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	25	if test $? -eq 0; then
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	26	if [ x"$cs" != x ]; then
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	27	- grep -q "$cs" hgcset.h > /dev/null 2>&1 \|\| \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	28	- echo "#define HGCSET \"$cs\"" > hgcset.h
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	29	+ grep -q "$cs" "$builddir/hgcset.h" > /dev/null 2>&1 \|\| \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	30	+ echo "#define HGCSET \"$cs\"" > "$builddir/hgcset.h"
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	31	exit 0
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	32	fi
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	33	fi
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	34	fi
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	35
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	36	-echo > hgcset.h
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	37	+echo > "$builddir/hgcset.h"
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	38	diff -r 1466c4a80778 mcabber/mcabber/Makefile.am
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	39	--- a/mcabber/mcabber/Makefile.am Thu Nov 22 00:50:00 2012 +0200
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	40	+++ b/mcabber/mcabber/Makefile.am Thu Nov 22 00:52:30 2012 +0200
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	41	@@ -16,7 +16,8 @@
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	42	LDADD = $(GLIB_LIBS) $(LOUDMOUTH_LIBS) $(GPGME_LIBS) $(LIBOTR_LIBS) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	43	$(ENCHANT_LIBS) $(LIBIDN_LIBS)
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	44
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	45	-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	46	+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	47	+ $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	48	$(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	49	$(ENCHANT_CFLAGS) $(LIBIDN_CFLAGS)
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	50
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	51	@@ -26,7 +27,7 @@
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	52	BUILT_SOURCES = hgcset.h
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	53
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	54	hgcset.h:
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	55	- ../hgcset.sh
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	56	+ $(top_srcdir)/hgcset.sh "$(top_srcdir)/mcabber" "$(top_builddir)/mcabber"
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	57
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	58	.PHONY: hgcset.h
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	59	endif
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	60	@@ -42,7 +43,7 @@
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	61	xmpp_iq.h xmpp_iqrequest.h \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	62	xmpp_muc.h xmpp_s10n.h \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	63	caps.h fifo.h help.h modules.h api.h \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	64	- $(top_srcdir)/include/config.h
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	65	+ $(top_builddir)/include/config.h
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	66
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	67	if OTR
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	68	mcabberinclude_HEADERS += otr.h nohtml.h
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	69	diff -r 1466c4a80778 mcabber/modules/beep/Makefile.am
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	70	--- a/mcabber/modules/beep/Makefile.am Thu Nov 22 00:50:00 2012 +0200
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	71	+++ b/mcabber/modules/beep/Makefile.am Thu Nov 22 00:52:30 2012 +0200
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	72	@@ -6,7 +6,8 @@
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	73	libbeep_la_LDFLAGS = -module -avoid-version -shared
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	74
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	75	LDADD = $(GLIB_LIBS)
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	76	-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	77	+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	78	+ $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	79	$(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	80	$(ENCHANT_CFLAGS)
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	81
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	82	diff -r 1466c4a80778 mcabber/modules/fifo/Makefile.am
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	83	--- a/mcabber/modules/fifo/Makefile.am Thu Nov 22 00:50:00 2012 +0200
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	84	+++ b/mcabber/modules/fifo/Makefile.am Thu Nov 22 00:52:30 2012 +0200
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	85	@@ -5,7 +5,8 @@
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	86	libfifo_la_LDFLAGS = -module -avoid-version -shared
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	87
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	88	LDADD = $(GLIB_LIBS)
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	89	-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	90	+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	91	+ $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	92	$(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	93	$(ENCHANT_CFLAGS)
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	94	endif
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	95	diff -r 1466c4a80778 mcabber/modules/urlregex/Makefile.am
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	96	--- a/mcabber/modules/urlregex/Makefile.am Thu Nov 22 00:50:00 2012 +0200
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	97	+++ b/mcabber/modules/urlregex/Makefile.am Thu Nov 22 00:52:30 2012 +0200
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	98	@@ -6,7 +6,8 @@
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	99	liburlregex_la_LDFLAGS = -module -avoid-version -shared
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	100
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	101	LDADD = $(GLIB_LIBS)
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	102	-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	103	+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	104	+ $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	105	$(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	106	$(ENCHANT_CFLAGS)
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	107
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	108	diff -r 1466c4a80778 mcabber/modules/xttitle/Makefile.am
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	109	--- a/mcabber/modules/xttitle/Makefile.am Thu Nov 22 00:50:00 2012 +0200
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	110	+++ b/mcabber/modules/xttitle/Makefile.am Thu Nov 22 00:52:30 2012 +0200
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	111	@@ -6,7 +6,8 @@
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	112	libxttitle_la_LDFLAGS = -module -avoid-version -shared
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	113
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	114	LDADD = $(GLIB_LIBS)
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	115	-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	116	+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	117	+ $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	118	$(GPGME_CFLAGS) $(LIBOTR_CFLAGS) $(ENCHANT_CFLAGS)
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	119
8f5cf5969e25 Add fix-separate-build.diff Myhailo Danylenko <isbear@ukrpost.net> parents: diff changeset	120	endif

author	Myhailo Danylenko <isbear@ukrpost.net>
	Thu, 22 Nov 2012 00:56:12 +0200
changeset 55	8f5cf5969e25
permissions	-rw-r--r--