Merge res_odbc and res_config

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3186 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 5 insertions, 0 deletions

diff --git a/res/Makefile b/res/Makefile
index 32e42a2e2..fa6e3cf81 100755
--- a/res/Makefile
+++ b/res/Makefile
@@ -12,6 +12,8 @@
 #
 
 MODS=res_adsi.so res_parking.so res_crypto.so res_musiconhold.so res_indications.so res_monitor.so
+MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
+MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
 
 CRYPTO_LIBS=-lssl -lcrypto
 
@@ -34,6 +36,9 @@ res_crypto.so: res_crypto.o
 clean:
 	rm -f *.so *.o .depend
 
+res_odbc.so: res_odbc.o
+	$(CC) $(SOLINK) -o $@ $< -lodbc
+
 %.so : %.o
 	$(CC) $(SOLINK) -o $@ $<