Thanks to the fine work of Russell Bryant and Dancho Lazarov, we now have autoconf and menuselect tools for Asterisk!

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@22267 f38db490-d61c-443f-a65b-d21fe96a405b

11 files changed, 63 insertions, 34 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 934a8f268..ba10cbab2 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -11,39 +11,12 @@
 # the GNU General Public License
 #
 
-MODS:=$(patsubst %.c,%.so,$(wildcard app_*.c))
+MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%.so,$(wildcard app_*.c)))
 
-#
-# Experimental things
-#
-MODS:=$(filter-out app_ivrdemo.so,$(MODS))
-MODS:=$(filter-out app_skel.so,$(MODS))
-MODS:=$(filter-out app_rpt.so,$(MODS))
-
-ifndef WITHOUT_ZAPTEL
-ZAPAVAIL:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)
-endif
-
-ifeq (${ZAPAVAIL},)
-  MODS:=$(filter-out app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so,$(MODS))
-endif
-
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
-  MODS:=$(filter-out app_osplookup.so,$(MODS))
-endif
-
-ifneq (${WITH_SMDI},)
+ifneq ($(WITH_SMDI),)
   CFLAGS+=-DWITH_SMDI
 endif
 
-ifeq (${OSARCH},CYGWIN)
-  CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
-  CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so -lres_adsi.so -lres_monitor.so
-  MODS:=$(filter-out app_sms.so,$(MODS))
-else
-  CFLAGS+=-fPIC
-endif
-
 # If you have UnixODBC you can use ODBC voicemail
 # storage
 #
@@ -61,11 +34,14 @@ clean-depend:
 clean: clean-depend
 	rm -f *.so *.o
 
-%.so : %.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
+%.so: %.o
+	$(CC) $(SOLINK) -o $@ $<
+
+app_rpt.so: app_rpt.o
+	$(CC) $(SOLINK) -o $@ $< $(ZAPTEL_LIB)
 
-app_rpt.so : app_rpt.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone
+app_rpt.o: app_rpt.c
+	$(CC) $(SOLINK) -o $@ $< $(ZAPTEL_INCLUDE) 
 
 install: all
 	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
diff --git a/apps/app_flash.c b/apps/app_flash.c
index 0e3eba4dd..5e4f76044 100644
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
  
+/*** MODULEINFO
+	<depend>zaptel</depend>
+ ***/
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -132,3 +136,4 @@ static const char *key(void)
 }
 
 STD_MOD1;
+
diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c
index 1ceedf6a7..8adccd323 100644
--- a/apps/app_ivrdemo.c
+++ b/apps/app_ivrdemo.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<defaultenabled>no</defaultenabled>
+ ***/
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -137,3 +141,4 @@ static const char *key(void)
 }
 
 STD_MOD1;
+
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index fed92f372..deab9afad 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -26,6 +26,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<depend>zaptel</depend>
+ ***/
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -2469,5 +2473,6 @@ static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
- 
+
 STD_MOD(MOD_1, reload, NULL, NULL);
+
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index bc12f5ba0..7c09fee02 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -25,6 +25,11 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<depend>libosptk</depend>
+	<depend>ssl</depend>
+ ***/
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -637,3 +642,5 @@ static const char *key(void)
 }
 
 STD_MOD1;
+
+
diff --git a/apps/app_page.c b/apps/app_page.c
index 0dee1611f..bb3293851 100644
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<depend>zaptel</depend>
+ ***/
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -230,3 +234,4 @@ static const char *key(void)
 }
 
 STD_MOD1;
+
diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index d919fc23e..f3edb044d 100644
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -95,6 +95,11 @@
  *
 */
 
+/*** MODULEINFO
+	<depend>zaptel</depend>
+	<defaultenabled>no</defaultenabled>
+ ***/
+
 /* The following is JUST GROSS!! There is some soft of underlying problem,
    probably in channel_iax2.c, that causes an IAX2 connection to sometimes
    stop transmitting randomly. We have been working for weeks to try to
@@ -7063,3 +7068,4 @@ static const char *key(void)
 }
 
 STD_MOD1;
+
diff --git a/apps/app_skel.c b/apps/app_skel.c
index 598170d2e..debe358d4 100644
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -26,6 +26,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<defaultenabled>no</defaultenabled>
+ ***/
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -141,3 +145,4 @@ static const char *key(void)
 }
 
 STD_MOD1;
+
diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index ad77a6e4b..7dc12f661 100644
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -31,6 +31,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<depend>zaptel</depend>
+ ***/
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -329,3 +333,4 @@ static const char *key(void)
 }
 
 STD_MOD1;
+
diff --git a/apps/app_zapras.c b/apps/app_zapras.c
index d918b7d24..c95f75238 100644
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<depend>zaptel</depend>
+ ***/
+
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #ifdef __linux__
@@ -267,3 +271,4 @@ static const char *key(void)
 }
 
 STD_MOD1;
+
diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index affa16d6a..c8e0d75dd 100644
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -30,6 +30,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<depend>zaptel</depend>
+ ***/
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -390,3 +394,4 @@ static const char *key(void)
 }
 
 STD_MOD1;
+