projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Add support for AUTO_EJECT_HOST
[awesomized/libmemcached]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 0cf13db9b10c43fe71a84cd993e803eb910f5bd2..a84ae0718fbed9ad25488a94a64255172c233fd8 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,13
+1,13
@@
-AC_INIT(
src
/memcat.c)
+AC_INIT(
clients
/memcat.c)
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER(
include
/libmemcached_config.h)
+AM_CONFIG_HEADER(
libmemcached
/libmemcached_config.h)
AC_CANONICAL_SYSTEM
AC_CANONICAL_SYSTEM
-MEMCACHED_LIBRARY_NAME=libmemcached
+MEMCACHED_LIBRARY_NAME=libmemcached
#release versioning
MEMCACHED_MAJOR_VERSION=0
#release versioning
MEMCACHED_MAJOR_VERSION=0
-MEMCACHED_MINOR_VERSION=
13
+MEMCACHED_MINOR_VERSION=
28
MEMCACHED_MICRO_VERSION=0
#API version
MEMCACHED_MICRO_VERSION=0
#API version
@@
-15,7
+15,7
@@
MEMCACHED_API_VERSION=1.0
AC_SUBST(MEMCACHED_API_VERSION)
#shared library versioning
AC_SUBST(MEMCACHED_API_VERSION)
#shared library versioning
-MEMCACHED_LIBRARY_VERSION=2:
2:1
+MEMCACHED_LIBRARY_VERSION=2:
0:0
# | | |
# +------+ | +---+
# | | |
# | | |
# +------+ | +---+
# | | |
@@
-42,33
+42,50
@@
VERSION=$MEMCACHED_RELEASE
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
AC_PROG_CC
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
AC_PROG_CC
+AC_PROG_CC_C99
AC_PROG_CXX
AC_PROG_LIBTOOL
AM_SANITY_CHECK
LIBTOOL="$LIBTOOL --preserve-dup-deps"
AC_SUBST(LIBTOOL)dnl
AC_PROG_CXX
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)
sinclude(config/dtrace.m4)
sinclude(config/debug.m4)
sinclude(config/dtrace.m4)
+sinclude(config/byteorder.m4)
+sinclude(config/64bit.m4)
+sinclude(config/protocol_binary.m4)
+sinclude(config/memcached.m4)
+sinclude(config/setsockopt.m4)
+sinclude(config/hsieh.m4)
# We only support GCC and Sun's forte at the moment
if test "$GCC" = "yes"
then
# We only support GCC and Sun's forte at the moment
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"
+ CFLAGS="-Wall -O3 $CFLAGS"
+
if test "$ENABLE_DEBUG" = "yes"
then
if test "$ENABLE_DEBUG" = "yes"
then
- CFLAGS="-Wall -ggdb -DHAVE_DEBUG"
- else
- CFLAGS="-Wall -O3"
+ CFLAGS="$CFLAGS -ggdb -DHAVE_DEBUG"
fi
else
fi
else
- CFLAGS="-Xa -xstrconst -mt -D_FORTEC_ -fast -m64"
- LDFLAGS="-lsocket -lnsl"
- DTRACEFLAGS="-64"
+ 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
fi
fi
-AC_C_CONST
-AC_HEADER_TIME
-AC_TYPE_SIZE_T
-AC_SEARCH_LIBS(getopt_long, gnugetopt)
-AC_OUTPUT(Makefile src/Makefile tests/Makefile docs/Makefile lib/Makefile include/Makefile support/Makefile support/libmemcached.pc support/libmemcached.spec)
+LDFLAGS="-lm"
+
+AC_OUTPUT(Makefile clients/Makefile tests/Makefile docs/Makefile libmemcached/Makefile support/Makefile support/libmemcached.pc support/libmemcached.spec support/libmemcached-fc.spec)