Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.66
diff -u -r1.66 Makefile
--- Makefile	25 Dec 2003 14:01:55 -0000	1.66
+++ Makefile	4 Jan 2004 15:45:03 -0000
@@ -76,6 +76,9 @@
 # /tmp/asterisk/etc/asterisk
 DESTDIR=
 
+# Do you want ENUM support
+ENUM_SUPPORT = -DENUM_SUPPORT
+
 # Original busydetect routine
 BUSYDETECT = #-DBUSYDETECT
 
@@ -105,6 +108,7 @@
 INCLUDE=-Iinclude -I../include
 CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
 CFLAGS+=$(OPTIMIZE)
+CFLAGS+=$(ENUM_SUPPORT)
 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
 CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
 ifeq (${OSARCH},FreeBSD)
Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.47
diff -u -r1.47 asterisk.c
--- asterisk.c	9 Dec 2003 20:37:10 -0000	1.47
+++ asterisk.c	4 Jan 2004 15:45:05 -0000
@@ -1430,10 +1430,12 @@
 		printf(term_quit());
 		exit(1);
 	}
+#ifdef ENUM_SUPPORT
 	if (ast_enum_init()) {
 		printf(term_quit());
 		exit(1);
 	}
+#endif
 	/* We might have the option of showing a console, but for now just
 	   do nothing... */
 	if (option_console && !option_verbose)
Index: dns.c
===================================================================
RCS file: /usr/cvsroot/asterisk/dns.c,v
retrieving revision 1.2
diff -u -r1.2 dns.c
--- dns.c	26 Oct 2003 18:50:49 -0000	1.2
+++ dns.c	4 Jan 2004 15:45:05 -0000
@@ -9,6 +9,8 @@
  * the GNU General Public License
  */
 
+#ifdef ENUM_SUPPORT
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -187,3 +189,5 @@
 #endif
 	return ret;
 }
+
+#endif
Index: enum.c
===================================================================
RCS file: /usr/cvsroot/asterisk/enum.c,v
retrieving revision 1.14
diff -u -r1.14 enum.c
--- enum.c	26 Nov 2003 19:15:56 -0000	1.14
+++ enum.c	4 Jan 2004 15:45:05 -0000
@@ -11,6 +11,8 @@
  *
  */
 
+#ifdef ENUM_SUPPORT
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -354,3 +356,5 @@
 {
 	return ast_enum_init();
 }
+
+#endif
Index: loader.c
===================================================================
RCS file: /usr/cvsroot/asterisk/loader.c,v
retrieving revision 1.18
diff -u -r1.18 loader.c
--- loader.c	19 Nov 2003 21:19:18 -0000	1.18
+++ loader.c	4 Jan 2004 15:45:06 -0000
@@ -156,7 +156,9 @@
 		return;
 	}
 	reload_manager();
+#ifdef ENUM_SUPPORT
 	ast_enum_reload();
+#endif
 	ast_rtp_reload();
 	time(&ast_lastreloadtime);
 
Index: srv.c
===================================================================
RCS file: /usr/cvsroot/asterisk/srv.c,v
retrieving revision 1.6
diff -u -r1.6 srv.c
--- srv.c	27 Oct 2003 20:00:41 -0000	1.6
+++ srv.c	4 Jan 2004 15:45:06 -0000
@@ -11,6 +11,8 @@
  *
  */
 
+#ifdef ENUM_SUPPORT
+
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
@@ -112,3 +114,5 @@
 	}
 	return ret;
 }
+
+#endif
Index: channels/chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.265
diff -u -r1.265 chan_sip.c
--- channels/chan_sip.c	19 Dec 2003 17:42:50 -0000	1.265
+++ channels/chan_sip.c	4 Jan 2004 15:45:15 -0000
@@ -734,6 +734,7 @@
 			portno = atoi(port);
 		else
 			portno = DEFAULT_SIP_PORT;
+#ifdef ENUM_SUPPORT
 		if (srvlookup) {
 			char service[256];
 			int tportno;
@@ -745,6 +746,7 @@
 				portno = tportno;
 			}
 		}
+#endif
 		hp = gethostbyname(hostn);
 		if (hp) {
 			strncpy(r->tohost, peer, sizeof(r->tohost) - 1);