projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Handling merge
[awesomized/libmemcached]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 203f7e91e59f9becb562e2f16647c369cbaa79c3..d0c871c81b3396a28d77d3ec40457a0a1f97e54b 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,12
+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
MEMCACHED_LIBRARY_NAME=libmemcached
#release versioning
MEMCACHED_MAJOR_VERSION=0
MEMCACHED_LIBRARY_NAME=libmemcached
#release versioning
MEMCACHED_MAJOR_VERSION=0
-MEMCACHED_MINOR_VERSION=
9
+MEMCACHED_MINOR_VERSION=
22
MEMCACHED_MICRO_VERSION=0
#API version
MEMCACHED_MICRO_VERSION=0
#API version
@@
-14,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=
1:1
:0
+MEMCACHED_LIBRARY_VERSION=
2:0
:0
# | | |
# +------+ | +---+
# | | |
# | | |
# +------+ | +---+
# | | |
@@
-50,23
+51,27
@@
AC_LANG_CPLUSPLUS
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)
# We only support GCC and Sun's forte at the moment
if test "$GCC" = "yes"
then
if test "$ENABLE_DEBUG" = "yes"
then
# We only support GCC and Sun's forte at the moment
if test "$GCC" = "yes"
then
if test "$ENABLE_DEBUG" = "yes"
then
- CFLAGS="-Wall -ggdb -D
HAVE_DEBUG
"
+ CFLAGS="-Wall -ggdb -D
MEMCACHED_INTERNAL -DHAVE_DEBUG $CFLAGS
"
else
else
- CFLAGS="-Wall -O3"
+ CFLAGS="-Wall -O3
-DMEMCACHED_INTERNAL $CFLAGS
"
fi
else
fi
else
- CFLAGS="-Xa -xstrconst -mt -D_FORTEC_
-fast -m64
"
- LDFLAGS="-lsocket -lnsl"
- DTRACEFLAGS="
-64
"
+ CFLAGS="-Xa -xstrconst -mt -D_FORTEC_
$CFLAGS
"
+ LDFLAGS="-lsocket -lnsl
$LDFLAGS
"
+ DTRACEFLAGS="
$DTRACEFLAGS
"
fi
AC_C_CONST
fi
AC_C_CONST
+AC_HEADER_TIME
AC_TYPE_SIZE_T
AC_TYPE_SIZE_T
-AC_
CHECK_HEADERS(limits.h syslimits.h
)
-AC_OUTPUT(Makefile
src/Makefile tests/Makefile docs/Makefile lib/Makefile include
/Makefile support/Makefile support/libmemcached.pc support/libmemcached.spec)
+AC_
SEARCH_LIBS(getopt_long, gnugetopt
)
+AC_OUTPUT(Makefile
clients/Makefile tests/Makefile docs/Makefile libmemcached
/Makefile support/Makefile support/libmemcached.pc support/libmemcached.spec)