[asterisk-commits] branch group/autoconf_and_menuselect r11047 - /team/group/autoconf_and_menuse...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Fri Feb 24 21:02:15 2006
New Revision: 11047

URL: http://svn.digium.com/view/asterisk?rev=11047&view=rev
Log:
finish updates to res modules

Modified:
    team/group/autoconf_and_menuselect/res/Makefile
    team/group/autoconf_and_menuselect/res/res_config_odbc.c
    team/group/autoconf_and_menuselect/res/res_crypto.c
    team/group/autoconf_and_menuselect/res/res_odbc.c

Modified: team/group/autoconf_and_menuselect/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/res/Makefile?rev=11047&r1=11046&r2=11047&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/res/Makefile (original)
+++ team/group/autoconf_and_menuselect/res/Makefile Fri Feb 24 21:02:15 2006
@@ -13,24 +13,12 @@
 
 MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%.so,$(wildcard res_*.c)))
 
-ifneq ($(UNIXODBC),1)
-  MODS:=$(filter-out res_odbc.so,$(MODS))
-  MODS:=$(filter-out res_config_odbc.so,$(MODS))
-else
-  ifeq (${OSARCH},FreeBSD)
-    MODS:=$(filter-out $(shell if test ${BSDVERSION} -lt 500000 ; then echo "res_config_odbc.so"; fi),$(MODS))
-  endif
+ifeq (${OSARCH},FreeBSD)
+  MODS:=$(filter-out $(shell if test ${BSDVERSION} -lt 500000 ; then echo "res_config_odbc.so"; fi),$(MODS))
 endif
 
-ifeq ($(NOCRYPTO),yes)
-  MODS:=$(filter-out res_crypto.so,$(MODS))
-  MODS:=$(filter-out res_osp.so,$(MODS))
-endif
-
+# XXX To be removed once this is set by autoconf
 OSPLIB:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a)
-ifeq (${OSPLIB},)
-  MODS:=$(filter-out res_osp.so,$(MODS))
-endif
 
 ifeq (${WITH_SMDI},)
   MODS:=$(filter-out res_smdi.so,$(MODS))

Modified: team/group/autoconf_and_menuselect/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/res/res_config_odbc.c?rev=11047&r1=11046&r2=11047&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/res/res_config_odbc.c (original)
+++ team/group/autoconf_and_menuselect/res/res_config_odbc.c Fri Feb 24 21:02:15 2006
@@ -540,3 +540,7 @@
 {
 	return ASTERISK_GPL_KEY;
 }
+
+/*** MODULEINFO
+	<depend>unixodbc</depend>
+ ***/

Modified: team/group/autoconf_and_menuselect/res/res_crypto.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/res/res_crypto.c?rev=11047&r1=11046&r2=11047&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/res/res_crypto.c (original)
+++ team/group/autoconf_and_menuselect/res/res_crypto.c Fri Feb 24 21:02:15 2006
@@ -618,3 +618,7 @@
 {
 	return ASTERISK_GPL_KEY;
 }
+
+/*** MODULEINFO
+	<depend>ssl</depend>
+ ***/

Modified: team/group/autoconf_and_menuselect/res/res_odbc.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/res/res_odbc.c?rev=11047&r1=11046&r2=11047&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/res/res_odbc.c (original)
+++ team/group/autoconf_and_menuselect/res/res_odbc.c Fri Feb 24 21:02:15 2006
@@ -619,4 +619,4 @@
 
 /*** MODULEINFO
 	<depend>unixodbc</depend>
-***/
+ ***/