Automerge.

This commit is contained in:
Alexey Kopytov 2009-06-26 17:59:43 +04:00
commit b21f60fb23

View File

@ -1756,7 +1756,7 @@ esac
# Build optimized or debug version ? # Build optimized or debug version ?
# First check for gcc and g++ # First check for gcc and g++
if test "$ac_cv_prog_gcc" = "yes" if test "$GCC" = "yes"
then then
DEBUG_CFLAGS="-g" DEBUG_CFLAGS="-g"
DEBUG_OPTIMIZE_CC="-O" DEBUG_OPTIMIZE_CC="-O"
@ -1764,9 +1764,16 @@ then
else else
DEBUG_CFLAGS="-g" DEBUG_CFLAGS="-g"
DEBUG_OPTIMIZE_CC="" DEBUG_OPTIMIZE_CC=""
OPTIMIZE_CFLAGS="-O" case $SYSTEM_TYPE in
*solaris*)
OPTIMIZE_CFLAGS="-O1"
;;
*)
OPTIMIZE_CFLAGS="-O"
;;
esac
fi fi
if test "$ac_cv_prog_cxx_g" = "yes" if test "$GXX" = "yes"
then then
DEBUG_CXXFLAGS="-g" DEBUG_CXXFLAGS="-g"
DEBUG_OPTIMIZE_CXX="-O" DEBUG_OPTIMIZE_CXX="-O"
@ -1774,7 +1781,14 @@ then
else else
DEBUG_CXXFLAGS="-g" DEBUG_CXXFLAGS="-g"
DEBUG_OPTIMIZE_CXX="" DEBUG_OPTIMIZE_CXX=""
OPTIMIZE_CXXFLAGS="-O" case $SYSTEM_TYPE in
*solaris*)
OPTIMIZE_CXXFLAGS="-O1"
;;
*)
OPTIMIZE_CXXFLAGS="-O"
;;
esac
fi fi
if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then