- updated Makefiles to work with the new module ones

 - removed -DDIGEST_DOMAIN (unused) and -DVOICE_MAIL from Makefile.defs

Makefile.defs

@@ -19,13 +19,23 @@
 #               (too many symbols for pic13)  (andrei)
 #  2003-04-16  added CC_EXTRA_OPTS, s/march/mcpu, added CPU (cpu to optimize 
 #               for, used only with gcc-3.x) (andrei)
+#  2003-05-23  check if this makefile was already included (andrei)
+#              removed -DDIGEST_DOMAIN (andrei)
+
+
+# check if already included/exported
+
+ifeq ($(makefile_defs), 1)
+else
+makefile_defs=1
+export makefile_defs
 
 
 #version number
 VERSION = 0
 PATCHLEVEL = 8
 SUBLEVEL =   11
-EXTRAVERSION = pre27
+EXTRAVERSION = pre28
 
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
@@ -173,15 +183,6 @@ YACC := $(shell echo "$${YACC}")
 #		not work, use it only if you really now what you are doing)
 # -DDISABLE_NAGLE
 #		disable the tcp Nagle algorithm (lower delay)
-# -DVOICE_MAIL
-#               enables voicemail support in ser core and in tm module
-#               voicemail needs also -D_TOTAG
-#
-# -DDIGEST_DOMAIN
-#               enables further parsing of digest username. Some clients put @domain
-#               in username digest parameter because realm parameter is not protected
-#               by the digest. This hasn't been standardized, but several user agents
-#               use this.
 
 
 DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
@@ -194,7 +195,6 @@ DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
 	 -DUSE_IPV6 \
 	 -DUSE_TCP \
 	 -DDISABLE_NAGLE \
-	 -DDIGEST_DOMAIN \
 	 -DDBG_QM_MALLOC \
 	 #-DF_MALLOC \
 	 #-DNO_DEBUG \
@@ -661,3 +661,9 @@ $(warning	No locking method found so far, trying SYS V sems)
 		DEFS+= -DUSE_SYSV_SEM  # try sys v sems
 		found_lock_method=yes
 endif
+
+
+
+
+
+endif  # ifeq ($(makefile_defs, 1)

Makefile.modules

@@ -19,8 +19,9 @@ ifeq ($(MAKELEVEL), 0)
 # make called directly in the module dir!
 
 $(warning "you should run make from the main ser directory")
-include ../../Makefile.defs
-ALLDEP+=../../Makefile.defs
+ifneq ($(makefile_defs), 1)
+$(error "the local makefile does not include Makefile.defs!")
+endif
 
 else
 # called by the main Makefile

test/module_compile_status.txt

@@ -1,6 +1,6 @@
 
 
-1 linux-i386/gcc2.96
+1 linux-i386/gcc2.95
 2 linux-i386/gcc3.3
 3 linux-i386/icc
 4 freebsd-i386/gcc
@@ -26,43 +26,43 @@ checked:
 
 module_name       1  2  3  4  5  6  7  8
 core                 o  o           o  
-acc                  I  I           I  I
-auth                 o  o           o  o
-auth_db              o  o           o  o
-auth_radius          I  I           I  I
-cpl             P    o  o           o  o
-cpl-c           D    I  I           I  I
-dbtext               o  o           o  o
-domain               o  o           o  o
-enum                 o  o           o  o
-exec                 o  o           o  o
-ext                  o  o           o  o
-extcmd               o  o           o  o
-group                o  o           o  o
-group_radius         I  I           I  I
-jabber               o  o           Wm W
-mangler              o  o           W  o
-maxfwd               o  o           o  o
-msilo                o  o           o  o
-mysql                o  o           o  o
-nathelper            o  o           o  o
-pa                   o  o           o  o
-pdt                  o  o           o  o
-persmissions         o  o           o  o
-pike                 o  o           o  o
-postgress            I  I           I  I
-print                o  o           o  o
-registrar            o  o           o  o
-rr                   o  o           o  o
-sl                   o  o           o  o
-sms                  o  o           o  o
-snmp      D          I  I           I  I
-textops              o  o           o  o
-tm                   o  o           o  o
-uri                  o  o           o  o
-uri_radius           I  I           I  I
-usrloc               o  o           o  W
-vm                   o  o           o  o
+acc                o I  I           I  I
+auth               o o  o           o  o
+auth_db            o o  o           o  o
+auth_radius        o I  I           I  I
+cpl             P  o o  o           o  o
+cpl-c           D  I I  I           I  I
+dbtext             o o  o           o  o
+domain             o o  o           o  o
+enum               o o  o           o  o
+exec               o o  o           o  o
+ext                o o  o           o  o
+extcmd             W o  o           o  o
+group              o o  o           o  o
+group_radius       W I  I           I  I
+jabber             o o  o           Wm W
+mangler            o o  o           W  o
+maxfwd             o o  o           o  o
+msilo              o o  o           o  o
+mysql              o o  o           o  o
+nathelper          o o  o           o  o
+pa                 o o  o           o  o
+pdt                o o  o           o  o
+persmissions       o o  o           o  o
+pike               o o  o           o  o
+postgress          I I  I           I  I
+print              o o  o           o  o
+registrar          o o  o           o  o
+rr                 o o  o           o  o
+sl                 o o  o           o  o
+sms                o o  o           o  o
+snmp      D        I I  I           I  I
+textops            o o  o           o  o
+tm                 o o  o           o  o
+uri                o o  o           o  o
+uri_radius         o I  I           I  I
+usrloc             o o  o           o  W
+vm                 o o  o           o  o