[asterisk-commits] kpfleming: branch markster/usersconf r40860 - in /team/markster/usersconf: ./...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue Aug 22 15:20:31 MST 2006 

Author: kpfleming
Date: Tue Aug 22 17:20:31 2006
New Revision: 40860

URL: http://svn.digium.com/view/asterisk?rev=40860&view=rev
Log:
Merged revisions 40812,40815,40818-40820,40826,40832-40833,40837,40853-40854 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r40812 | file | 2006-08-21 20:01:39 -0500 (Mon, 21 Aug 2006) | 2 lines

Fix up the props a bit

................
r40815 | file | 2006-08-21 20:57:40 -0500 (Mon, 21 Aug 2006) | 2 lines

Sorry, but this does not resemble malloc... so GCC was ignoring the attribute and throwing a warning.

................
r40818 | file | 2006-08-21 21:15:34 -0500 (Mon, 21 Aug 2006) | 2 lines

Make doxygen work with the new location of files that now reside in main

................
r40819 | file | 2006-08-21 21:24:46 -0500 (Mon, 21 Aug 2006) | 2 lines

Make a warning about an unused function & variable go away on the stand alone AEL build.

................
r40820 | file | 2006-08-21 21:30:38 -0500 (Mon, 21 Aug 2006) | 2 lines

Another compile time warning bites the dust

................
r40826 | tilghman | 2006-08-21 22:01:49 -0500 (Mon, 21 Aug 2006) | 9 lines

Blocked revisions 40821 via svnmerge

........
r40821 | tilghman | 2006-08-21 21:59:37 -0500 (Mon, 21 Aug 2006) | 2 lines

Bug 7779 - Using initstate(3) means that we cannot unload this module once loaded.

........

................
r40832 | qwell | 2006-08-22 00:24:50 -0500 (Tue, 22 Aug 2006) | 2 lines

a couple Solaris tweaks, to help build properly.

................
r40833 | qwell | 2006-08-22 00:34:44 -0500 (Tue, 22 Aug 2006) | 4 lines

Solaris didn't like this.

Let's just go ahead and make this match every other uintXX_t in Asterisk.

................
r40837 | kpfleming | 2006-08-22 11:32:41 -0500 (Tue, 22 Aug 2006) | 2 lines

remove requirement for libtasn1, which appears to be a Debian thing

................
r40853 | kpfleming | 2006-08-22 16:45:15 -0500 (Tue, 22 Aug 2006) | 2 lines

add a new include file for out-of-tree modules that need to know where things are located

................
r40854 | kpfleming | 2006-08-22 16:57:16 -0500 (Tue, 22 Aug 2006) | 2 lines

when loadable modules are disabled, if someone tries to load a module that does not exist, don't dereference a NULL pointer, just stop trying to load it...

................

Added:
    team/markster/usersconf/include/asterisk/paths.h
      - copied unchanged from r40854, trunk/include/asterisk/paths.h
Modified:
    team/markster/usersconf/   (props changed)
    team/markster/usersconf/Makefile
    team/markster/usersconf/agi/Makefile
    team/markster/usersconf/build_tools/make_version
    team/markster/usersconf/configure
    team/markster/usersconf/configure.ac
    team/markster/usersconf/include/asterisk.h
    team/markster/usersconf/main/asterisk.c
    team/markster/usersconf/main/db1-ast/Makefile
    team/markster/usersconf/main/editline/Makefile.in
    team/markster/usersconf/main/loader.c

Propchange: team/markster/usersconf/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 22 17:20:31 2006
@@ -1,1 +1,1 @@
-/trunk:1-40803
+/trunk:1-40859

Modified: team/markster/usersconf/Makefile
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/Makefile?rev=40860&r1=40859&r2=40860&view=diff
==============================================================================
--- team/markster/usersconf/Makefile (original)
+++ team/markster/usersconf/Makefile Tue Aug 22 17:20:31 2006
@@ -177,7 +177,7 @@
 endif
 
 ifeq ($(OSARCH),SunOS)
-  ASTCFLAGS+=-Wcast-align -DSOLARIS -Iinclude/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
+  ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
 endif
 
 ASTERISKVERSION:=$(shell build_tools/make_version .)

Modified: team/markster/usersconf/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/agi/Makefile?rev=40860&r1=40859&r2=40860&view=diff
==============================================================================
--- team/markster/usersconf/agi/Makefile (original)
+++ team/markster/usersconf/agi/Makefile Tue Aug 22 17:20:31 2006
@@ -16,7 +16,7 @@
 AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
 
 ifeq ($(OSARCH),SunOS)
-  LIBS+=-lsocket -lnsl ../strcompat.o
+  LIBS+=-lsocket -lnsl ../main/strcompat.o
 endif
 
 include $(ASTTOPDIR)/Makefile.rules

Modified: team/markster/usersconf/build_tools/make_version
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/build_tools/make_version?rev=40860&r1=40859&r2=40860&view=diff
==============================================================================
--- team/markster/usersconf/build_tools/make_version (original)
+++ team/markster/usersconf/build_tools/make_version Tue Aug 22 17:20:31 2006
@@ -5,7 +5,7 @@
 elif [ -f ${1}/.svnrevision ]; then
 	echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision`
 elif [ -d .svn ]; then
-    PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :g'`
+    PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
     BRANCH=0
     TEAM=0
     

Modified: team/markster/usersconf/configure
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/configure?rev=40860&r1=40859&r2=40860&view=diff
==============================================================================
--- team/markster/usersconf/configure (original)
+++ team/markster/usersconf/configure Tue Aug 22 17:20:31 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 40722 .
+# From configure.ac Revision: 40790 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.60.
 #
@@ -16621,7 +16621,7 @@
 fi
 
    if test "${PBX_GNUTLS}" = 1; then
-      IKSEMEL_LIB="${IKSEMEL_LIB} -lgnutls -ltasn1 -lz -lgcrypt -lnsl -lgpg-error"
+      IKSEMEL_LIB="${IKSEMEL_LIB} -lgnutls -lz -lgcrypt -lnsl -lgpg-error"
    fi
 fi
 

Modified: team/markster/usersconf/configure.ac
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/configure.ac?rev=40860&r1=40859&r2=40860&view=diff
==============================================================================
--- team/markster/usersconf/configure.ac (original)
+++ team/markster/usersconf/configure.ac Tue Aug 22 17:20:31 2006
@@ -294,7 +294,7 @@
 if test "${PBX_IKSEMEL}" = 1; then
    AST_EXT_LIB_CHECK([GNUTLS], [gnutls], [gnutls_bye])
    if test "${PBX_GNUTLS}" = 1; then
-      IKSEMEL_LIB="${IKSEMEL_LIB} -lgnutls -ltasn1 -lz -lgcrypt -lnsl -lgpg-error"
+      IKSEMEL_LIB="${IKSEMEL_LIB} -lgnutls -lz -lgcrypt -lnsl -lgpg-error"
    fi
 fi
 

Modified: team/markster/usersconf/include/asterisk.h
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/include/asterisk.h?rev=40860&r1=40859&r2=40860&view=diff
==============================================================================
--- team/markster/usersconf/include/asterisk.h (original)
+++ team/markster/usersconf/include/asterisk.h Tue Aug 22 17:20:31 2006
@@ -22,7 +22,7 @@
 
 #include "asterisk/compat.h"
 
-#include <limits.h>
+#include "asterisk/paths.h"
 
 #define DEFAULT_LANGUAGE "en"
 

Modified: team/markster/usersconf/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/main/asterisk.c?rev=40860&r1=40859&r2=40860&view=diff
==============================================================================
--- team/markster/usersconf/main/asterisk.c (original)
+++ team/markster/usersconf/main/asterisk.c Tue Aug 22 17:20:31 2006
@@ -405,7 +405,7 @@
 #if defined(__FreeBSD__)
 #include <machine/cpufunc.h>
 #elif defined(linux)
-static __inline u_int64_t
+static __inline uint64_t
 rdtsc(void)
 { 
 	uint64_t rv;
@@ -415,7 +415,7 @@
 }
 #endif
 #else	/* supply a dummy function on other platforms */
-static __inline u_int64_t
+static __inline uint64_t
 rdtsc(void)
 {
 	return 0;

Modified: team/markster/usersconf/main/db1-ast/Makefile
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/main/db1-ast/Makefile?rev=40860&r1=40859&r2=40860&view=diff
==============================================================================
--- team/markster/usersconf/main/db1-ast/Makefile (original)
+++ team/markster/usersconf/main/db1-ast/Makefile Tue Aug 22 17:20:31 2006
@@ -54,7 +54,7 @@
 
 OSTYPE=$(shell uname -s)
 ifeq ($(OSTYPE),SunOS)
-CFLAGS+=-I../include -I../include/solaris-compat -DSOLARIS
+CFLAGS+=-I../../include -I../../include/solaris-compat -DSOLARIS
 endif
 
 db_dump185.o: db_dump185.c

Modified: team/markster/usersconf/main/editline/Makefile.in
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/main/editline/Makefile.in?rev=40860&r1=40859&r2=40860&view=diff
==============================================================================
--- team/markster/usersconf/main/editline/Makefile.in (original)
+++ team/markster/usersconf/main/editline/Makefile.in Tue Aug 22 17:20:31 2006
@@ -27,7 +27,7 @@
 PREFIX = @prefix@
 
 ifeq ($(OSTYPE),SunOS)
-CFLAGS+=-DSOLARIS -I../include/solaris-compat
+CFLAGS+=-DSOLARIS -I../../include/solaris-compat
 endif
 
 # .c files.

Modified: team/markster/usersconf/main/loader.c
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/main/loader.c?rev=40860&r1=40859&r2=40860&view=diff
==============================================================================
--- team/markster/usersconf/main/loader.c (original)
+++ team/markster/usersconf/main/loader.c Tue Aug 22 17:20:31 2006
@@ -587,6 +587,8 @@
 				return AST_MODULE_LOAD_SKIP;
 			}
 		}
+#else
+		return AST_MODULE_LOAD_DECLINE;
 #endif
 	}

More information about the asterisk-commits mailing list