X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=03f9f58cabac3bce9866aac54fa2a16c8e37b90c;hb=fa356c992dadfbd21eea474456d59dac4eba9495;hp=928f45b1b147ad8b6939b92d4cbfcf4e9cb227aa;hpb=7e65ab101b6bc4bb781edc4e4e82501fe04ab372;p=m6w6%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index 928f45b1..03f9f58c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ MEMCACHED_LIBRARY_NAME=libmemcached
 
 #release versioning
 MEMCACHED_MAJOR_VERSION=0
-MEMCACHED_MINOR_VERSION=25
+MEMCACHED_MINOR_VERSION=26
 MEMCACHED_MICRO_VERSION=0
 
 #API version
@@ -48,7 +48,13 @@ AC_PROG_LIBTOOL
 AM_SANITY_CHECK
 LIBTOOL="$LIBTOOL --preserve-dup-deps"
 AC_SUBST(LIBTOOL)dnl
-AC_LANG_CPLUSPLUS
+
+AC_C_CONST
+AC_HEADER_TIME
+AC_TYPE_SIZE_T
+AC_SEARCH_LIBS(getopt_long, gnugetopt)
+AC_SEARCH_LIBS(socket, socket)
+AC_SEARCH_LIBS(gethostbyname, nsl)
 
 sinclude(config/pod2man.m4)
 sinclude(config/debug.m4)
@@ -57,9 +63,9 @@ sinclude(config/byteorder.m4)
 sinclude(config/64bit.m4)
 sinclude(config/protocol_binary.m4)
 sinclude(config/memcached.m4)
+sinclude(config/setsockopt.m4)
 
 # We only support GCC and Sun's forte at the moment
-CFLAGS="-DMEMCACHED_INTERNAL $CFLAGS"
 if test "$GCC" = "yes"
 then
   #CFLAGS="-W -std=iso9899:1999 -Wall -Wextra -Wstrict-aliasing -pedantic -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -O3 $CFLAGS"
@@ -70,22 +76,15 @@ then
     CFLAGS="$CFLAGS -ggdb -DHAVE_DEBUG"
   fi
 else
-  CFLAGS="-Xa -xstrconst -mt -D_FORTEC_ $CFLAGS"
+  CFLAGS="-Xa -xstrconst -mt -D_FORTEC_ -errfmt=error -errwarn -errshort=tags $CFLAGS"
+  CXXFLAGS="+w +w2 -xwe -mt -D_FORTEC_ $CXXFLAGS"
   if test "$ENABLE_DEBUG" = "yes"
   then
     CFLAGS="$CFLAGS -DHAVE_DEBUG"
+    CXXFLAGS="$CXXFLAGS -DHAVE_DEBUG"
   fi
-  DTRACEFLAGS="$DTRACEFLAGS"
 fi
 
 LDFLAGS="-lm"
-AC_C_CONST
-AC_HEADER_TIME
-AC_TYPE_SIZE_T
-AC_SEARCH_LIBS(getopt_long, gnugetopt)
-AC_SEARCH_LIBS(socket, socket)
-AC_SEARCH_LIBS(gethostbyname, nsl)
-
-sinclude(config/setsockopt.m4)
 
 AC_OUTPUT(Makefile clients/Makefile tests/Makefile docs/Makefile libmemcached/Makefile support/Makefile support/libmemcached.pc support/libmemcached.spec)