[sword-svn] r1868 - in trunk: . bindings/corba/orbitcpp

[scribe at crosswire.org]

Author: scribe
Date: 2005-11-28 12:13:54 -0700 (Mon, 28 Nov 2005)
New Revision: 1868

Modified:
   trunk/bindings/corba/orbitcpp/Makefile
   trunk/configure.ac
   trunk/usrinst.sh
Log:
can't figure out how to make debug have -g -O0, and non-debug to have -O3.


Modified: trunk/bindings/corba/orbitcpp/Makefile
===================================================================
--- trunk/bindings/corba/orbitcpp/Makefile	2005-11-28 07:14:10 UTC (rev 1867)
+++ trunk/bindings/corba/orbitcpp/Makefile	2005-11-28 19:13:54 UTC (rev 1868)
@@ -11,9 +11,9 @@
 CFLAGS += `pkg-config --cflags sword`
 
 #comment out for release
-CXXFLAGS += -g -O0
-CFLAGS += -g -O0
-LDFLAGS += -g -O0
+#CXXFLAGS += -g -O0
+#CFLAGS += -g -O0
+#LDFLAGS += -g -O0
 #----------------------------------
 
 server: swordorb-common.o server.cpp swordorb-impl.o swordorb-cpp.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-cpp-skels.o swordorb-skels.o swordorb-cpp.o

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-11-28 07:14:10 UTC (rev 1867)
+++ trunk/configure.ac	2005-11-28 19:13:54 UTC (rev 1868)
@@ -144,7 +144,7 @@
 if test x$enable_debug = xyes; then
   GCJFLAGS="-g -O0"
   if test x$ac_cv_prog_cc_g = xyes; then
-    SM_CFLAGS="-g3 -O0"
+    AM_CFLAGS="-g3 -O0"
   else
     AM_CFLAGS="-O0"
   fi
@@ -153,6 +153,9 @@
   else
     AM_CXXFLAGS="-O0"
   fi
+else
+  AM_CFLAGS="-O3"
+  AM_CXXFLAGS="-O3"
 #  AM_CFLAGS="$AM_CFLAGS -Werror"
 #  AM_CXXFLAGS="$AM_CXXFLAGS -Werror"
 fi

Modified: trunk/usrinst.sh
===================================================================
--- trunk/usrinst.sh	2005-11-28 07:14:10 UTC (rev 1867)
+++ trunk/usrinst.sh	2005-11-28 19:13:54 UTC (rev 1868)
@@ -6,7 +6,7 @@
 OPTIONS="--sysconfdir=/etc $OPTIONS"
 OPTIONS="--with-icu $OPTIONS"
 #OPTIONS="--with-vcl $OPTIONS"
-OPTIONS="--enable-debug $OPTIONS"
+#OPTIONS="--enable-debug $OPTIONS"
 #OPTIONS="--enable-profile $OPTIONS"
 OPTIONS="--with-lucene $OPTIONS"
 #OPTIONS="--without-curl $OPTIONS"