From: Automerge script <automerge@asterisk.org>
Date: Sun, 30 Apr 2006 15:05:31 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.8-netsec~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e0ea8da279a6a41b5295ef063e07187c8bdf365;p=thirdparty%2Fasterisk.git

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 ca3b8455dc..0c210eb701 100644
--- 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 3cd83f4920..bca0165c5a 100644
--- 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 349343f5a5..10ff8c1284 100644
--- 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 0aa9fdb024..87ced1a486 100644
--- 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 7265fe0200..8f9075c5f9 100755
--- 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