[asterisk-commits] branch mogorman/asterisk-xmpp r22410 - in /team/mogorman/asterisk-xmpp: ./ bu...

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Tue Apr 25 10:58:44 2006
New Revision: 22410

URL: http://svn.digium.com/view/asterisk?rev=22410&view=rev
Log:
fix automerge failure

Modified:
    team/mogorman/asterisk-xmpp/   (props changed)
    team/mogorman/asterisk-xmpp/Makefile
    team/mogorman/asterisk-xmpp/bootstrap.sh
    team/mogorman/asterisk-xmpp/build_tools/Makefile
    team/mogorman/asterisk-xmpp/configure.ac
    team/mogorman/asterisk-xmpp/makeopts.in

Propchange: team/mogorman/asterisk-xmpp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 25 10:58:44 2006
@@ -1,1 +1,1 @@
-/trunk:1-22330
+/trunk:1-22409

Modified: team/mogorman/asterisk-xmpp/Makefile
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/Makefile?rev=22410&r1=22409&r2=22410&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/Makefile (original)
+++ team/mogorman/asterisk-xmpp/Makefile Tue Apr 25 10:58:44 2006
@@ -978,11 +978,11 @@
 menuselect: build_tools/menuselect makeopts.xml
 	- at build_tools/menuselect ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
 
-build_tools/menuselect: build_tools/menuselect.c build_tools/menuselect_curses.c build_tools/menuselect.h mxml/libmxml.a include/autoconfig.h
+build_tools/menuselect: build_tools/menuselect.c build_tools/menuselect_curses.c build_tools/menuselect.h include/autoconfig.h strcompat.o mxml/libmxml.a
 	$(MAKE) -C build_tools menuselect
 
 mxml/libmxml.a:
-	@cd mxml && unset CFLAGS && test -f config.h || ./configure
+	@cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
 	$(MAKE) -C mxml libmxml.a
 
 makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml

Modified: team/mogorman/asterisk-xmpp/bootstrap.sh
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/bootstrap.sh?rev=22410&r1=22409&r2=22410&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/bootstrap.sh (original)
+++ team/mogorman/asterisk-xmpp/bootstrap.sh Tue Apr 25 10:58:44 2006
@@ -22,8 +22,10 @@
 	autoheader259
 	automake19 --add-missing --copy 2>/dev/null
 else
-	export AUTOCONF_VERSION=2.59
-	export AUTOMAKE_VERSION=1.9
+	AUTOCONF_VERSION=2.59
+	AUTOMAKE_VERSION=1.9
+	export AUTOCONF_VERSION
+	export AUTOMAKE_VERSION
 
 	check_for_app autoconf
 	check_for_app autoheader

Modified: team/mogorman/asterisk-xmpp/build_tools/Makefile
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/build_tools/Makefile?rev=22410&r1=22409&r2=22410&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/build_tools/Makefile (original)
+++ team/mogorman/asterisk-xmpp/build_tools/Makefile Tue Apr 25 10:58:44 2006
@@ -1,15 +1,23 @@
 MENUSELECT_OBJS=menuselect.o menuselect_curses.o
 MENUSELECT_CFLAGS=-g -c -D_GNU_SOURCE -I../ -I../include/
-MENUSELECT_LIBS=../mxml/libmxml.a $(CURSES_LIB)
+MENUSELECT_LIBS=../mxml/libmxml.a
+
+ifneq ($(NCURSES_LIB),)
+  MENUSELECT_LIBS+=$(NCURSES_LIB)
+  MENUSELECT_INCLUDE=$(NCURSES_INCLUDE)
+else
+  MENUSELECT_LIBS+=$(CURSES_LIB)
+  MENUSELECT_INCLUDE=$(CURSES_INCLUDE)
+endif
 
 menuselect: $(MENUSELECT_OBJS)
-	$(CC) -g -o $@ $(MENUSELECT_OBJS) $(MENUSELECT_LIBS)
+	$(CC) -g -o $@ ../strcompat.o $(MENUSELECT_OBJS) $(MENUSELECT_LIBS)
 
 menuselect.o: menuselect.c menuselect.h
 	$(CC) -o $@ $(MENUSELECT_CFLAGS) $<
 
 menuselect_curses.o: menuselect_curses.c menuselect.h
-	$(CC) -o $@ $(MENUSELECT_CFLAGS) $(CURSES_INCLUDE) $<
+	$(CC) -o $@ $(MENUSELECT_CFLAGS) $(MENUSELECT_INCLUDE) $<
 
 clean:
 	rm -f menuselect *.o

Modified: team/mogorman/asterisk-xmpp/configure.ac
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/configure.ac?rev=22410&r1=22409&r2=22410&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/configure.ac (original)
+++ team/mogorman/asterisk-xmpp/configure.ac Tue Apr 25 10:58:44 2006
@@ -161,6 +161,7 @@
 AST_EXT_LIB([curses], [initscr], [curses.h], [CURSES], [curses], [])
 AST_EXT_LIB([mfcr2], [mfcr2_MakeCall], [libmfcr2.h], [MFCR2], [MFCR2])
 AST_EXT_LIB([nbs], [nbs_setup], [nbs.h], [NBS], [Network Broadcast Sound])
+AST_EXT_LIB([ncurses], [initscr], [curses.h], [NCURSES], [ncurses], [])
 AST_EXT_LIB([newt], [newtBell], [newt.h], [NEWT], [newt])
 AST_EXT_LIB([odbc], [SQLConnect], [sql.h], [UNIXODBC], [unixODBC])
 AST_EXT_LIB([ogg], [ogg_sync_init], [], [OGG], [OGG])

Modified: team/mogorman/asterisk-xmpp/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/makeopts.in?rev=22410&r1=22409&r2=22410&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/makeopts.in (original)
+++ team/mogorman/asterisk-xmpp/makeopts.in Tue Apr 25 10:58:44 2006
@@ -78,6 +78,9 @@
 PWLIB_LIB=@PWLIB_LIB@
 PWLIB_INCLUDE=@PWLIB_INCLUDE@
 
+IKSEMEL_LIB=@iksemel_LIB@
+IKSEMEL_INCLUDE=@iksemel_INCLUDE@
+
 SSL_LIB=@ssl_LIB@
 SSL_INCLUDE=@ssl_INCLUDE@
 
@@ -102,5 +105,5 @@
 CURSES_LIB=@curses_LIB@
 CURSES_INCLUDE=@curses_INCLUDE@
 
-IKSEMEL_LIB=@iksemel_LIB@
-IKSEMEL_INCLUDE=@iksemel_INCLUDE@
+NCURSES_LIB=@ncurses_LIB@
+NCURSES_INCLUDE=@ncurses_INCLUDE@