[svn-commits] seanbright: tools/trunk r4904 - /tools/trunk/

[SVN commits to the Digium repositories]

Author: seanbright
Date: Fri Sep 12 13:06:41 2008
New Revision: 4904

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4904
Log:
A few changes:

1) Start using menuselect trunk
2) Bring in changes similar to those in asterisk trunk so that
   'make menuselect' works as it should from the dahdi-tools
   directory.
3) Stop looking for curses/ncurses in the top level configure
   since nothing uses it (except menuselect which will find it
   on it's own).


Modified:
    tools/trunk/   (props changed)
    tools/trunk/Makefile
    tools/trunk/configure
    tools/trunk/configure.ac
    tools/trunk/makeopts.in

Propchange: tools/trunk/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Fri Sep 12 13:06:41 2008
@@ -1,1 +1,1 @@
-menuselect https://origsvn.digium.com/svn/menuselect/branches/1.0
+menuselect https://origsvn.digium.com/svn/menuselect/trunk

Modified: tools/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/tools/trunk/Makefile?view=diff&rev=4904&r1=4903&r2=4904
==============================================================================
--- tools/trunk/Makefile (original)
+++ tools/trunk/Makefile Fri Sep 12 13:06:41 2008
@@ -331,16 +331,56 @@
 	@echo "****"
 	@exit 1
 
-menuselect.makeopts: menuselect/menuselect menuselect-tree
-	@menuselect/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@
+menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts
+	menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
 
 menuconfig: menuselect
 
-menuselect: menuselect/menuselect menuselect-tree
-	- at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
-
-menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h config.status
-	@CFLAGS="" $(MAKE) -C menuselect CC=$(HOSTCC)
+cmenuconfig: cmenuselect
+
+gmenuconfig: gmenuselect
+
+nmenuconfig: nmenuselect
+
+menuselect: menuselect/cmenuselect menuselect/nmenuselect menuselect/gmenuselect
+	@if [ -x menuselect/nmenuselect ]; then \
+		$(MAKE) nmenuselect; \
+	elif [ -x menuselect/cmenuselect ]; then \
+		$(MAKE) cmenuselect; \
+	elif [ -x menuselect/gmenuselect ]; then \
+		$(MAKE) gmenuselect; \
+	else \
+		echo "No menuselect user interface found. Install ncurses,"; \
+		echo "newt or GTK libraries to build one and re-rerun"; \
+		echo "'make menuselect'."; \
+	fi
+
+cmenuselect: menuselect/cmenuselect menuselect-tree
+	- at menuselect/cmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
+
+gmenuselect: menuselect/gmenuselect menuselect-tree
+	- at menuselect/gmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
+
+nmenuselect: menuselect/nmenuselect menuselect-tree
+	- at menuselect/nmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
+
+# options for make in menuselect/
+MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+
+menuselect/menuselect: menuselect/makeopts
+	$(MAKE_MENUSELECT) menuselect
+
+menuselect/cmenuselect: menuselect/makeopts
+	$(MAKE_MENUSELECT) cmenuselect
+
+menuselect/gmenuselect: menuselect/makeopts
+	$(MAKE_MENUSELECT) gmenuselect
+
+menuselect/nmenuselect: menuselect/makeopts
+	$(MAKE_MENUSELECT) nmenuselect
+
+menuselect/makeopts: makeopts
+	$(MAKE_MENUSELECT) makeopts
 
 menuselect-tree: dahdi.xml
 	@echo "Generating input for menuselect ..."

Modified: tools/trunk/configure.ac
URL: http://svn.digium.com/view/dahdi/tools/trunk/configure.ac?view=diff&rev=4904&r1=4903&r2=4904
==============================================================================
--- tools/trunk/configure.ac (original)
+++ tools/trunk/configure.ac Fri Sep 12 13:06:41 2008
@@ -82,15 +82,11 @@
 fi
 AC_SUBST(DAHDI_DECLARATION_AFTER_STATEMENT)
 
-AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
 AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi])
-AST_EXT_LIB_SETUP([NCURSES], [ncurses], [ncurses])
 AST_EXT_LIB_SETUP([NEWT], [newt], [newt])
 AST_EXT_LIB_SETUP([USB], [usb], [usb])
 
-AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
 AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h])
-AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h])
 AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
 AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h])
 

Modified: tools/trunk/makeopts.in
URL: http://svn.digium.com/view/dahdi/tools/trunk/makeopts.in?view=diff&rev=4904&r1=4903&r2=4904
==============================================================================
--- tools/trunk/makeopts.in (original)
+++ tools/trunk/makeopts.in Fri Sep 12 13:06:41 2008
@@ -33,12 +33,6 @@
 NEWT_LIB=@NEWT_LIB@
 NEWT_INCLUDE=@NEWT_INCLUDE@
 
-CURSES_LIB=@CURSES_LIB@
-CURSES_INCLUDE=@CURSES_INCLUDE@
-
-NCURSES_LIB=@NCURSES_LIB@
-NCURSES_INCLUDE=@NCURSES_INCLUDE@
-
 PBX_USB=@PBX_USB@
 USB_LIB=@USB_LIB@
 USB_INCLUDE=@USB_INCLUDE@