Hi

Two configure fixes for master.

- Lauri
>From dc7d5c94f20e2950fa23c9064cf8bce3abf78d5c Mon Sep 17 00:00:00 2001
From: Lauri Kasanen <[email protected]>
Date: Sun, 20 Jan 2013 19:20:13 +0200
Subject: [PATCH] configure: Fix a typo (CLFLAGS) and make sure the -O logic 
always sets the visibility


Signed-off-by: Lauri Kasanen <[email protected]>
---
 configure |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 320a3e0..bbef273 100755
--- a/configure
+++ b/configure
@@ -1065,9 +1065,12 @@ fi
 
 [ -n "$relaxed_plugins" ] && DEFS="$DEFS -DRELAXED_PLUGINS"
 
-CLFLAGS_GEN=" -std=gnu99 -Wall -Wextra"
+CFLAGS_GEN=" -std=gnu99 -Wall -Wextra"
 if test -z "$debug" ; then
-    echo "$CFLAGS" | grep -q -e -O || CFLAGS="$CFLAGS $CFLAGS_GEN -O2 
-fvisibility=hidden"
+    CFLAGS="$CFLAGS $CFLAGS_GEN -fvisibility=hidden"
+
+    # Only set -O2 if the user didn't include an -O level
+    echo "$CFLAGS" | grep -q -e -O || CFLAGS="$CFLAGS -O2"
 else
     DEFS="-DDEBUG -DSAFE_FREE"
     CFLAGS="$CFLAGS $CFLAGS_GEN -g -rdynamic"
-- 
1.7.2.1

_______________________________________________
Monkey mailing list
[email protected]
http://lists.monkey-project.com/listinfo/monkey

Reply via email to