X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=86700a5e027ab569d8a84ce9f7d722635d2d302c;hb=3f51531eb36bb7bbc485fb7cb9d22752ab19eff5;hp=27171ab38501e37030df3522ee72894a76eb81bf;hpb=35ea8bcfbe3002ad02773a2398b3683a63654d17;p=awesomized%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index 27171ab3..86700a5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# Gearman server and library
+# libmemcached 
 # Copyright (C) 2008 Brian Aker
 # All rights reserved.
 #
@@ -10,6 +10,7 @@ AC_INIT([libmemcached],[0.30],[http://tangent.org/552/libmemcached.html])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(libmemcached/libmemcached_config.h)
+AC_CONFIG_MACRO_DIR([m4])
 
 #shared library versioning
 MEMCACHED_LIBRARY_VERSION=2:0:0
@@ -54,7 +55,6 @@ fi
 
 AC_PROG_CC
 AC_PROG_CC_C99
-AM_PROG_CC_STDC
 AC_PROG_CXX
 
 ACX_USE_SYSTEM_EXTENSIONS
@@ -117,9 +117,9 @@ fi
 if test "x$SUNCC" = "xyes"
 then
   CFLAGS="-g -mt ${CFLAGS}"
-  CXXFLAGS="-g -mt -xlang=c99 ${CXXFLAGS}"
+  CXXFLAGS="-xlang=c99 -g -mt -compat=5 -library=stlport4 -template=no%extdef ${CXXFLAGS}"
 
-  OPTIMIZE_FLAGS="-xO4 -xlibmil -xdepend -xbuiltin -lmopt"
+  OPTIMIZE_FLAGS="-xO4 -xlibmil -xdepend -xbuiltin"
   OPTIMIZE_CFLAGS="${OPTIMIZE_FLAGS} -Xa -xstrconst"
   OPTIMIZE_CXXFLAGS="${OPTIMIZE_FLAGS}"
 
@@ -193,9 +193,11 @@ if test "$with_debug" = "yes"
 then
   # Debugging. No optimization.
   CFLAGS="${DEBUG_CFLAGS} -DDEBUG ${CFLAGS}"
+  CXXFLAGS="${DEBUG_CXXFLAGS} -DDEBUG ${CXXFLAGS}"
 else
   # Optimized version. No debug
   CFLAGS="${OPTIMIZE_CFLAGS} ${CFLAGS}"
+  CXXFLAGS="${OPTIMIZE_CXXFLAGS} ${CXXFLAGS}"
 fi
 
 AC_ARG_ENABLE([profiling],
@@ -210,9 +212,6 @@ AC_ARG_ENABLE([coverage],
     [ac_coverage="$enableval"],
     [ac_coverage="no"])
 
-dnl We can't do this warning, so turn off
-W_STRICT_ALIASING="-Wno-strict-aliasing"
-
 if test "$GCC" = "yes"
 then
 
@@ -231,7 +230,6 @@ then
           F_DIAGNOSTICS_SHOW_OPTION="-fdiagnostics-show-option"
         ])
 
-
   AC_CACHE_CHECK([whether it is safe to use -Wconversion],
     [ac_cv_safe_to_use_wconversion_],
     [save_CFLAGS="$CFLAGS"
@@ -249,6 +247,7 @@ foo(0);
        [ac_cv_safe_to_use_wconversion_=yes],
        [ac_cv_safe_to_use_wconversion_=no])
      CFLAGS="$save_CFLAGS"])
+
   AS_IF([test "$ac_cv_safe_to_use_wconversion_" = "yes"],
     [W_CONVERSION="-Wconversion"
     AC_CACHE_CHECK([whether it is safe to use -Wconversion with htons],
@@ -284,9 +283,8 @@ uint16_t x= htons(80);
         [W_FAIL="-Werror"])
 
   BASE_WARNINGS="-pedantic -W -Wall -Wextra ${W_FAIL} -Wundef -Wshadow -Wmissing-declarations ${W_STRICT_ALIASING} ${F_DIAGNOSTICS_SHOW_OPTION} ${W_CONVERSION}"
-  CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wswitch-default -Wswitch-enum -Wcast-align -Wconversion"
-  CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual  -Wnon-virtual-dtor -Wctor-dtor-privacy  -Wold-style-cast -Weffc++ -Wno-long-long -Wconversion"
-
+  CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wswitch-default -Wswitch-enum -Wcast-align"
+  CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wold-style-cast -Weffc++ -Wno-long-long"
 
   AC_CACHE_CHECK([whether it is safe to use -Wlogical-op],
     [ac_cv_safe_to_use_Wlogical_op_],