X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=aff404e65cfdebbc8c4ecb8223c79f4255b2d8be;hb=bffba75d25150a0c08f37c759bad82ee90cf00f1;hp=9fe9650de22513f30ed1ff9f0fd789c3a8a70b09;hpb=cd612835f820c526eca1aa5e00c29ee08ff19c8e;p=awesomized%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index 9fe9650d..aff404e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,21 +1,21 @@
-AC_INIT([libmemcached],[0.29],[http://tangent.org/552/libmemcached.html])
-AC_CONFIG_SRCDIR([clients/memcat.c])
+# libmemcached
+# Copyright (C) 2008 Brian Aker, Monty Taylor
+# All rights reserved.
+#
+# Use and distribution licensed under the BSD license.  See
+# the COPYING file in this directory for full text.
+
+AC_PREREQ(2.59)
+AC_INIT([libmemcached],[0.32],[http://tangent.org/552/libmemcached.html])
+AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER(libmemcached/libmemcached_config.h)
+AM_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
-# Setting CFLAGS here prevents AC_CANONICAL_TARGET from injecting them
-SAVE_CFLAGS=${CFLAGS}
-SAVE_CXXFLAGS=${CXXFLAGS}
-CFLAGS=
-CXXFLAGS=
-
-AC_CANONICAL_TARGET
-
-CFLAGS=${SAVE_CFLAGS}
-CXXFLAGS=${SAVE_CXXFLAGS}
+PANDORA_CANONICAL_TARGET
 
 #shared library versioning
-MEMCACHED_LIBRARY_VERSION=2:0:0
+MEMCACHED_LIBRARY_VERSION=3:0:0
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |
@@ -29,17 +29,8 @@ MEMCACHED_LIBRARY_VERSION=2:0:0
 AC_SUBST(MEMCACHED_LIBRARY_VERSION)
 MEMCACHEDUTIL_LIBRARY_VERSION=0:0:0
 AC_SUBST(MEMCACHEDUTIL_LIBRARY_VERSION)
-
-AM_INIT_AUTOMAKE(nostdinc no-define -Wall -Werror)
-AC_USE_SYSTEM_EXTENSIONS
-
-AC_PROG_CC
-AC_PROG_CC_C99
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-AM_SANITY_CHECK
-
-AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+MEMCACHEDPROTOCOL_LIBRARY_VERSION=0:0:0
+AC_SUBST(MEMCACHEDPROTOCOL_LIBRARY_VERSION)
 
 
 # libmemcached versioning when linked with GNU ld.
@@ -47,13 +38,23 @@ if test "$lt_cv_prog_gnu_ld" = "yes"
 then
     LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcached/libmemcached.ver"
     LD_UTIL_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcachedutil/libmemcachedutil.ver"
+    LD_PROTOCOL_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcached/protocol/libmemcachedprotocol.ver"
 fi
 AC_SUBST(LD_VERSION_SCRIPT)
 AC_SUBST(LD_UTIL_VERSION_SCRIPT)
+AC_SUBST(LD_PROTOCOL_VERSION_SCRIPT)
+
+
+#--------------------------------------------------------------------
+# Check for libpthread
+#--------------------------------------------------------------------
+
+ACX_PTHREAD(,AC_MSG_ERROR(could not find libpthread))
+LIBS="${PTHREAD_LIBS} ${LIBS}"
+CFLAGS="${PTHREAD_CFLAGS} ${CFLAGS}"
+CC="$PTHREAD_CC"
+
 
-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)
@@ -68,98 +69,50 @@ AC_LINK_IFELSE(
       float f= floorf((float) 1.0);
     ]],
     [LIBM="-lm"],[LIBM=""])])
-    
+
 AC_SUBST(LIBM)
 LIBS="$save_LIBS"
-AC_SEARCH_LIBS(floorf, m)
-
-
-sinclude(m4/pod2man.m4)
-sinclude(m4/debug.m4)
-sinclude(m4/dtrace.m4)
-sinclude(m4/byteorder.m4)
-sinclude(m4/64bit.m4)
-sinclude(m4/protocol_binary.m4)
-sinclude(m4/memcached.m4)
-sinclude(m4/setsockopt.m4)
-sinclude(m4/hsieh.m4)
-sinclude(m4/util.m4)
-
-dnl This is likely subverted by vpath builds. How do we find the original
-dnl source dir in the configure step of a vpath build?
-if test -d ".hg"
-then
-  building_from_hg=yes
-else
-  building_from_hg=no
-fi
 
+AC_SEARCH_LIBS(floorf, m)
 
-# We only support GCC and Sun's forte at the moment
-if test "$GCC" = "yes"
-then
-  if test "$ENABLE_DEBUG" = "yes"
-  then
-    CFLAGS="-O0 -DHAVE_DEBUG $CFLAGS"
-    CXXFLAGS="-O0 -DHAVE_DEBUG $CXXFLAGS"
-  else
-    CFLAGS="-O3 $CFLAGS"
-    CXXFLAGS="-O3 $CXXFLAGS"
-  fi
-  if test "$building_from_hg" = "yes"
-  then
-    CFLAGS="-Werror $CFLAGS"
-    CXXFLAGS="-Werror $CXXFLAGS"
-  fi
-
-  CFLAGS="-W -std=iso9899:1999 -Wall -Wextra -Wno-strict-aliasing -pedantic -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -ggdb3 $CFLAGS"
-  CXXFLAGS="-W -Wall -Wextra -Wno-strict-aliasing -pedantic -Wundef -Woverloaded-virtual  -Wnon-virtual-dtor -Wctor-dtor-privacy -Wold-style-cast -Weffc++ -Wconversion -Wmissing-declarations -Wredundant-decls -ggdb3 $CXXFLAGS"
-
-
-fi
-
-if test "$SUNCC" = "yes"
-then
-
-  if test "$ENABLE_DEBUG" = "yes"
-  then
-    CFLAGS="-xO0 -DHAVE_DEBUG $CFLAGS"
-    CXXFLAGS="-xO0 -DHAVE_DEBUG $CXXFLAGS"
-  else
-    CFLAGS="-xO4 -xlibmil -xdepend $CFLAGS"
-    CXXFLAGS="-xO4 -xlibmil -xdepend $CXXFLAGS"
-  fi
-  if test "$building_from_hg" = "yes"
-  then
-    CFLAGS="-errwarn $CFLAGS"
-    CXXFLAGS="-errwarn $CXXFLAGS"
-  fi
-  CFLAGS="-Xa -xstrconst -mt -errfmt=error -errshort=tags ${CFLAGS}"
-  CXXFLAGS="+w +w2 -xwe -mt ${CXXFLAGS}"
-fi
+dnl Specialty checks
+DETECT_BYTEORDER
+ENABLE_UTILLIB
+SETSOCKOPT_SANITY
+ENABLE_HSIEH_HASH
+REQUIRE_POD2MAN
+PROTOCOL_BINARY_TEST
+WITH_MEMCACHED
+ENABLE_DEPRECATED
+PANDORA_HAVE_LIBINNODB
+
+AC_CONFIG_FILES([
+  Makefile
+  clients/Makefile
+  tests/Makefile
+  docs/Makefile
+  example/Makefile
+  libmemcached/Makefile
+  libmemcached/memcached_configure.h
+  libmemcachedutil/Makefile
+  libmemcached/protocol/Makefile
+  support/Makefile
+  support/libmemcached.pc
+  support/libmemcached.spec
+  support/libmemcached-fc.spec
+  ])
+AC_OUTPUT
 
+echo "---"
+echo "Configuration summary for $PACKAGE_NAME version $VERSION"
+echo ""
+echo "   * Installation prefix:       $prefix"
+echo "   * System type:               $host_vendor-$host_os"
+echo "   * Host CPU:                  $host_cpu"
+echo "   * C Compiler:                $CC_VERSION"
+echo "   * Assertions enabled:        $ac_cv_assert"
+echo "   * Debug enabled:             $with_debug"
+echo "   * Warnings as failure:       $ac_cv_warnings_as_errors"
+echo ""
+echo "---"
 
-AM_CPPFLAGS="-I\$(top_srcdir) -I\$(top_builddir) ${CPPFLAGS}"
-AM_CFLAGS="${CFLAGS}"
-AM_CXXFLAGS="${CXXFLAGS}"
-
-AC_SUBST([AM_CPPFLAGS])
-AC_SUBST([AM_CFLAGS])
-AC_SUBST([AM_CXXFLAGS])
-
-dnl We've collected the flags in AM_*FLAGS now, so blank these.
-CFLAGS=""
-CXXFLAGS=""
-CPPFLAGS=""
-
-AC_CONFIG_FILES([Makefile dnl
-  clients/Makefile dnl
-  tests/Makefile dnl
-  docs/Makefile dnl
-  libmemcached/Makefile dnl
-  libmemcachedutil/Makefile dnl
-  support/Makefile dnl
-  support/libmemcached.pc dnl
-  support/libmemcached.spec dnl
-  support/libmemcached-fc.spec])
-AC_OUTPUT