projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Remove dead pandora files.
[awesomized/libmemcached]
/
m4
/
pandora_optimize.m4
diff --git
a/m4/pandora_optimize.m4
b/m4/pandora_optimize.m4
index 17b636bfd09a144ba67ed5a5700894031c04e5e1..dcee0648e4bce1d094a8bffd3763593e8f14cfb0 100644
(file)
--- a/
m4/pandora_optimize.m4
+++ b/
m4/pandora_optimize.m4
@@
-1,5
+1,5
@@
-dnl Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+dnl Copyright (C) 2009 Sun Microsystems
, Inc.
+dnl This file is free software; Sun Microsystems
, Inc.
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@
-18,29
+18,21
@@
AC_DEFUN([PANDORA_OPTIMIZE],[
;;
esac
;;
esac
- dnl Once we can use a modern autoconf, we can replace the std=gnu99 here
- dnl with using AC_CC_STD_C99 above
- CC="${CC} -std=gnu99"
-
- AM_CPPFLAGS="-ggdb3 ${AM_CPPFLAGS}"
+ AM_CPPFLAGS="-ggdb ${AM_CPPFLAGS}"
DEBUG_CFLAGS="-O0"
DEBUG_CXXFLAGS="-O0"
DEBUG_CFLAGS="-O0"
DEBUG_CXXFLAGS="-O0"
- OPTIMIZE_CFLAGS="-O
3
"
- OPTIMIZE_CXXFLAGS="-O
3
"
+ OPTIMIZE_CFLAGS="-O
2
"
+ OPTIMIZE_CXXFLAGS="-O
2
"
])
AS_IF([test "$INTELCC" = "yes"],[
])
AS_IF([test "$INTELCC" = "yes"],[
- dnl Once we can use a modern autoconf, we can replace the std=gnu99 here
- dnl with using AC_CC_STD_C99 above
- CC="${CC} -std=c99"
-
AM_CPPFLAGS="-g ${AM_CPPFLAGS}"
DEBUG_CFLAGS="-O0"
DEBUG_CXXFLAGS="-O0"
AM_CPPFLAGS="-g ${AM_CPPFLAGS}"
DEBUG_CFLAGS="-O0"
DEBUG_CXXFLAGS="-O0"
- OPTIMIZE_CFLAGS="-xHOST -O
3
-no-prec-div -static"
+ OPTIMIZE_CFLAGS="-xHOST -O
2
-no-prec-div -static"
OPTIMIZE_CXXFLAGS="${OPTIMIZE_CFLAGS}"
])
OPTIMIZE_CXXFLAGS="${OPTIMIZE_CFLAGS}"
])
@@
-51,7
+43,7
@@
AC_DEFUN([PANDORA_OPTIMIZE],[
CXX="${CXX} -xlang=c99"
AM_CFLAGS="-g -mt -xstrconst -Xa ${AM_CFLAGS}"
CXX="${CXX} -xlang=c99"
AM_CFLAGS="-g -mt -xstrconst -Xa ${AM_CFLAGS}"
- AM_CXXFLAGS="-mt -compat=5 -library=stlport4 -template=no%extdef ${AM_CXXFLAGS}"
+ AM_CXXFLAGS="-mt -compat=5 -library=stlport4 -
library=Crun -
template=no%extdef ${AM_CXXFLAGS}"
DEBUG_CXXFLAGS="-g"
DEBUG_CXXFLAGS="-g"
@@
-71,9
+63,11
@@
AC_DEFUN([PANDORA_OPTIMIZE],[
# Debugging. No optimization.
AM_CFLAGS="${AM_CFLAGS} ${DEBUG_CFLAGS} -DDEBUG"
AM_CXXFLAGS="${AM_CXXFLAGS} ${DEBUG_CXXFLAGS} -DDEBUG"
# Debugging. No optimization.
AM_CFLAGS="${AM_CFLAGS} ${DEBUG_CFLAGS} -DDEBUG"
AM_CXXFLAGS="${AM_CXXFLAGS} ${DEBUG_CXXFLAGS} -DDEBUG"
+ AC_DEFINE(DEBUG, [ 1 ], [Define to 1 to enable debugging code.])
],[
# Optimized version. No debug
AM_CFLAGS="${AM_CFLAGS} ${OPTIMIZE_CFLAGS}"
AM_CXXFLAGS="${AM_CXXFLAGS} ${OPTIMIZE_CXXFLAGS}"
],[
# Optimized version. No debug
AM_CFLAGS="${AM_CFLAGS} ${OPTIMIZE_CFLAGS}"
AM_CXXFLAGS="${AM_CXXFLAGS} ${OPTIMIZE_CXXFLAGS}"
+ AC_DEFINE(DEBUG, [ 0 ], [Define to 1 to enable debugging code.])
])
])
])
])