automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@23703 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index ca3b8455dc211e102d0783e15c635cd26de0e097..0c210eb701bfce7c1f7b22efbbd8ae33cc18f3e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -437,10 +437,10 @@ endif
 noclean: depend asterisk subdirs
 
 editline/config.h:
-       cd editline && unset CFLAGS LIBS && ./configure ; \
+       cd editline && unset CFLAGS LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
 
 editline/libedit.a: FORCE
-       cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
+       cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
        $(MAKE) -C editline libedit.a
 
 db1-ast/libdb1.a: FORCE

diff --git a/cdr/Makefile b/cdr/Makefile
index 3cd83f492085fcd9b8ec1f445ebeaf610808ba39..bca0165c5a8ba78a94862c4cd5746fd38e409475 100644 (file)
--- a/cdr/Makefile
+++ b/cdr/Makefile
@@ -32,7 +32,7 @@ endif
 #the default as we now have a better instruction set to work with. - Belgarath
 ifeq ($(PROC),sparc64)
  PROC=ultrasparc
-  CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+  CFLAGS += -mtune=$(PROC) -pipe -fomit-frame-pointer -mcpu=v8
 endif
 
 #

diff --git a/channels/Makefile b/channels/Makefile
index 349343f5a51388b9b6d950683044d6ea83819a05..10ff8c1284a1d90e1d6aae2a265d3820e4dbe2af 100644 (file)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -44,7 +44,7 @@ endif
 
 ifeq ($(PROC),sparc64)
   PROC=ultrasparc
-  CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+  CFLAGS += -mtune=$(PROC) -pipe -fomit-frame-pointer -mcpu=v8
 endif
 
 ifeq (${OSARCH},FreeBSD)

diff --git a/db1-ast/Makefile b/db1-ast/Makefile
index 0aa9fdb0241806c62dc5f9ec24bd8bc85b2bf121..87ced1a486203aa34debea0ae36ef22bdf011d1e 100644 (file)
--- a/db1-ast/Makefile
+++ b/db1-ast/Makefile
@@ -10,7 +10,7 @@ endif
 #Added support for UltraSparc - Belgarath
 ifeq ($(ARCH),sparc64)
 PROC=ultrasparc
-CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+CFLAGS += -mtune=$(PROC) -pipe -fomit-frame-pointer -mcpu=v8
 endif
 
 LIBDBSO=libdb.so.$(SOVER)

diff --git a/editline/configure b/editline/configure
index 7265fe0200464bf2225c4ba58b5f780d1b19d48f..8f9075c5f9503cce72e516185c95b97f456f202a 100755 (executable)
--- a/editline/configure
+++ b/editline/configure
@@ -1923,8 +1923,6 @@ fi
 if test "x$enable_debug" = "xyes" ; then
   CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG"
   CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE"
-else
-  CFLAGS="$CFLAGS -O"
 fi