Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: pandora-build

pandora-build (0.171.1-0ubuntu2) wily; urgency=medium * Drop quickly dependencies, it's about to be removed. (LP: #1494345) -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 15 Sep 2015 16:59:41 +0200 pandora-build (0.171.1-0ubuntu1) natty; urgency=low * New upstream release. -- Monty Taylor <mordred@inaugust.com> Mon, 27 Dec 2010 13:44:31 -0600

Modifications :
  1. Download patch m4/pandora_enable_dtrace.m4

    --- 0.98-1.1/m4/pandora_enable_dtrace.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_enable_dtrace.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,32 +8,49 @@ dnl Macro: PANDORA_ENABLE_DTRACE dnl --------------------------------------------------------------------------- AC_DEFUN([PANDORA_ENABLE_DTRACE],[ AC_ARG_ENABLE([dtrace], - [AS_HELP_STRING([--enable-dtrace], - [Build with support for the DTRACE. @<:@default=off@:>@])], - [ac_cv_enable_dtrace="yes"], - [ac_cv_enable_dtrace="no"]) + [AS_HELP_STRING([--disable-dtrace], + [Build with support for the DTRACE. @<:@default=on@:>@])], + [ac_cv_enable_dtrace="$enableval"], + [ac_cv_enable_dtrace="yes"]) AS_IF([test "$ac_cv_enable_dtrace" = "yes"],[ AC_CHECK_PROGS([DTRACE], [dtrace]) - AS_IF([test "x$ac_cv_prog_DTRACE" = "xdtrace"],[ - AC_DEFINE([HAVE_DTRACE], [1], [Enables DTRACE Support]) - AC_MSG_CHECKING([if dtrace should instrument object files]) - dnl DTrace on MacOSX does not use -G option - cat >conftest.d <<_ACEOF + AC_CHECK_HEADERS(sys/sdt.h) + + AS_IF([test "x$ac_cv_prog_DTRACE" = "xdtrace" -a "x${ac_cv_header_sys_sdt_h}" = "xyes"],[ + + AC_CACHE_CHECK([if dtrace works],[ac_cv_dtrace_works],[ + cat >conftest.d <<_ACEOF +provider Example { + probe increment(int); +}; +_ACEOF + $DTRACE -h -o conftest.h -s conftest.d 2>/dev/zero + AS_IF([test $? -eq 0],[ac_cv_dtrace_works=yes], + [ac_cv_dtrace_works=no]) + rm -f conftest.h conftest.d + ]) + AS_IF([test "x$ac_cv_dtrace_works" = "xyes"],[ + AC_DEFINE([HAVE_DTRACE], [1], [Enables DTRACE Support]) + ]) + AC_CACHE_CHECK([if dtrace should instrument object files], + [ac_cv_dtrace_needs_objects],[ + dnl DTrace on MacOSX does not use -G option + cat >conftest.d <<_ACEOF provider Example { probe increment(int); }; _ACEOF - $DTRACE -G -o conftest.d.o -s conftest.d 2>/dev/zero - AS_IF([test $? -eq 0],[ac_cv_dtrace_needs_objects=yes], + $DTRACE -G -o conftest.d.o -s conftest.d 2>/dev/zero + AS_IF([test $? -eq 0],[ac_cv_dtrace_needs_objects=yes], [ac_cv_dtrace_needs_objects=no]) - rm -f conftest.d.o conftest.d - AC_MSG_RESULT($ac_cv_dtrace_needs_objects) + rm -f conftest.d.o conftest.d + ]) AC_SUBST(DTRACEFLAGS) dnl TODO: test for -G on OSX ac_cv_have_dtrace=yes ])]) -AM_CONDITIONAL([HAVE_DTRACE], [test "x$ac_cv_have_dtrace" = "xyes"]) +AM_CONDITIONAL([HAVE_DTRACE], [test "x$ac_cv_dtrace_works" = "xyes"]) AM_CONDITIONAL([DTRACE_NEEDS_OBJECTS], [test "x$ac_cv_dtrace_needs_objects" = "xyes"])
  2. Download patch m4/pandora_header_stdcxx_98.m4

    --- 0.98-1.1/m4/pandora_header_stdcxx_98.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_header_stdcxx_98.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,83 @@ +# =========================================================================== +# http://autoconf-archive.cryp.to/ac_cxx_header_stdcxx_98.html +# =========================================================================== +# +# SYNOPSIS +# +# AC_CXX_HEADER_STDCXX_98 +# +# DESCRIPTION +# +# Check for complete library coverage of the C++1998/2003 standard. +# +# LICENSE +# +# Copyright (C) 2008 Benjamin Kosnik <bkoz@redhat.com> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + +AC_DEFUN([AC_CXX_HEADER_STDCXX_98], [ + AC_CACHE_CHECK(for ISO C++ 98 include files, + ac_cv_cxx_stdcxx_98, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ + #include <cassert> + #include <cctype> + #include <cerrno> + #include <cfloat> + #include <ciso646> + #include <climits> + #include <clocale> + #include <cmath> + #include <csetjmp> + #include <csignal> + #include <cstdarg> + #include <cstddef> + #include <cstdio> + #include <cstdlib> + #include <cstring> + #include <ctime> + + #include <algorithm> + #include <bitset> + #include <complex> + #include <deque> + #include <exception> + #include <fstream> + #include <functional> + #include <iomanip> + #include <ios> + #include <iosfwd> + #include <iostream> + #include <istream> + #include <iterator> + #include <limits> + #include <list> + #include <locale> + #include <map> + #include <memory> + #include <new> + #include <numeric> + #include <ostream> + #include <queue> + #include <set> + #include <sstream> + #include <stack> + #include <stdexcept> + #include <streambuf> + #include <string> + #include <typeinfo> + #include <utility> + #include <valarray> + #include <vector> + ],, + ac_cv_cxx_stdcxx_98=yes, ac_cv_cxx_stdcxx_98=no) + AC_LANG_RESTORE + ]) + if test "$ac_cv_cxx_stdcxx_98" = yes; then + AC_DEFINE(STDCXX_98_HEADERS,,[Define if ISO C++ 1998 header files are present. ]) + fi +])
  3. Download patch m4/pandora_stack_direction.m4

    --- 0.98-1.1/m4/pandora_stack_direction.m4 2010-01-15 15:43:16.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_stack_direction.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -#-------------------------------------------------------------------- -# Check what direction the stack runs in -#-------------------------------------------------------------------- - -AC_DEFUN([PANDORA_STACK_DIRECTION],[ - AC_REQUIRE([AC_FUNC_ALLOCA]) - AC_CACHE_CHECK([stack direction], [ac_cv_c_stack_direction],[ - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -#include <stdlib.h> - int find_stack_direction () - { - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; - } - ]],[[ - exit (find_stack_direction() < 0); - ]])],[ - ac_cv_c_stack_direction=1 - ],[ - ac_cv_c_stack_direction=-1 - ]) - ]) - AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction) -]) - - -
  4. Download patch m4/pandora_canonical.m4
  5. Download patch m4/pandora_have_libpqxx.m4

    --- 0.98-1.1/m4/pandora_have_libpqxx.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libpqxx.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,44 @@ +dnl Copyright (C) 2010 Padraig O'Sullivan +dnl This file is free software; +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_LIBPQXX],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for libpqxx + dnl -------------------------------------------------------------------- + + AC_ARG_ENABLE([libpqxx], + [AS_HELP_STRING([--disable-libpqxx], + [Build with libpqxx support @<:@default=on@:>@])], + [ac_enable_libpqxx="$enableval"], + [ac_enable_libpqxx="yes"]) + + AS_IF([test "x$ac_enable_libpqxx" = "xyes"],[ + AC_LANG_PUSH([C++]) + AC_LIB_HAVE_LINKFLAGS(pqxx,,[ + #include <pqxx/pqxx> + ],[ + pqxx::connection conn("dbname=test"); + ]) + AC_LANG_POP() + ],[ + ac_cv_libpqxx="no" + ]) + + AM_CONDITIONAL(HAVE_LIBPQXX, [test "x${ac_cv_libpqxx}" = "xyes"]) + +]) + +AC_DEFUN([PANDORA_HAVE_LIBPQXX],[ + AC_REQUIRE([_PANDORA_SEARCH_LIBPQXX]) +]) + +AC_DEFUN([PANDORA_REQUIRE_LIBPQXX],[ + AC_REQUIRE([PANDORA_HAVE_LIBPQXX]) + AS_IF([test "x$ac_cv_libpqxx" = "xno"],[ + AC_MSG_ERROR([libpqxx is required for ${PACKAGE}]) + ]) +])
  6. Download patch config/uncrustify.cfg
  7. Download patch m4/pandora_have_protobuf.m4

    --- 0.98-1.1/m4/pandora_have_protobuf.m4 2010-01-15 15:43:15.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_protobuf.m4 2010-12-27 19:42:04.000000000 +0000 @@ -23,7 +23,9 @@ AC_DEFUN([_PANDORA_SEARCH_LIBPROTOBUF],[ [#include <google/protobuf/descriptor.h>], [google::protobuf::FileDescriptor* file;], [system]) - CXXFLAGS="${save_CXXFLAGS}" + CXXFLAGS="${PTHREAD_CFLAGS} ${save_CXXFLAGS}" + LIBPROTOBUF="${LIBPROTOBUF} ${PTHREAD_LIBS}" + LTLIBPROTOBUF="${LTLIBPROTOBUF} ${PTHREAD_LIBS}" AC_LANG_POP() ])
  8. Download patch m4/pandora_have_libxml2.m4

    --- 0.98-1.1/m4/pandora_have_libxml2.m4 2010-01-15 15:43:15.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libxml2.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  9. Download patch m4/pandora_have_libgtest.m4

    --- 0.98-1.1/m4/pandora_have_libgtest.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libgtest.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,47 @@ +dnl Copyright (C) 2010 Monty Taylor +dnl This file is free software; Monty Taylor +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_LIBGTEST],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for libgtest + dnl -------------------------------------------------------------------- + + AC_ARG_ENABLE([libgtest], + [AS_HELP_STRING([--disable-libgtest], + [Build with libgtest support @<:@default=on@:>@])], + [ac_enable_libgtest="$enableval"], + [ac_enable_libgtest="yes"]) + + AS_IF([test "x$ac_enable_libgtest" = "xyes"],[ + AC_LANG_PUSH(C++) + save_CXXFLAGS="${CXXFLAGS}" + CXXFLAGS="${AM_CXXFLAGS} ${CXXFLAGS}" + AC_LIB_HAVE_LINKFLAGS(gtest,,[ + #include <gtest/gtest.h> +TEST(pandora_test_libgtest, PandoraTest) +{ + ASSERT_EQ(1, 1); +} + ],[]) + CXXFLAGS="${save_CXXFLAGS}" + AC_LANG_POP() + ],[ + ac_cv_libgtest="no" + ]) + + AM_CONDITIONAL(HAVE_LIBGTEST, [test "x${ac_cv_libgtest}" = "xyes"]) +]) + +AC_DEFUN([PANDORA_HAVE_LIBGTEST],[ + AC_REQUIRE([_PANDORA_SEARCH_LIBGTEST]) +]) + +AC_DEFUN([PANDORA_REQUIRE_LIBGTEST],[ + AC_REQUIRE([_PANDORA_SEARCH_LIBGTEST]) + AS_IF([test "x${ac_cv_libgtest}" = "xno"], + AC_MSG_ERROR([libgtest is required for ${PACKAGE}])) +])
  10. Download patch m4/pandora_with_memcached.m4

    --- 0.98-1.1/m4/pandora_with_memcached.m4 2010-01-15 15:43:16.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_with_memcached.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  11. Download patch m4/pandora_have_innodb.m4

    --- 0.98-1.1/m4/pandora_have_innodb.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_innodb.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([_PANDORA_SEARCH_LIBINNODB],[ - AC_REQUIRE([AC_LIB_PREFIX]) - - dnl -------------------------------------------------------------------- - dnl Check for libinnodb - dnl -------------------------------------------------------------------- - - AC_ARG_ENABLE([libinnodb], - [AS_HELP_STRING([--disable-libinnodb], - [Build with libinnodb support @<:@default=on@:>@])], - [ac_enable_libinnodb="$enableval"], - [ac_enable_libinnodb="yes"]) - - AS_IF([test "x$ac_enable_libinnodb" = "xyes"],[ - AC_LIB_HAVE_LINKFLAGS(innodb,,[ - #include <embedded_innodb-1.0/innodb.h> - ],[ - ib_u64_t - ib_api_version(void); - ]) - ],[ - ac_cv_libinnodb="no" - ]) - - AM_CONDITIONAL(HAVE_LIBINNODB, [test "x${ac_cv_libinnodb}" = "xyes"]) -]) - -AC_DEFUN([PANDORA_HAVE_LIBINNODB],[ - AC_REQUIRE([_PANDORA_SEARCH_LIBINNODB]) -]) - -AC_DEFUN([PANDORA_REQUIRE_LIBINNODB],[ - AC_REQUIRE([PANDORA_HAVE_LIBINNODB]) - AS_IF([test "x${ac_cv_libinnodb}" = "xno"], - AC_MSG_ERROR([libinnodb is required for ${PACKAGE}])) -])
  12. Download patch m4/pandora_fdatasync.m4

    --- 0.98-1.1/m4/pandora_fdatasync.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_fdatasync.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ dnl with or without modifications, as lo AC_DEFUN([PANDORA_WORKING_FDATASYNC],[ AC_CACHE_CHECK([working fdatasync],[ac_cv_func_fdatasync],[ AC_LANG_PUSH(C++) - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <unistd.h> ]],[[ fdatasync(4); @@ -22,4 +22,4 @@ fdatasync(4); ]) AS_IF([test "x${ac_cv_func_fdatasync}" = "xyes"], [AC_DEFINE([HAVE_FDATASYNC],[1],[If the system has a working fdatasync])]) -]) \ No newline at end of file +])
  13. Download patch m4/pandora_have_libldap.m4

    --- 0.98-1.1/m4/pandora_have_libldap.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libldap.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,73 @@ +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +#-------------------------------------------------------------------- +# Check for libldap +#-------------------------------------------------------------------- + + +AC_DEFUN([_PANDORA_SEARCH_LIBLDAP],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + AC_LIB_HAVE_LINKFLAGS(ldap,, + [#include <ldap.h>], + [ + LDAP *ldap; + ldap_initialize(&ldap, "ldap://localhost/"); + ]) + AS_IF([test "x$ac_cv_libldap" = "xno"], + [ + unset ac_cv_libldap + unset HAVE_LIBLDAP + unset LIBLDAP + unset LIBLDAP_PREFIX + unset LTLIBLDAP + AC_LIB_HAVE_LINKFLAGS(ldap,, + [#include <ldap/ldap.h>], + [ + LDAP *ldap; + ldap_initialize(&ldap, "ldap://localhost/"); + ]) + AS_IF([test "x$ac_cv_libldap" = "xyes"], [ + ac_cv_ldap_location="<ldap/ldap.h>" + ]) + ],[ + ac_cv_ldap_location="<ldap.h>" + ]) + + AM_CONDITIONAL(HAVE_LIBLDAP, [test "x${ac_cv_libldap}" = "xyes"]) +]) + +AC_DEFUN([_PANDORA_HAVE_LIBLDAP],[ + + AC_ARG_ENABLE([libldap], + [AS_HELP_STRING([--disable-libldap], + [Build with libldap support @<:@default=on@:>@])], + [ac_enable_libldap="$enableval"], + [ac_enable_libldap="yes"]) + + _PANDORA_SEARCH_LIBLDAP +]) + + +AC_DEFUN([PANDORA_HAVE_LIBLDAP],[ + AC_REQUIRE([_PANDORA_HAVE_LIBLDAP]) +]) + +AC_DEFUN([_PANDORA_REQUIRE_LIBLDAP],[ + ac_enable_libldap="yes" + _PANDORA_SEARCH_LIBLDAP + + AS_IF([test x$ac_cv_libldap = xno],[ + AC_MSG_ERROR([libldap is required for ${PACKAGE}. On Debian this can be found in libldap2-dev. On RedHat this can be found in openldap-devel.]) + ],[ + AC_DEFINE_UNQUOTED(LDAP_HEADER,[${ac_cv_ldap_location}], + [Location of ldap header]) + ]) +]) + +AC_DEFUN([PANDORA_REQUIRE_LIBLDAP],[ + AC_REQUIRE([_PANDORA_REQUIRE_LIBLDAP]) +])
  14. Download patch m4/pandora_have_libboost_date_time.m4

    --- 0.98-1.1/m4/pandora_have_libboost_date_time.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libboost_date_time.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,46 @@ +dnl Copyright (C) 2010 Monty Taylor +dnl This file is free software; Monty Taylor +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_BOOST_DATE_TIME],[ + AC_REQUIRE([AC_LIB_PREFIX]) + AC_REQUIRE([ACX_PTHREAD]) + + dnl -------------------------------------------------------------------- + dnl Check for Boost.Date_Time + dnl -------------------------------------------------------------------- + + AC_LANG_PUSH(C++) + AC_LIB_HAVE_LINKFLAGS(boost_date_time-mt,,[ + #include <boost/date_time.hpp> + ],[ + boost::gregorian::date weekstart(2002,2,1); + ]) + AS_IF([test "x${ac_cv_libboost_date_time_mt}" = "xno"],[ + AC_LIB_HAVE_LINKFLAGS(boost_date_time,,[ + #include <boost/date_time.hpp> + ],[ + boost::gregorian::date weekstart(2002,2,1); + ]) + ]) + AC_LANG_POP() + + AM_CONDITIONAL(HAVE_BOOST_DATE_TIME, + [test "x${ac_cv_libboost_date_time}" = "xyes" -o "x${ac_cv_libboost_date_time_mt}" = "xyes"]) + BOOST_LIBS="${BOOST_LIBS} ${LTLIBBOOST_DATE_TIME_MT} ${LTLIBBOOST_DATE_TIME}" + AC_SUBST(BOOST_LIBS) +]) + +AC_DEFUN([PANDORA_HAVE_BOOST_DATE_TIME],[ + PANDORA_HAVE_BOOST($1) + _PANDORA_SEARCH_BOOST_DATE_TIME($1) +]) + +AC_DEFUN([PANDORA_REQUIRE_BOOST_DATE_TIME],[ + PANDORA_REQUIRE_BOOST($1) + _PANDORA_SEARCH_BOOST_DATE_TIME($1) + AS_IF([test "x${ac_cv_libboost_date_time}" = "xno" -a "x${ac_cv_libboost_date_time_mt}" = "xno"], + AC_MSG_ERROR([Boost.Date_Time is required for ${PACKAGE}])) +]) +
  15. Download patch m4/lt~obsolete.m4

    --- 0.98-1.1/m4/lt~obsolete.m4 2010-01-18 01:52:27.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/lt~obsolete.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004. -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 4 lt~obsolete.m4 - -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -# which have later been changed to m4_define as they aren't part of the -# exported API, or moved to Autoconf or Automake where they belong. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# included after everything else. This provides aclocal with the -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -# because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -# -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -# Yes, that means every name once taken will need to remain here until -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) - -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
  16. Download patch m4/pandora_version.m4

    --- 0.98-1.1/m4/pandora_version.m4 2010-01-15 15:43:16.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_version.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  17. Download patch debian/lintian-overrides

    --- 0.98-1.1/debian/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/debian/lintian-overrides 2010-12-10 20:37:53.000000000 +0000 @@ -0,0 +1,12 @@ +pandora-build: no-upstream-changelog +pandora-build: script-not-executable ./usr/share/pandora-build/config/autorun.sh +pandora-build: script-not-executable ./usr/share/pandora-build/config/config.rpath +pandora-build: script-not-executable ./usr/share/pandora-build/config/pandora-plugin +pandora-build: script-not-executable ./usr/share/quickly/templates/pandora-build-c/project_root/test_run.sh +pandora-build: python-script-but-no-python-dep ./usr/share/quickly/templates/pandora-build/create.py +pandora-build: python-script-but-no-python-dep ./usr/share/quickly/templates/pandora-build/license.py +pandora-build: script-not-executable ./usr/share/quickly/templates/pandora-build/project_root/test_run.sh +pandora-build: python-script-but-no-python-dep ./usr/share/quickly/templates/pandora-build/run.py +pandora-build: python-script-but-no-python-dep ./usr/share/quickly/templates/pandora-build/tutorial.py +pandora-build: python-script-but-no-python-dep ./usr/share/quickly/templates/pandora-build/upgrade.py +pandora-build: python-script-but-no-python-dep ./usr/share/quickly/templates/pandora-build/add.py
  18. Download patch config/pandora-plugin
  19. Download patch config/config.sub
  20. Download patch debian/rules

    --- 0.98-1.1/debian/rules 2015-09-15 17:07:44.000000000 +0000 +++ 0.171.1-0ubuntu2/debian/rules 2010-12-10 20:43:07.000000000 +0000 @@ -5,36 +5,16 @@ DH = dh %: $(DH) $@ -build: +override_dh_auto_configure: [ -f configure ] || autoreconf -fi - $(DH) build + dh_auto_configure -clean: +override_dh_auto_clean: + dh_auto_clean make distclean || true rm -fr configure Makefile.in aclocal.m4 autom4te.cache configure rm -f config/install-sh config/missing - $(DH) clean -install: build - $(DH) install +get-orig-source: + uscan --verbose --force-download --rename --repack --destdir=.. -binary: binary-indep - -binary-indep: install - $(DH) binary-indep - -UPSTREAM = http://bazaar.launchpad.net/~mordred/pandora-build/devel - -# nb the double-indirect below is to allow eventual idempotent writes, where -# the same tar is always created. At this point its more a uupdate kindof thing. -get-orig-source:: - rm -rf debian/new-upstream - mkdir debian/new-upstream - revno=$$(bzr revno ${UPSTREAM}); \ -echo exporting revno $$revno; \ -bzr branch -r $$revno ${UPSTREAM} debian/new-upstream/pandora-build; \ -bzr export debian/new-upstream/pandora-build-0~bzr$$revno debian/new-upstream/pandora-build; \ -tar -C debian/new-upstream/ -c pandora-build-0~bzr$$revno | gzip -9nf > ../pandora-build_0~bzr$$revno.orig.tar.gz - rm -rf debian/new-upstream - -.PHONY: build clean binary-indep binary-arch binary install
  21. Download patch m4/pandora_have_libboost_thread.m4

    --- 0.98-1.1/m4/pandora_have_libboost_thread.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libboost_thread.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,54 @@ +dnl Copyright (C) 2010 Monty Taylor +dnl This file is free software; Monty Taylor +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_BOOST_THREAD],[ + AC_REQUIRE([AC_LIB_PREFIX]) + AC_REQUIRE([ACX_PTHREAD]) + + dnl -------------------------------------------------------------------- + dnl Check for boost::thread + dnl -------------------------------------------------------------------- + + save_CFLAGS="${CFLAGS}" + save_CXXFLAGS="${CXXFLAGS}" + CFLAGS="${PTHREAD_CFLAGS} ${CFLAGS}" + CXXFLAGS="${PTHREAD_CFLAGS} ${CXXFLAGS}" + + AC_LANG_PUSH(C++) + AC_LIB_HAVE_LINKFLAGS(boost_thread-mt,,[ + #include <boost/thread.hpp> + ],[ + boost::thread id; + ]) + AS_IF([test "x${ac_cv_libboost_thread_mt}" = "xno"],[ + AC_LIB_HAVE_LINKFLAGS(boost_thread,,[ + #include <boost/thread.hpp> + ],[ + boost::thread id; + ]) + ]) + AC_LANG_POP() + CFLAGS="${save_CFLAGS}" + CXXFLAGS="${save_CXXFLAGS}" + + + AM_CONDITIONAL(HAVE_BOOST_THREAD, + [test "x${ac_cv_libboost_thread}" = "xyes" -o "x${ac_cv_libboost_thread_mt}" = "xyes"]) + BOOST_LIBS="${BOOST_LIBS} ${LTLIBBOOST_THREAD_MT} ${LTLIBBOOST_THREAD}" + AC_SUBST(BOOST_LIBS) +]) + +AC_DEFUN([PANDORA_HAVE_BOOST_THREAD],[ + PANDORA_HAVE_BOOST($1) + _PANDORA_SEARCH_BOOST_THREAD($1) +]) + +AC_DEFUN([PANDORA_REQUIRE_BOOST_THREAD],[ + PANDORA_REQUIRE_BOOST($1) + _PANDORA_SEARCH_BOOST_THREAD($1) + AS_IF([test "x${ac_cv_libboost_thread}" = "xno" -a "x${ac_cv_libboost_thread_mt}" = "xno"], + AC_MSG_ERROR([boost::thread is required for ${PACKAGE}])) +]) +
  22. Download patch m4/pandora_drizzle_build.m4

    --- 0.98-1.1/m4/pandora_drizzle_build.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_drizzle_build.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,12 +9,6 @@ dnl are set. AC_DEFUN([PANDORA_DRIZZLE_BUILD],[ - dnl We need to turn on our CXXFLAGS to make sure it shows up correctly - PANDORA_CXX_STL_HASH - - PANDORA_CXX_CSTDINT - PANDORA_CXX_CINTTYPES - AC_STRUCT_TM AC_FUNC_ALLOCA @@ -39,7 +33,7 @@ AC_DEFUN([PANDORA_DRIZZLE_BUILD],[ AC_CHECK_HEADERS(sys/types.h sys/fpu.h fpu_control.h ieeefp.h) AC_CHECK_HEADERS(select.h sys/select.h) AC_CHECK_HEADERS(utime.h sys/utime.h ) - AC_CHECK_HEADERS(synch.h sys/mman.h sys/socket.h) + AC_CHECK_HEADERS(synch.h sys/mman.h) AC_CHECK_HEADERS(sched.h) AC_CHECK_HEADERS(sys/prctl.h) AC_CHECK_HEADERS(execinfo.h) @@ -69,42 +63,15 @@ AC_DEFUN([PANDORA_DRIZZLE_BUILD],[ ]]) AC_CHECK_TYPES([uint, ulong]) - PANDORA_CXX_DEMANGLE - - AH_TOP([ -#ifndef __CONFIG_H__ -#define __CONFIG_H__ + PANDORA_REQUIRE_BISON -#include "config/top.h" -]) - mkdir -p config - cat > config/top.h.stamp <<EOF_CONFIG_TOP - -#if defined(i386) && !defined(__i386__) -#define __i386__ -#endif - -#if defined(_FILE_OFFSET_BITS) -# undef _FILE_OFFSET_BITS -#endif -EOF_CONFIG_TOP - diff config/top.h.stamp config/top.h >/dev/null 2>&1 || mv config/top.h.stamp config/top.h - rm -f config/top.h.stamp - - - AH_BOTTOM([ -#if defined(__cplusplus) -# include CSTDINT_H -# include CINTTYPES_H -#else -# include <stdint.h> -# include <inttypes.h> -#endif - -#if !defined(HAVE_ULONG) && !defined(__USE_MISC) -typedef unsigned long int ulong; -#endif + PANDORA_CXX_DEMANGLE + PANDORA_REQUIRE_BOOST([1.38]) + PANDORA_REQUIRE_BOOST_PROGRAM_OPTIONS + PANDORA_REQUIRE_BOOST_THREAD + PANDORA_REQUIRE_BOOST_REGEX + PANDORA_REQUIRE_BOOST_DATE_TIME + PANDORA_REQUIRE_BOOST_FILESYSTEM + PANDORA_REQUIRE_BOOST_IOSTREAMS -#endif /* __CONFIG_H__ */ - ]) ])
  23. Download patch config/pandora-plugin.ini

    --- 0.98-1.1/config/pandora-plugin.ini 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/config/pandora-plugin.ini 2010-12-10 20:26:32.000000000 +0000 @@ -0,0 +1,4 @@ +[pandora-plugin] +root_plugin_dir=modules +pkgplugindir=$(libdir)/MyProject +plugin_suffix=_module
  24. Download patch config/config.guess
  25. Download patch m4/pandora_bison.m4

    --- 0.98-1.1/m4/pandora_bison.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_bison.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,33 @@ +dnl Copyright (C) 2010 Monty Taylor +dnl Copyright (C) 2010 Hartmut Holzgraefe +dnl This file is free software; Monty Taylor and Hartmut Holzgraefe +dnl give unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_BISON],[ + + dnl -------------------------------------------------------------------- + dnl Check for bison + dnl -------------------------------------------------------------------- + + AC_CHECK_PROGS([YACC], ['bison -y'], [:]) + AS_IF([test "x$YACC" = "x:"],[ + pandora_have_bison=no + YACC='if test -f "$@"; then echo "WARNING: no proper bison binary found, ignoring changes to $<"; exit 0; else echo "ERROR: no proper bison binary found"; exit 1; fi;' + ],[ + pandora_have_bison=yes + ]) + + AM_CONDITIONAL(HAVE_BISON, [test "x${pandora_have_bison}" = "xyes"]) +]) + +AC_DEFUN([PANDORA_HAVE_BISON],[ + AC_REQUIRE([_PANDORA_SEARCH_BISON]) +]) + +AC_DEFUN([PANDORA_REQUIRE_BISON],[ + AC_REQUIRE([PANDORA_HAVE_BISON]) + AS_IF([test "x${pandora_have_bison}" = "xno" -a "$pandora_building_from_bzr" = "yes"], + AC_MSG_ERROR(["bison is required for ${PACKAGE} to build from a bzr branch"]) + ) +])
  26. Download patch m4/pandora_have_libbdb.m4

    --- 0.98-1.1/m4/pandora_have_libbdb.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libbdb.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  27. Download patch debian/control

    --- 0.98-1.1/debian/control 2015-09-15 17:07:44.000000000 +0000 +++ 0.171.1-0ubuntu2/debian/control 2015-09-15 14:58:49.000000000 +0000 @@ -1,18 +1,28 @@ Source: pandora-build Section: devel Priority: optional -Maintainer: Robert Collins <robertc@robertcollins.net> -Build-Depends: debhelper (>= 7.0), +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Robert Collins <robertc@robertcollins.net> +Uploaders: Monty Taylor <mordred@inaugust.com> +Build-Depends: debhelper (>= 7.0.50), autoconf (>= 2.59), - automake, - libtool, - autoconf-archive -Standards-Version: 3.8.2 + automake +Standards-Version: 3.9.1 Homepage: http://code.launchpad.net/pandora-build +Vcs-Browser: http://bazaar.launchpad.net/~mordred/ubuntu/natty/pandora-build/trunk/files +Vcs-Bzr: http://bazaar.launchpad.net/~mordred/ubuntu/natty/pandora-build/trunk Package: pandora-build Architecture: all -Depends: ${misc:Depends} -Description: Build macros for libdrizzle, libmemcached, drizzle and gearmand +Depends: autoconf-archive, + intltool, + ${misc:Depends} +Description: autotools made better, faster stronger pandora-build supplies common checks for compiler flags, warnings and other portability issues encountered using autoconf on those projects. + . + On systems which have a version of quickly, it provides a set of quickly + templates for managing pandora-build-based projects. + . + Currently, pandora-build is used in drizzle, libmemcached, gearman and + haildb, as well as numerous other smaller projects.
  28. Download patch m4/pandora_have_libz.m4

    --- 0.98-1.1/m4/pandora_have_libz.m4 2010-01-15 15:43:15.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libz.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  29. Download patch m4/pandora_intltool.m4
  30. Download patch m4/pandora_visibility.m4

    --- 0.98-1.1/m4/pandora_visibility.m4 2010-01-15 15:43:16.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_visibility.m4 2010-12-27 19:42:04.000000000 +0000 @@ -20,17 +20,16 @@ dnl "really only recommended for legacy dnl Set the variable CFLAG_VISIBILITY. dnl Defines and sets the variable HAVE_VISIBILITY. -AC_DEFUN([PANDORA_VISIBILITY], +AC_DEFUN([PANDORA_CHECK_VISIBILITY], [ AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([PANDORA_PLATFORM]) CFLAG_VISIBILITY= HAVE_VISIBILITY=0 AS_IF([test -n "$GCC"],[ AC_MSG_CHECKING([for simple visibility declarations]) AC_CACHE_VAL([gl_cv_cc_visibility], [ gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fvisibility=hidden" + CFLAGS="$CFLAGS -fvisibility=hidden -Werror" AC_TRY_COMPILE( [extern __attribute__((__visibility__("hidden"))) int hiddenvar; extern __attribute__((__visibility__("default"))) int exportedvar; @@ -43,15 +42,24 @@ AC_DEFUN([PANDORA_VISIBILITY], AC_MSG_RESULT([$gl_cv_cc_visibility]) if test $gl_cv_cc_visibility = yes; then CFLAG_VISIBILITY="-fvisibility=hidden" + NO_VISIBILITY="-fvisibility=default" HAVE_VISIBILITY=1 fi ]) AS_IF([test "x$SUNCC" = "xyes"],[ CFLAG_VISIBILITY="-xldscope=hidden" + NO_VISIBILITY="-xldscope=global" HAVE_VISIBILITY=1 ]) AC_SUBST([CFLAG_VISIBILITY]) + AC_SUBST([NO_VISIBILITY]) AC_SUBST([HAVE_VISIBILITY]) AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY], [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.]) ]) + +AC_DEFUN([PANDORA_ENABLE_VISIBILITY],[ + AC_REQUIRE([PANDORA_CHECK_VISIBILITY]) + AM_CFLAGS="${AM_CFLAGS} ${CFLAG_VISIBILITY}" + AM_CXXFLAGS="${AM_CXXFLAGS} ${CFLAG_VISIBILITY}" +])
  31. Download patch m4/pandora_with_gettext.m4

    --- 0.98-1.1/m4/pandora_with_gettext.m4 2010-01-15 15:43:16.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_with_gettext.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- -dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -dnl -dnl pandora-build: A pedantic build system -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystems -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl From Monty Taylor - -AC_DEFUN([PANDORA_WITH_GETTEXT],[ - - m4_syscmd([if test -d po ; then - echo "# This file is auto-generated from configure. Do not edit directly" > po/POTFILES.in.stamp - PACKAGE=`grep ^AC_INIT configure.ac | cut -f2-3 -d[ | cut -f1 -d]` - for f in `find . | grep -v "${PACKAGE}-" | egrep '\.(cc|c|h|yy)$' | cut -c3- | sort` - do - if grep gettext.h "$f" | grep include >/dev/null 2>&1 - then - echo "$f" >> po/POTFILES.in.stamp - fi - done - if diff po/POTFILES.in.stamp po/POTFILES.in >/dev/null 2>&1 - then - rm po/POTFILES.in.stamp - else - mv po/POTFILES.in.stamp po/POTFILES.in - fi - fi]) - - AM_GNU_GETTEXT(external, need-formatstring-macros) - AM_GNU_GETTEXT_VERSION([0.17]) - AS_IF([test "x$MSGMERGE" = "x" -o "x$MSGMERGE" = "x:"],[ - AM_PATH_PROG_WITH_TEST(GMSGMERGE, gmsgmerge, - [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) - MSGMERGE="${GMSGMERGE}" - ]) - AM_CONDITIONAL([BUILD_GETTEXT],[test "x$MSGMERGE" != "x" -a "x$MSGMERGE" != "x:"]) - -])
  32. Download patch m4/pandora_clock_gettime.m4

    --- 0.98-1.1/m4/pandora_clock_gettime.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_clock_gettime.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,15 @@ +dnl Copyright (C) 2010 Monty Taylor +dnl This file is free software; Monty Taylor +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +#-------------------------------------------------------------------- +# Check for clock_gettime +#-------------------------------------------------------------------- + +AC_DEFUN([PANDORA_CLOCK_GETTIME],[ + AC_SEARCH_LIBS([clock_gettime],[rt]) + AS_IF([test "x${ac_cv_search_clock_gettime}" != "xno"],[ + AC_DEFINE([HAVE_CLOCK_GETTIME],[1],[Have a working clock_gettime function]) + ]) +])
  33. Download patch configure.ac

    --- 0.98-1.1/configure.ac 2010-01-18 08:28:09.000000000 +0000 +++ 0.171.1-0ubuntu2/configure.ac 2010-09-19 21:48:07.000000000 +0000 @@ -5,15 +5,14 @@ # Use and distribution licensed under the BSD license. See # the COPYING file in this directory for full text. -AC_INIT([pandora-build],PANDORA_CANONICAL_VERSION, [http://launchpad.net/pandora-build]) +AC_INIT([pandora-build],PANDORA_CANONICAL_VERSION[.1], [http://launchpad.net/pandora-build]) AC_CONFIG_SRCDIR([m4/pandora_canonical.m4]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) -AC_PREFIX_DEFAULT([/usr]) - -PANDORA_CANONICAL_TARGET +AM_INIT_AUTOMAKE(-Wall -Werror subdir-objects foreign) +PANDORA_BLOCK_BAD_OPTIONS AC_CONFIG_FILES(Makefile)
  34. Download patch m4/pandora_have_libboost_options.m4

    --- 0.98-1.1/m4/pandora_have_libboost_options.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libboost_options.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,47 @@ +dnl Copyright (C) 2010 Monty Taylor +dnl This file is free software; Monty Taylor +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_BOOST_PROGRAM_OPTIONS],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for boost::program_options + dnl -------------------------------------------------------------------- + + AC_LANG_PUSH(C++) + AC_LIB_HAVE_LINKFLAGS(boost_program_options-mt,,[ + #include <boost/program_options.hpp> + ],[ + boost::program_options::options_description d; + d.add_options()("a","some option"); + ]) + AS_IF([test "x${ac_cv_libboost_program_options_mt}" = "xno"],[ + AC_LIB_HAVE_LINKFLAGS(boost_program_options,,[ + #include <boost/program_options.hpp> + ],[ + boost::program_options::options_description d; + d.add_options()("a","some option"); + ]) + ]) + AC_LANG_POP() + + AM_CONDITIONAL(HAVE_BOOST_PROGRAM_OPTIONS, + [test "x${ac_cv_libboost_program_options}" = "xyes" -o "x${ac_cv_libboost_program_options_mt}" = "xyes"]) + BOOST_LIBS="${BOOST_LIBS} ${LTLIBBOOST_PROGRAM_OPTIONS} ${LTLIBBOOST_PROGRAM_OPTIONS_MT}" + AC_SUBST(BOOST_LIBS) +]) + +AC_DEFUN([PANDORA_HAVE_BOOST_PROGRAM_OPTIONS],[ + PANDORA_HAVE_BOOST($1) + _PANDORA_SEARCH_BOOST_PROGRAM_OPTIONS($1) +]) + +AC_DEFUN([PANDORA_REQUIRE_BOOST_PROGRAM_OPTIONS],[ + PANDORA_REQUIRE_BOOST($1) + _PANDORA_SEARCH_BOOST_PROGRAM_OPTIONS($1) + AS_IF([test "x${ac_cv_libboost_program_options}" = "xno" -a "x${ac_cv_libboost_program_options_mt}" = "xno"], + AC_MSG_ERROR([boost::program_options is required for ${PACKAGE}])) +]) +
  35. Download patch m4/pandora_have_libboost_iostreams.m4

    --- 0.98-1.1/m4/pandora_have_libboost_iostreams.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libboost_iostreams.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,49 @@ +dnl Copyright (C) 2010 Andrew Hutchings +dnl This file is free software; Andrew Hutchings +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_BOOST_IOSTREAMS],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for Boost.Iostreams + dnl -------------------------------------------------------------------- + + AC_LANG_PUSH(C++) + AC_LIB_HAVE_LINKFLAGS(boost_iostreams-mt,,[ + #include <boost/iostreams/stream.hpp> + #include <boost/iostreams/device/array.hpp> + ],[ + const char* input= "hello world"; + boost::iostreams::stream<boost::iostreams::array_source> in(input, strlen(input)); + ]) + AS_IF([test "x${ac_cv_libboost_iostreams_mt}" = "xno"],[ + AC_LIB_HAVE_LINKFLAGS(boost_iostreams,,[ + #include <boost/iostreams/stream.hpp> + #include <boost/iostreams/device/array.hpp> + ],[ + const char* input= "hello world"; + boost::iostreams::stream<boost::iostreams::array_source> in(input, strlen(input)); + ]) + ]) + AC_LANG_POP() + + AM_CONDITIONAL(HAVE_BOOST_IOSTREAMS, + [test "x${ac_cv_libboost_iostreams}" = "xyes" -o "x${ac_cv_libboost_iostreams_mt}" = "xyes"]) + BOOST_LIBS="${BOOST_LIBS} ${LTLIBBOOST_IOSTREAMS_MT} ${LTLIBBOOST_IOSTREAMS}" + AC_SUBST(BOOST_LIBS) +]) + +AC_DEFUN([PANDORA_HAVE_BOOST_IOSTREAMS],[ + PANDORA_HAVE_BOOST($1) + _PANDORA_SEARCH_BOOST_IOSTREAMS($1) +]) + +AC_DEFUN([PANDORA_REQUIRE_BOOST_IOSTREAMS],[ + PANDORA_REQUIRE_BOOST($1) + _PANDORA_SEARCH_BOOST_IOSTREAMS($1) + AS_IF([test "x${ac_cv_libboost_iostreams}" = "xno" -a "x${ac_cv_libboost_iostreams_mt}" = "xno"], + AC_MSG_ERROR([Boost.Iostreams is required for ${PACKAGE}])) +]) +
  36. Download patch m4/pandora_have_libcassandra.m4

    --- 0.98-1.1/m4/pandora_have_libcassandra.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libcassandra.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,44 @@ +dnl Copyright (C) 2010 Padraig O'Sullivan +dnl This file is free software; +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_LIBCASSANDRA],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for libcassandra + dnl -------------------------------------------------------------------- + + AC_ARG_ENABLE([libcassandra], + [AS_HELP_STRING([--disable-libcassandra], + [Build with libcassandra support @<:@default=on@:>@])], + [ac_enable_libcassandra="$enableval"], + [ac_enable_libcassandra="yes"]) + + AS_IF([test "x$ac_enable_libcassandra" = "xyes"],[ + AC_LANG_PUSH([C++]) + AC_LIB_HAVE_LINKFLAGS(cassandra,[thrift],[ + #include <libcassandra/cassandra_factory.h> + ],[ + libcassandra::CassandraFactory fact("localhost", 9306); + ]) + AC_LANG_POP() + ],[ + ac_cv_libcassandra="no" + ]) + + AM_CONDITIONAL(HAVE_LIBCASSANDRA, [test "x${ac_cv_libcassandra}" = "xyes"]) + +]) + +AC_DEFUN([PANDORA_HAVE_LIBCASSANDRA],[ + AC_REQUIRE([_PANDORA_SEARCH_LIBCASSANDRA]) +]) + +AC_DEFUN([PANDORA_REQUIRE_LIBCASSANDRA],[ + AC_REQUIRE([PANDORA_HAVE_LIBCASSANDRA]) + AS_IF([test "x$ac_cv_libcassandra" = "xno"],[ + AC_MSG_ERROR([libcassandra is required for ${PACKAGE}]) + ]) +])
  37. Download patch m4/pandora_stl_hash.m4

    --- 0.98-1.1/m4/pandora_stl_hash.m4 2010-01-15 15:43:16.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_stl_hash.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,110 +1,89 @@ -# We check two things: where the include file is for hash_map, and -# what namespace hash_map lives in within that include file. We +# We check two things: where the include file is for unordered_map, and +# what namespace unordered_map lives in within that include file. We # include AC_COMPILE_IFELSE for all the combinations we've seen in the -# wild. We define one of HAVE_HASH_MAP or HAVE_EXT_HASH_MAP depending -# on location, and HASH_NAMESPACE to be the namespace hash_map is -# defined in. -# -# Ideally we'd use AC_CACHE_CHECK, but that only lets us store one value -# at a time, and we need to store two (filename and namespace). -# prints messages itself, so we have to do the message-printing ourselves -# via AC_MSG_CHECKING + AC_MSG_RESULT. (TODO(csilvers): can we cache?) - -AC_DEFUN([PANDORA_CXX_STL_HASH], - [AC_MSG_CHECKING(the location of hash_map) - save_CXXFLAGS="${CXXFLAGS}" - CXXFLAGS="${AM_CXXFLAGS} ${CXXFLAGS}" - AC_LANG_PUSH(C++) - ac_cv_cxx_hash_map="" - for location in "" "ext/" "tr1/" ; do - for namespace in __gnu_cxx "" std stdext; do - for classprefix in unordered hash; do - if test -z "$ac_cv_cxx_hash_map"; then - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#include <${location}${classprefix}_map>]], - [[${namespace}::${classprefix}_map<int, int> t]])], - [ac_cv_cxx_hash_map="<${location}${classprefix}_map>"; - ac_cv_cxx_hash_set="<${location}${classprefix}_set>"; - ac_cv_cxx_hash_namespace="$namespace"; - ac_cv_cxx_hash_map_class="${classprefix}_map"; - ac_cv_cxx_hash_set_class="${classprefix}_set"]) - - fi - done - done - done - - if test -n "$ac_cv_cxx_hash_map"; then - AC_DEFINE(HAVE_HASH_MAP, 1, [define if the compiler has hash_map]) - AC_DEFINE(HAVE_HASH_SET, 1, [define if the compiler has hash_set]) - AC_DEFINE_UNQUOTED(HASH_MAP_H,$ac_cv_cxx_hash_map, - [the location of <hash_map>]) - AC_DEFINE_UNQUOTED(HASH_SET_H,$ac_cv_cxx_hash_set, - [the location of <hash_set>]) - AC_DEFINE_UNQUOTED(HASH_NAMESPACE,$ac_cv_cxx_hash_namespace, - [the namespace of hash_map/hash_set]) - AC_DEFINE_UNQUOTED(HASH_MAP_CLASS,$ac_cv_cxx_hash_map_class, - [the classname of hash_map]) - AC_DEFINE_UNQUOTED(HASH_SET_CLASS,$ac_cv_cxx_hash_set_class, - [the classname of hash_set]) - AC_MSG_RESULT([$ac_cv_cxx_hash_map]) - else - AC_MSG_RESULT() - AC_MSG_WARN([could not find an STL hash_map]) - fi - AC_CACHE_CHECK( - [whether hash_map has rehash method], - [ac_cv_hash_map_has_rehash], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[ -#include HASH_MAP_H -using namespace HASH_NAMESPACE; - ]],[[ -HASH_MAP_CLASS<int, int> test_hash; -test_hash.rehash(100); - ]])], - [ac_cv_hash_map_has_rehash=yes], - [ac_cv_hash_map_has_rehash=no])]) - AS_IF([test $ac_cv_hash_map_has_rehash = yes],[ - AC_DEFINE(HASH_MAP_HAS_REHASH, 1, [if hash_map<> hash rehash method]) - ]) - AC_CACHE_CHECK( - [whether hash_map has resize method], - [ac_cv_hash_map_has_resize], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[ -#include HASH_MAP_H -using namespace HASH_NAMESPACE; - ]],[[ -HASH_MAP_CLASS<int, int> test_hash; -test_hash.resize(100); - ]])], - [ac_cv_hash_map_has_resize=yes], - [ac_cv_hash_map_has_resize=no])]) - AS_IF([test $ac_cv_hash_map_has_resize = yes],[ - AC_DEFINE(HASH_MAP_HAS_RESIZE, 1, [if hash_map<> hash resize method]) - ]) - AC_CACHE_CHECK( - [whether to redefine hash<string>], - [ac_cv_redefine_hash_string], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[ -#include HASH_SET_H -#include <string> -using namespace HASH_NAMESPACE; -using namespace std; - ]],[[ -string teststr("test"); -HASH_SET_CLASS<string> test_hash; -HASH_SET_CLASS<string>::iterator iter= test_hash.find(teststr); -if (iter != test_hash.end()) - return 1; +# wild. We define HAVE_UNORDERED_MAP and HAVE_UNORDERED_SET if we have +# them, UNORDERED_MAP_H and UNORDERED_SET_H to their location and +# UNORDERED_NAMESPACE to be the namespace unordered_map is defined in. + +AC_DEFUN([PANDORA_CXX_STL_UNORDERED],[ + save_CXXFLAGS="${CXXFLAGS}" + CXXFLAGS="${AM_CXXFLAGS} ${CXXFLAGS}" + AC_LANG_PUSH(C++) + AC_CACHE_CHECK([for STL unordered_map], + [pandora_cv_stl_unordered],[ + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include <unordered_map>]], + [[std::unordered_map<int, int> t]])], + [pandora_cv_stl_unordered="yes"], + [pandora_cv_stl_unordered="no"])]) + + AS_IF([test "x${pandora_cv_stl_unordered}" != "xyes"],[ + AC_CACHE_CHECK([for tr1 unordered_map], + [pandora_cv_tr1_unordered],[ + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ +/* We put in this define because of a YACC symbol clash in Drizzle. + Seriously... I cannot believe the GCC guys defined a piece of the internals + of this named IF - and I can't believe that YACC generates a token define + called IF. Really? +*/ +#define IF 21; +#include <tr1/unordered_map> + ]],[[ +std::tr1::unordered_map<int, int> t ]])], - [ac_cv_redefine_hash_string=no], - [ac_cv_redefine_hash_string=yes])]) - AS_IF([test $ac_cv_redefine_hash_string = yes],[ - AC_DEFINE(REDEFINE_HASH_STRING, 1, [if hash<string> needs to be defined]) - ]) - CXXFLAGS="${save_CXXFLAGS}" - AC_LANG_POP() + [pandora_cv_tr1_unordered="yes"], + [pandora_cv_tr1_unordered="no"])]) + ]) + + AS_IF([test "x${pandora_cv_stl_unordered}" != "xyes" -a "x${pandora_cv_tr1_unordered}" != "xyes"],[ + AC_CACHE_CHECK([for boost unordered_map], + [pandora_cv_boost_unordered],[ + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include <boost/unordered_map.hpp>]], + [[boost::unordered_map<int, int> t]])], + [pandora_cv_boost_unordered="yes"], + [pandora_cv_boost_unordered="no"])]) + ]) + + CXXFLAGS="${save_CXXFLAGS}" + AC_LANG_POP() + + AS_IF([test "x${pandora_cv_stl_unordered}" = "xyes"],[ + AC_DEFINE(HAVE_STD_UNORDERED_MAP, 1, + [if the compiler has std::unordered_map]) + AC_DEFINE(HAVE_STD_UNORDERED_SET, 1, + [if the compiler has std::unordered_set]) + pandora_has_unordered=yes + ]) + AS_IF([test "x${pandora_cv_tr1_unordered}" = "xyes"],[ + AC_DEFINE(HAVE_TR1_UNORDERED_MAP, 1, + [if the compiler has std::tr1::unordered_map]) + AC_DEFINE(HAVE_TR1_UNORDERED_SET, 1, + [if the compiler has std::tr1::unordered_set]) + pandora_has_unordered=yes + ]) + AS_IF([test "x${pandora_cv_boost_unordered}" = "xyes"],[ + AC_DEFINE(HAVE_BOOST_UNORDERED_MAP, 1, + [if the compiler has boost::unordered_map]) + AC_DEFINE(HAVE_BOOST_UNORDERED_SET, 1, + [if the compiler has boost::unordered_set]) + pandora_has_unordered=yes + ]) + + AS_IF([test "x${pandora_has_unordered}" != "xyes"],[ + AC_MSG_WARN([could not find an STL unordered_map]) + ]) +]) + +AC_DEFUN([PANDORA_HAVE_CXX_UNORDERED],[ + AC_REQUIRE([PANDORA_CXX_STL_UNORDERED]) +]) + +AC_DEFUN([PANDORA_REQUIRE_CXX_UNORDERED],[ + AC_REQUIRE([PANDORA_HAVE_CXX_UNORDERED]) + AS_IF([test "x${pandora_has_unordered}" != "xyes"],[ + AC_MSG_ERROR([An STL compliant unordered_map is required for ${PACKAGE}. + Implementations can be found in Recent versions of gcc and in boost]) + ]) ])
  38. Download patch m4/pandora_shared_ptr.m4

    --- 0.98-1.1/m4/pandora_shared_ptr.m4 2010-01-15 15:43:16.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_shared_ptr.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  39. Download patch m4/pandora_have_libreadline.m4

    --- 0.98-1.1/m4/pandora_have_libreadline.m4 2010-01-15 15:43:15.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libreadline.m4 2010-12-27 19:42:04.000000000 +0000 @@ -56,8 +56,8 @@ # # COPYLEFT # -# Copyright (c) 2009 Monty Taylor -# Copyright (c) 2002 Ville Laurikari <vl@iki.fi> +# Copyright (C) 2009 Monty Taylor +# Copyright (C) 2002 Ville Laurikari <vl@iki.fi> # # Copying and distribution of this file, with or without # modification, are permitted in any medium without royalty provided
  40. Download patch config/ltmain.sh

    --- 0.98-1.1/config/ltmain.sh 2010-01-18 01:52:26.000000000 +0000 +++ 0.171.1-0ubuntu2/config/ltmain.sh 2010-12-23 18:34:21.000000000 +0000 @@ -1,6 +1,6 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6 +# ltmain.sh (GNU libtool) 2.2.6b # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 +# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,9 +73,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.2.6 Debian-2.2.6a-4" +VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" TIMESTAMP="" -package_revision=1.3012 +package_revision=1.3017 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
  41. Download patch m4/pandora_platform.m4

    --- 0.98-1.1/m4/pandora_platform.m4 2010-01-15 15:43:15.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_platform.m4 2010-12-27 19:42:04.000000000 +0000 @@ -23,7 +23,7 @@ AC_DEFUN([PANDORA_PLATFORM],[ case "$host_os" in - *solaris*|*freebsd*) + *solaris*) AS_IF([test "x${ac_cv_env_CPPFLAGS_set}" = "x"],[ CPPFLAGS="${CPPFLAGS} -I/usr/local/include" ]) @@ -32,8 +32,19 @@ AC_DEFUN([PANDORA_PLATFORM],[ LDFLAGS="${LDFLAGS} -L/usr/local/lib" ]) ;; + *freebsd*) + AS_IF([test "x${ac_cv_env_CPPFLAGS_set}" = "x"],[ + CPPFLAGS="${CPPFLAGS} -isystem /usr/local/include" + ]) + + AS_IF([test "x${ac_cv_env_LDFLAGS_set}" = "x"],[ + LDFLAGS="${LDFLAGS} -L/usr/local/lib" + ]) + ;; esac + PANDORA_OPTIMIZE_BITFIELD=1 + case "$target_os" in *linux*) TARGET_LINUX="true" @@ -47,6 +58,8 @@ AC_DEFUN([PANDORA_PLATFORM],[ ;; *solaris*) TARGET_SOLARIS="true" + PANDORA_OPTIMIZE_BITFIELD=0 + AS_IF([test "x${USE_NLS}" = "xyes"],[LIBS="${LIBS} -lintl"]) AC_SUBST(TARGET_SOLARIS) AC_DEFINE([TARGET_OS_SOLARIS], [1], [Whether we are building for Solaris]) ;; @@ -56,9 +69,28 @@ AC_DEFUN([PANDORA_PLATFORM],[ AC_DEFINE([TARGET_OS_FREEBSD], [1], [Whether we are building for FreeBSD]) AC_DEFINE([__APPLE_CC__],[1],[Workaround for bug in FreeBSD headers]) ;; - *) + *mingw32*) + TARGET_WINDOWS="true" + AC_SUBST(TARGET_WINDOWS) + AC_DEFINE([TARGET_OS_WINDOWS], [1], [Whether we are building for Windows]) + AC_DEFINE([WINVER], [WindowsXP], [Version of Windows]) + AC_DEFINE([_WIN32_WINNT], [0x0501], [Magical number to make things work]) + AC_DEFINE([EAI_SYSTEM], [11], [Another magical number]) + AH_BOTTOM([ +#ifndef HAVE_SYS_SOCKET_H +# define SHUT_RD SD_RECEIVE +# define SHUT_WR SD_SEND +# define SHUT_RDWR SD_BOTH +#endif + ]) + + LIBS="$LIBS -lwsock32 -lws2_32" + AM_CFLAGS="${AM_CFLAGS} -I\${top_srcdir}/win32/mingw -I\${top_builddir}/win32/mingw -I\${top_srcdir}/win32 -I\${top_builddir}/win32" ;; esac + AM_CONDITIONAL(BUILD_WIN32, [test "x${TARGET_WINDOWS}" = "xtrue"]) + + AC_SUBST(PANDORA_OPTIMIZE_BITFIELD) AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) AC_CHECK_DECL([__ICC], [INTELCC="yes"], [INTELCC="no"])
  42. Download patch m4/pandora_have_libgearman.m4

    --- 0.98-1.1/m4/pandora_have_libgearman.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libgearman.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  43. Download patch m4/pandora_check_cxx_standard.m4

    --- 0.98-1.1/m4/pandora_check_cxx_standard.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_check_cxx_standard.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,10 +1,10 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([PANDORA_CHECK_CXX_STANDARD],[ - AC_REQUIRE([AC_CXX_COMPILE_STDCXX_0X]) + dnl AC_REQUIRE([AC_CXX_COMPILE_STDCXX_0X]) AS_IF([test "$GCC" = "yes"], [AS_IF([test "$ac_cv_cxx_compile_cxx0x_native" = "yes"],[], [AS_IF([test "$ac_cv_cxx_compile_cxx0x_gxx" = "yes"],
  44. Download patch m4/pandora_flex.m4

    --- 0.98-1.1/m4/pandora_flex.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_flex.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,33 @@ +dnl Copyright (C) 2010 Monty Taylor +dnl Copyright (C) 2010 Hartmut Holzgraefe +dnl This file is free software; Monty Taylor and Hartmut Holzgraefe +dnl give unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_FLEX],[ + + dnl -------------------------------------------------------------------- + dnl Check for flex + dnl -------------------------------------------------------------------- + + AC_CHECK_PROGS([LEX], ['flex'], [:]) + AS_IF([test "x$LEX" = "x:"],[ + pandora_have_flex=no + LEX='if test -f "$@"; then echo "WARNING: no proper flex binary found, ignoring changes to $<"; exit 0; else echo "ERROR: no proper flex binary found"; exit 1; fi;' + ],[ + pandora_have_flex=yes + ]) + + AM_CONDITIONAL(HAVE_FLEX, [test "x${pandora_have_flex}" = "xyes"]) +]) + +AC_DEFUN([PANDORA_HAVE_FLEX],[ + AC_REQUIRE([_PANDORA_SEARCH_FLEX]) +]) + +AC_DEFUN([PANDORA_REQUIRE_FLEX],[ + AC_REQUIRE([PANDORA_HAVE_FLEX]) + AS_IF([test "x${pandora_have_flex}" = "xno" -a "$pandora_building_from_bzr" = "yes"], + AC_MSG_ERROR(["flex is required for ${PACKAGE} to build from a bzr branch"]) + ) +])
  45. Download patch config/lcov.am

    --- 0.98-1.1/config/lcov.am 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/config/lcov.am 2010-12-10 20:26:03.000000000 +0000 @@ -0,0 +1,42 @@ +# Copyright (C) 2010 Hartmut Holzgraefe +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +LCOV = lcov +LCOV_GENHTML = genhtml + +lcov: lcov-html + +lcov-test: lcov-clean-data test + +drizzle_lcov.info: lcov-test + @echo "Generating $@" + $(LCOV) --directory . --capture --base-directory . --output-file $@ + $(LCOV) --remove $@ '/usr/include/*' --output-file $@ + $(LCOV) --remove $@ '/usr/local/include/*' --output-file $@ + @echo + +lcov-html: drizzle_lcov.info + @echo "Generating lcov HTML" + @$(LCOV_GENHTML) --legend --output-directory lcov_html/ --title "Drizzle Code Coverage" $< + +lcov-clean: + rm -f drizzle_lcov.info + rm -rf lcov_data/ + rm -rf lcov_html/ + +lcov-clean-data: + @find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f + +
  46. Download patch m4/pandora_optimize.m4

    --- 0.98-1.1/m4/pandora_optimize.m4 2010-01-15 15:43:15.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_optimize.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -22,25 +22,21 @@ AC_DEFUN([PANDORA_OPTIMIZE],[ dnl with using AC_CC_STD_C99 above CC="${CC} -std=gnu99" - AM_CPPFLAGS="-ggdb3 ${AM_CPPFLAGS}" + AM_CPPFLAGS="-g ${AM_CPPFLAGS}" DEBUG_CFLAGS="-O0" DEBUG_CXXFLAGS="-O0" - OPTIMIZE_CFLAGS="-O3" - OPTIMIZE_CXXFLAGS="-O3" + OPTIMIZE_CFLAGS="-O2" + OPTIMIZE_CXXFLAGS="-O2" ]) AS_IF([test "$INTELCC" = "yes"],[ - dnl Once we can use a modern autoconf, we can replace the std=gnu99 here - dnl with using AC_CC_STD_C99 above - CC="${CC} -std=c99" - AM_CPPFLAGS="-g ${AM_CPPFLAGS}" DEBUG_CFLAGS="-O0" DEBUG_CXXFLAGS="-O0" - OPTIMIZE_CFLAGS="-xHOST -O3 -no-prec-div -static" + OPTIMIZE_CFLAGS="-xHOST -O2 -no-prec-div -static" OPTIMIZE_CXXFLAGS="${OPTIMIZE_CFLAGS}" ])
  47. Download patch m4/pandora_libtool.m4

    --- 0.98-1.1/m4/pandora_libtool.m4 2010-01-15 15:43:15.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_libtool.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  48. Download patch m4/pandora_extensions.m4

    --- 0.98-1.1/m4/pandora_extensions.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_extensions.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  49. Download patch m4/ltsugar.m4

    --- 0.98-1.1/m4/ltsugar.m4 2010-01-18 01:52:27.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/ltsugar.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,123 +0,0 @@ -# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 6 ltsugar.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) - - -# lt_join(SEP, ARG1, [ARG2...]) -# ----------------------------- -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -# associated separator. -# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -# versions in m4sugar had bugs. -m4_define([lt_join], -[m4_if([$#], [1], [], - [$#], [2], [[$2]], - [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -m4_define([_lt_join], -[m4_if([$#$2], [2], [], - [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) - - -# lt_car(LIST) -# lt_cdr(LIST) -# ------------ -# Manipulate m4 lists. -# These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. -m4_define([lt_car], [[$1]]) -m4_define([lt_cdr], -[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], - [$#], 1, [], - [m4_dquote(m4_shift($@))])]) -m4_define([lt_unquote], $1) - - -# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -# ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -# Note that neither SEPARATOR nor STRING are expanded; they are appended -# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -# No SEPARATOR is output if MACRO-NAME was previously undefined (different -# than defined and empty). -# -# This macro is needed until we can rely on Autoconf 2.62, since earlier -# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -m4_define([lt_append], -[m4_define([$1], - m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) - - - -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -# ---------------------------------------------------------- -# Produce a SEP delimited list of all paired combinations of elements of -# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -# has the form PREFIXmINFIXSUFFIXn. -# Needed until we can rely on m4_combine added in Autoconf 2.62. -m4_define([lt_combine], -[m4_if(m4_eval([$# > 3]), [1], - [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -[[m4_foreach([_Lt_prefix], [$2], - [m4_foreach([_Lt_suffix], - ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, - [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) - - -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -# ----------------------------------------------------------------------- -# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -m4_define([lt_if_append_uniq], -[m4_ifdef([$1], - [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], - [lt_append([$1], [$2], [$3])$4], - [$5])], - [lt_append([$1], [$2], [$3])$4])]) - - -# lt_dict_add(DICT, KEY, VALUE) -# ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) - - -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -# -------------------------------------------- -m4_define([lt_dict_add_subkey], -[m4_define([$1($2:$3)], [$4])]) - - -# lt_dict_fetch(DICT, KEY, [SUBKEY]) -# ---------------------------------- -m4_define([lt_dict_fetch], -[m4_ifval([$3], - m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), - m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) - - -# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -# ----------------------------------------------------------------- -m4_define([lt_if_dict_fetch], -[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], - [$5], - [$6])]) - - -# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -# -------------------------------------------------------------- -m4_define([lt_dict_filter], -[m4_if([$5], [], [], - [lt_join(m4_quote(m4_default([$4], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), - [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -])
  50. Download patch m4/pandora_have_libdrizzle.m4

    --- 0.98-1.1/m4/pandora_have_libdrizzle.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libdrizzle.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -36,20 +36,26 @@ AC_DEFUN([PANDORA_HAVE_LIBDRIZZLE],[ AC_DEFUN([PANDORA_REQUIRE_LIBDRIZZLE],[ AC_REQUIRE([PANDORA_HAVE_LIBDRIZZLE]) - AS_IF([test "x${ac_cv_libdrizzle}" = "xno"], - AC_MSG_ERROR([libdrizzle is required for ${PACKAGE}])) + AS_IF([test "x${ac_cv_libdrizzle}" = "xno"],[ + AC_MSG_ERROR([libdrizzle is required for ${PACKAGE}]) + ],[ + dnl We need at least 0.8 on Solaris non-sparc + AS_IF([test "$target_cpu" != "sparc" -a "x${TARGET_SOLARIS}" = "xtrue"],[ + PANDORA_LIBDRIZZLE_RECENT + ]) + ]) ]) -AC_DEFUN([PANDORA_LIBDRIZZLE_NOVCOL],[ - AC_CACHE_CHECK([if libdrizzle still has virtual columns], - [pandora_cv_libdrizzle_vcol], +AC_DEFUN([PANDORA_LIBDRIZZLE_RECENT],[ + AC_CACHE_CHECK([if libdrizzle is recent enough], + [pandora_cv_libdrizzle_recent], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <libdrizzle/drizzle.h> -int foo= DRIZZLE_COLUMN_TYPE_DRIZZLE_VIRTUAL; +drizzle_con_options_t foo= DRIZZLE_CON_EXPERIMENTAL; ]])], - [pandora_cv_libdrizzle_vcol=yes], - [pandora_cv_libdrizzle_vcol=no])]) - AS_IF([test "$pandora_cv_libdrizzle_vcol" = "yes"],[ - AC_MSG_ERROR([Your version of libdrizzle is too old. ${PACKAGE} requires at least version 0.4]) + [pandora_cv_libdrizzle_recent=yes], + [pandora_cv_libdrizzle_recent=no])]) + AS_IF([test "$pandora_cv_libdrizzle_recent" = "no"],[ + AC_MSG_ERROR([Your version of libdrizzle is too old. ${PACKAGE} requires at least version 0.8]) ]) ])
  51. Download patch m4/libtool.m4
  52. Download patch m4/pandora_64bit.m4

    --- 0.98-1.1/m4/pandora_64bit.m4 2010-01-15 15:43:13.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_64bit.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  53. Download patch configure
  54. Download patch m4/pandora_run_cpplint.m4

    --- 0.98-1.1/m4/pandora_run_cpplint.m4 2010-01-15 15:43:15.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_run_cpplint.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  55. Download patch m4/pandora_have_libdl.m4

    --- 0.98-1.1/m4/pandora_have_libdl.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libdl.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  56. Download patch debian/watch

    --- 0.98-1.1/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/debian/watch 2010-12-10 20:37:53.000000000 +0000 @@ -0,0 +1,2 @@ +version=3 +http://launchpad.net/pandora-build/+download http://launchpad.net/pandora-build/.*/pandora-build-(.*)\.tar\.gz
  57. Download patch m4/pandora_have_libevent.m4

    --- 0.98-1.1/m4/pandora_have_libevent.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libevent.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  58. Download patch m4/pandora_have_libsqlite3.m4

    --- 0.98-1.1/m4/pandora_have_libsqlite3.m4 2010-01-15 15:43:15.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libsqlite3.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  59. Download patch m4/pandora_have_libpcre.m4

    --- 0.98-1.1/m4/pandora_have_libpcre.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libpcre.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  60. Download patch m4/pandora_have_libmysqlclient.m4

    --- 0.98-1.1/m4/pandora_have_libmysqlclient.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libmysqlclient.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,146 @@ +dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- +dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: +dnl +dnl Copyright (C) 2010 Monty Taylor +dnl This file is free software; Sun Microsystems +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl + +AC_DEFUN([PANDORA_WITH_MYSQL],[ + AC_ARG_WITH([mysql], + [AS_HELP_STRING([--with-mysql=PATH], + [path to mysql_config binary or mysql prefix dir])], + [with_mysql=$withval], + [with_mysql=":"]) + + dnl There are three possibilities: + dnl 1) nothing is given: we will search for mysql_config in PATH + dnl 2) the location of mysql_config is given: we'll use that to determine + dnl 3) a directory argument is given: that will be mysql_base + + + dnl option 1: nothing, we need to insert something into MYSQL_CONFIG + AS_IF([test "x$with_mysql" = "x:"],[ + AC_CHECK_PROGS(MYSQL_CONFIG,[mysql_config]) + ],[ + MYSQL_CONFIG="${with_mysql}" + ]) + + AC_CACHE_CHECK([for MySQL Base Location],[pandora_cv_mysql_base],[ + + dnl option 2: something in MYSQL_CONFIG now, use that to get a base dir + AS_IF([test -f "${MYSQL_CONFIG}" -a -x "${MYSQL_CONFIG}"],[ + pandora_cv_mysql_base=$(dirname $(MYSQL_CONFIG --include | sed 's/-I//')) + ],[ + dnl option 1: a directory + AS_IF([test -d $with_mysql],[pandora_cv_mysql_base=$with_mysql],[ + pandora_cv_mysql_base="not found" + ]) + ]) + ]) +]) + +AC_DEFUN([_PANDORA_SEARCH_LIBMYSQLCLIENT],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + AC_ARG_ENABLE([libmysqlclient], + [AS_HELP_STRING([--disable-libmysqlclient], + [Build with libmysqlclient support @<:@default=on@:>@])], + [ac_enable_libmysqlclient="$enableval"], + [ac_enable_libmysqlclient="yes"]) + + AS_IF([test "x$ac_enable_libmysqlclient" = "xyes"],[ + AC_LIB_HAVE_LINKFLAGS(mysqlclient_r,,[ +#include <mysql/mysql.h> + ],[ +MYSQL mysql; + ])],[ + ac_cv_libmysqlclient_r="no" + ]) + + AM_CONDITIONAL(HAVE_LIBMYSQLCLIENT, [test "x${ac_cv_libmysqlclient_r}" = "xyes"]) + +AC_DEFUN([PANDORA_HAVE_LIBMYSQLCLIENT],[ + AC_REQUIRE([_PANDORA_SEARCH_LIBMYSQLCLIENT]) +]) + +AC_DEFUN([PANDORA_REQUIRE_LIBMYSQLCLIENT],[ + AC_REQUIRE([PANDORA_HAVE_LIBMYSQLCLIENT]) + AS_IF([test "x${ac_cv_libmysqlclient_r}" = "xno"], + AC_MSG_ERROR([libmysqlclient_r is required for ${PACKAGE}])) +]) + + AS_IF([test "x$MYSQL_CONFIG" = "xISDIR"],[ + IBASE="-I${with_mysql}" + MYSQL_CONFIG="${with_mysql}/scripts/mysql_config" + ADDIFLAGS="$IBASE/include " + ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb/include/ndbapi " + ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb/include/mgmapi " + ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb/include " + LDFLAGS="-L${with_mysql}/storage/ndb/src/.libs -L${with_mysql}/libmysql_r/.libs/ -L${with_mysql}/mysys/.libs -L${with_mysql}/mysys -L${with_mysql}/strings/.libs -L${with_mysql}/strings " + ],[ + IBASE=`$MYSQL_CONFIG --include` + ADDIFLAGS="" + # add regular MySQL C flags + ADDCFLAGS=`$MYSQL_CONFIG --cflags` + # add NdbAPI specific C flags + LDFLAGS="$LDFLAGS "`$MYSQL_CONFIG --libs_r | sed 's/-lmysqlclient_r//'` + ]) + + + ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb" + ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb/ndbapi" + ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb/mgmapi" + ADDIFLAGS="$ADDIFLAGS $IBASE/ndb" + ADDIFLAGS="$ADDIFLAGS $IBASE/ndb/ndbapi" + ADDIFLAGS="$ADDIFLAGS $IBASE/ndb/mgmapi" + ADDIFLAGS="$ADDIFLAGS $IBASE" + + CFLAGS="$CFLAGS $ADDCFLAGS $ADDIFLAGS" + CXXFLAGS="$CXXFLAGS $ADDCFLAGS $ADDIFLAGS" + MYSQL_INCLUDES="$IBASE $ADDIFLAGS" + + + dnl AC_CHECK_LIB([mysqlclient_r],[safe_mutex_init],,[AC_MSG_ERROR([Can't link against libmysqlclient_r])]) + dnl First test to see if we can run with only ndbclient + AC_CHECK_LIB([ndbclient],[decimal_bin_size],,[dnl else + LDFLAGS="$LDFLAGS -lmysys -ldbug" + AC_CHECK_LIB([mysqlclient_r],[safe_mutex_init],,) + AC_CHECK_LIB([ndbclient],[ndb_init],,[ + AC_MSG_ERROR([Can't link against libndbclient])]) + AC_CHECK_LIB([mystrings],[decimal_bin_size],,[ + AC_MSG_ERROR([Can't find decimal_bin_size])])]) + AC_MSG_CHECKING(for NdbApi headers) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <NdbApi.hpp>]], [[int attr=NdbTransaction::Commit; ]])],[ndbapi_found="yes"],[]) + AS_IF([test "$ndbapi_found" = "yes"], + [AC_MSG_RESULT(found)], + [AC_MSG_ERROR([Couldn't find NdbApi.hpp!])]) + AC_MSG_CHECKING(for NDB_LE_ThreadConfigLoop) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <mgmapi.h>]], [[int attr=NDB_LE_ThreadConfigLoop; ]])],[have_cge63="yes"],[]) + AS_IF([test "$have_cge63" = "yes"], + [AC_MSG_RESULT(found) + HAVE_CGE63="-DCGE63" + AC_SUBST(HAVE_CGE63)], + [AC_MSG_RESULT(missing)]) + + LDFLAGS="$LDFLAGS $LIBS" + + + MYSQL_MAJOR_VERSION=`$MYSQL_CONFIG --version | sed -e 's/\.//g' -e 's/-//g' -e 's/[A-Za-z]//g' | cut -c1-2` + + case "$MYSQL_MAJOR_VERSION" in + 50) AC_DEFINE(MYSQL_50, [1], [mysql5.0]) + ;; + 51) AC_DEFINE(MYSQL_51, [1], [mysql5.1]) + ;; + *) echo "Unsupported version of MySQL Detected!" + ;; + esac + + AC_SUBST(MYSQL_MAJOR_VERSION) + AC_SUBST(MYSQL_CONFIG) + + +]) +
  61. Download patch m4/pandora_have_libboost_regex.m4

    --- 0.98-1.1/m4/pandora_have_libboost_regex.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libboost_regex.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,54 @@ +dnl Copyright (C) 2010 Andrew Hutchings +dnl This file is free software; Andrew Hutchings +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_BOOST_REGEX],[ + AC_REQUIRE([AC_LIB_PREFIX]) + AC_REQUIRE([ACX_PTHREAD]) + + dnl -------------------------------------------------------------------- + dnl Check for boost::regex + dnl -------------------------------------------------------------------- + + save_CFLAGS="${CFLAGS}" + save_CXXFLAGS="${CXXFLAGS}" + CFLAGS="${PTHREAD_CFLAGS} ${CFLAGS}" + CXXFLAGS="${PTHREAD_CFLAGS} ${CXXFLAGS}" + + AC_LANG_PUSH(C++) + AC_LIB_HAVE_LINKFLAGS(boost_regex-mt,,[ + #include <boost/regex.hpp> + ],[ + boost::regex test_regex("drizzle"); + ]) + AS_IF([test "x${ac_cv_libboost_regex_mt}" = "xno"],[ + AC_LIB_HAVE_LINKFLAGS(boost_regex,,[ + #include <boost/regex.hpp> + ],[ + boost::regex test_regex("drizzle"); + ]) + ]) + AC_LANG_POP() + CFLAGS="${save_CFLAGS}" + CXXFLAGS="${save_CXXFLAGS}" + + + AM_CONDITIONAL(HAVE_BOOST_REGEX, + [test "x${ac_cv_libboost_regex}" = "xyes" -o "x${ac_cv_libboost_regex_mt}" = "xyes"]) + BOOST_LIBS="${BOOST_LIBS} ${LTLIBBOOST_REGEX_MT} ${LTLIBBOOST_REGEX}" + AC_SUBST(BOOST_LIBS) +]) + +AC_DEFUN([PANDORA_HAVE_BOOST_REGEX],[ + PANDORA_HAVE_BOOST($1) + _PANDORA_SEARCH_BOOST_REGEX($1) +]) + +AC_DEFUN([PANDORA_REQUIRE_BOOST_REGEX],[ + PANDORA_REQUIRE_BOOST($1) + _PANDORA_SEARCH_BOOST_REGEX($1) + AS_IF([test "x${ac_cv_libboost_regex}" = "xno" -a "x${ac_cv_libboost_regex_mt}" = "xno"], + AC_MSG_ERROR([boost::regex is required for ${PACKAGE}])) +]) +
  62. Download patch config/autorun.sh

    --- 0.98-1.1/config/autorun.sh 2009-12-03 01:05:01.000000000 +0000 +++ 0.171.1-0ubuntu2/config/autorun.sh 2010-12-23 18:54:42.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2006 Jan Kneschke -# Copyright (c) 2009 Sun Microsystems +# Copyright (C) 2006 Jan Kneschke +# Copyright (C) 2009 Sun Microsystems, Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ die() { echo "$@"; exit 1; } LIBTOOLIZE_FLAGS=" --automake --copy --force" # --add-missing instructs automake to install missing auxiliary files # and --force to overwrite them if they already exist -AUTOMAKE_FLAGS="--add-missing --copy --force" +AUTOMAKE_FLAGS="--add-missing --copy --force --foreign" ACLOCAL_FLAGS="-I m4" ARGV0=$0
  63. Download patch m4/pandora_have_sasl.m4

    --- 0.98-1.1/m4/pandora_have_sasl.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_sasl.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,133 @@ +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_SASL],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for sasl + dnl -------------------------------------------------------------------- + AC_ARG_ENABLE([sasl], + [AS_HELP_STRING([--disable-sasl], + [Build with sasl support @<:@default=on@:>@])], + [ac_enable_sasl="$enableval"], + [ac_enable_sasl="yes"]) + + AS_IF([test "x$ac_enable_sasl" = "xyes"], + [ + AC_LIB_HAVE_LINKFLAGS(sasl,,[ + #include <stdlib.h> + #include <sasl/sasl.h> + ],[ + sasl_server_init(NULL, NULL); + ]) + + AS_IF([test "x${ac_cv_libsasl}" != "xyes" ], + [ + AC_LIB_HAVE_LINKFLAGS(sasl2,,[ + #include <stdlib.h> + #include <sasl/sasl.h> + ],[ + sasl_server_init(NULL, NULL); + ]) + HAVE_LIBSASL="$HAVE_LIBSASL2" + LIBSASL="$LIBSASL2" + LIBSASL_PREFIX="$LIBSASL2_PREFIX" + LTLIBSASL="$LT_LIBSASL2" + ]) + ]) + + AS_IF([test "x${ac_cv_libsasl}" = "xyes" -o "x${ac_cv_libsasl2}" = "xyes"], + [ac_cv_sasl=yes], + [ac_cv_sasl=no]) + + AM_CONDITIONAL(HAVE_LIBSASL, [test "x${ac_cv_libsasl}" = "xyes"]) + AM_CONDITIONAL(HAVE_LIBSASL2, [test "x${ac_cv_libsasl2}" = "xyes"]) + AM_CONDITIONAL(HAVE_SASL, [test "x${ac_cv_sasl}" = "xyes"]) +]) + +AC_DEFUN([PANDORA_HAVE_SASL],[ + AC_REQUIRE([_PANDORA_SEARCH_SASL]) +]) + +AC_DEFUN([PANDORA_REQUIRE_SASL],[ + AC_REQUIRE([_PANDORA_SEARCH_SASL]) + AS_IF([test "x${ac_cv_sasl}" = "xno"], + AC_MSG_ERROR([SASL (libsasl or libsasl2) is required for ${PACKAGE}])) +]) + +AC_DEFUN([_PANDORA_SEARCH_LIBSASL],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for libsasl + dnl -------------------------------------------------------------------- + + AC_ARG_ENABLE([libsasl], + [AS_HELP_STRING([--disable-libsasl], + [Build with libsasl support @<:@default=on@:>@])], + [ac_enable_libsasl="$enableval"], + [ac_enable_libsasl="yes"]) + + AS_IF([test "x$ac_enable_libsasl" = "xyes"],[ + AC_LIB_HAVE_LINKFLAGS(sasl,,[ + #include <stdlib.h> + #include <sasl/sasl.h> + ],[ + sasl_server_init(NULL, NULL); + ]) + ],[ + ac_cv_libsasl="no" + ]) + + AM_CONDITIONAL(HAVE_LIBSASL, [test "x${ac_cv_libsasl}" = "xyes"]) +]) + +AC_DEFUN([PANDORA_HAVE_LIBSASL],[ + AC_REQUIRE([_PANDORA_SEARCH_LIBSASL]) +]) + +AC_DEFUN([PANDORA_REQUIRE_LIBSASL],[ + AC_REQUIRE([_PANDORA_SEARCH_LIBSASL]) + AS_IF([test "x${ac_cv_libsasl}" = "xno"], + AC_MSG_ERROR([libsasl is required for ${PACKAGE}])) +]) + +AC_DEFUN([_PANDORA_SEARCH_LIBSASL2],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for libsasl2 + dnl -------------------------------------------------------------------- + + AC_ARG_ENABLE([libsasl2], + [AS_HELP_STRING([--disable-libsasl2], + [Build with libsasl2 support @<:@default=on@:>@])], + [ac_enable_libsasl2="$enableval"], + [ac_enable_libsasl2="yes"]) + + AS_IF([test "x$ac_enable_libsasl2" = "xyes"],[ + AC_LIB_HAVE_LINKFLAGS(sasl2,,[ + #include <stdlib.h> + #include <sasl2/sasl2.h> + ],[ + sasl2_server_init(NULL, NULL); + ]) + ],[ + ac_cv_libsasl2="no" + ]) + + AM_CONDITIONAL(HAVE_LIBSASL2, [test "x${ac_cv_libsasl2}" = "xyes"]) +]) + +AC_DEFUN([PANDORA_HAVE_LIBSASL2],[ + AC_REQUIRE([_PANDORA_SEARCH_LIBSASL2]) +]) + +AC_DEFUN([PANDORA_REQUIRE_LIBSASL2],[ + AC_REQUIRE([_PANDORA_SEARCH_LIBSASL2]) + AS_IF([test "x${ac_cv_libsasl2}" = "xno"], + AC_MSG_ERROR([libsasl2 is required for ${PACKAGE}])) +])
  64. Download patch m4/pandora_have_libtokyocabinet.m4

    --- 0.98-1.1/m4/pandora_have_libtokyocabinet.m4 2010-01-15 15:43:15.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libtokyocabinet.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -22,8 +22,10 @@ AC_DEFUN([_PANDORA_SEARCH_LIBTOKYOCABINE AS_IF([test "x$ac_enable_libtokyocabinet" = "xyes"],[ AC_LIB_HAVE_LINKFLAGS(tokyocabinet,,[ #include <tcutil.h> +#include <tcadb.h> ],[ const char *test= tcversion; +bool ret= tcadboptimize(NULL, "params"); ]) ],[ ac_cv_libtokyocabinet="no" @@ -31,11 +33,11 @@ const char *test= tcversion; AS_IF([test "${ac_cv_libtokyocabinet}" = "no" -a "${ac_enable_libtokyocabinet}" = "yes"],[ - PKG_CHECK_MODULES([LIBTOKYOCABINET], [libtokyocabinet], [ + PKG_CHECK_MODULES([LIBTOKYOCABINET], [libtokyocabinet >= 1.4.15], [ ac_cv_libtokyocabinet=yes LTLIBTOKYOCABINET=${LIBTOKYOCABINET_LIBS} LIBTOKYOCABINET=${LIBTOKYOCABINET_LIBS} - ],[]) + ],[test x = y]) ]) AM_CONDITIONAL(HAVE_LIBTOKYOCABINET, [test "${ac_cv_libtokyocabinet}" = "yes"])
  65. Download patch m4/pandora_have_libpq.m4

    --- 0.98-1.1/m4/pandora_have_libpq.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libpq.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  66. Download patch m4/pandora_have_libhashkit.m4

    --- 0.98-1.1/m4/pandora_have_libhashkit.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libhashkit.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,42 @@ +dnl Copyright (C) 2010 NorthScale +dnl This file is free software; NorthScale +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_LIBHASHKIT],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for libhashkit + dnl -------------------------------------------------------------------- + + AC_ARG_ENABLE([libhashkit], + [AS_HELP_STRING([--disable-libhashkit], + [Build with libhashkit support @<:@default=on@:>@])], + [ac_enable_libhashkit="$enableval"], + [ac_enable_libhashkit="yes"]) + + AS_IF([test "x$ac_enable_libhashkit" = "xyes"],[ + AC_LIB_HAVE_LINKFLAGS(hashkit,,[ + #include <libhashkit/hashkit.h> + ],[ + hashkit_st foo; + hashkit_st *kit = hashkit_create(&foo); + hashkit_free(kit); + ]) + ],[ + ac_cv_libhashkit="no" + ]) + + AM_CONDITIONAL(HAVE_LIBHASHKIT, [test "x${ac_cv_libhashkit}" = "xyes"]) +]) + +AC_DEFUN([PANDORA_HAVE_LIBHASHKIT],[ + AC_REQUIRE([_PANDORA_SEARCH_LIBHASHKIT]) +]) + +AC_DEFUN([PANDORA_REQUIRE_LIBHASHKIT],[ + AC_REQUIRE([PANDORA_HAVE_LIBHASHKIT]) + AS_IF([test x$ac_cv_libhashkit = xno], + AC_MSG_ERROR([libhashkit is required for ${PACKAGE}])) +])
  67. Download patch m4/pandora_have_libhaildb.m4

    --- 0.98-1.1/m4/pandora_have_libhaildb.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libhaildb.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,43 @@ +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_LIBHAILDB],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for libhaildb + dnl -------------------------------------------------------------------- + + AC_ARG_ENABLE([libhaildb], + [AS_HELP_STRING([--disable-libhaildb], + [Build with libhaildb support @<:@default=on@:>@])], + [ac_enable_libhaildb="$enableval"], + [ac_enable_libhaildb="yes"]) + + + AS_IF([test "x$ac_enable_libhaildb" = "xyes"],[ + AC_LIB_HAVE_LINKFLAGS(haildb,,[ + #include <haildb.h> + ],[ + ib_set_panic_handler(NULL); + ]) + AS_IF([test "x${ac_cv_libhaildb}" = "xyes"],[ + AC_DEFINE([HAVE_HAILDB_H],[1],[Do we have haildb.h]) + ]) + ],[ + ac_cv_libhaildb="no" + ]) + AM_CONDITIONAL(HAVE_LIBHAILDB, [test "x${ac_cv_libhaildb}" = "xyes"]) +]) + +AC_DEFUN([PANDORA_HAVE_LIBHAILDB],[ + AC_REQUIRE([_PANDORA_SEARCH_LIBHAILDB]) +]) + +AC_DEFUN([PANDORA_REQUIRE_LIBHAILDB],[ + AC_REQUIRE([PANDORA_HAVE_LIBHAILDB]) + AS_IF([test "x${ac_cv_libhaildb}" = "xno"], + AC_MSG_ERROR([libhaildb 2.2.0 or later is required for ${PACKAGE}])) +])
  68. Download patch aclocal.m4
  69. Download patch m4/pandora_have_libcurl.m4

    --- 0.98-1.1/m4/pandora_have_libcurl.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libcurl.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,62 @@ +dnl Copyright (C) 2010 Monty Taylor +dnl This file is free software; Monty Taylor +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_LIBCURL],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for libcurl + dnl -------------------------------------------------------------------- + + AC_ARG_ENABLE([libcurl], + [AS_HELP_STRING([--disable-libcurl], + [Build with libcurl support @<:@default=on@:>@])], + [ac_enable_libcurl="$enableval"], + [ac_enable_libcurl="yes"]) + + AS_IF([test "x$ac_enable_libcurl" = "xyes"],[ + AC_LIB_HAVE_LINKFLAGS(curl,, + [#include <curl/curl.h>], + [ + CURL *handle; + handle=curl_easy_init(); + ]) + ],[ + ac_cv_libcurl="no" + ]) + + AC_CACHE_CHECK([if libcurl has CURLOPT_USERNAME], + [pandora_cv_curl_have_username],[ + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [[ + CURL *handle; + handle=curl_easy_init(); + rv= curl_easy_setopt(curl_handle, CURLOPT_USERNAME, "foo"); + ]])], + [pandora_cv_curl_have_username=yes], + [pandora_cv_curl_have_username=no]) + ]) + + AM_CONDITIONAL(HAVE_LIBCURL,[test "x${ac_cv_libcurl}" = "xyes"]) + AS_IF([test "x$pandora_cv_curl_have_username" = "xyes"], + AC_DEFINE([HAVE_CURLOPT_USERNAME],[1], + [Does libcurl provide the CURLOPT_USERNAME constant])) + +]) + +AC_DEFUN([PANDORA_HAVE_LIBCURL],[ + AC_REQUIRE([_PANDORA_SEARCH_LIBCURL]) + AS_IF([test "x${ac_cv_libcurl}" = "xno"],[ + AC_MSG_WARN([libcurl development lib not found. On Debian this is found in libcurl4-gnutls-dev. On RHEL5/Fedora11 it's in curl-devel. On RHEL6/Fedora12 it's in libcurl-devel.]) + ]) +]) + +AC_DEFUN([PANDORA_REQUIRE_LIBCURL],[ + PANDORA_HAVE_LIBCURL($1) + AS_IF([test "x${ac_cv_libcurl}" = "xno"],[ + AC_MSG_ERROR([libcurl is required for ${PACKAGE}]) + ]) +])
  70. Download patch m4/pandora_have_better_malloc.m4

    --- 0.98-1.1/m4/pandora_have_better_malloc.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_better_malloc.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,11 +1,9 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([PANDORA_HAVE_BETTER_MALLOC],[ - AC_REQUIRE([AC_FUNC_MALLOC]) - AC_REQUIRE([AC_FUNC_REALLOC]) AC_REQUIRE([AC_LIB_PREFIX]) AC_ARG_ENABLE([umem],
  71. Download patch m4/pandora_have_thrift.m4

    --- 0.98-1.1/m4/pandora_have_thrift.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_thrift.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,45 @@ +dnl Copyright (C) 2010 Padraig O'Sullivan +dnl This file is free software; Padraig O'Sullivan +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_THRIFT],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for thrift + dnl -------------------------------------------------------------------- + + AC_ARG_ENABLE([thrift], + [AS_HELP_STRING([--disable-thrift], + [Build with thrift support @<:@default=on@:>@])], + [ac_enable_thrift="$enableval"], + [ac_enable_thrift="yes"]) + + AS_IF([test "x$ac_enable_thrift" = "xyes"],[ + AC_LANG_PUSH(C++) + AC_LIB_HAVE_LINKFLAGS(thrift,,[ + #include <thrift/Thrift.h> + ],[ + apache::thrift::TOutput test_output; + ]) + AC_LANG_POP() + ],[ + ac_cv_thrift="no" + ]) + + AM_CONDITIONAL(HAVE_THRIFT, [test "x${ac_cv_thrift}" = "xyes"]) + +]) + +AC_DEFUN([PANDORA_HAVE_THRIFT],[ + AC_REQUIRE([_PANDORA_SEARCH_THRIFT]) +]) + +AC_DEFUN([PANDORA_REQUIRE_THRIFT],[ + AC_REQUIRE([PANDORA_HAVE_THRIFT]) + AS_IF([test x$ac_cv_thrift= xno],[ + AC_MSG_ERROR([thrift required for ${PACKAGE}]) + ]) +]) +
  72. Download patch m4/pandora_have_boost.m4

    --- 0.98-1.1/m4/pandora_have_boost.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_boost.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,93 @@ +dnl Copyright (C) 2010 Monty Taylor +dnl This file is free software; Monty Taylor +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_BOOST],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for boost + dnl -------------------------------------------------------------------- + + AC_ARG_ENABLE([boost], + [AS_HELP_STRING([--disable-boost], + [Build with boost support @<:@default=on@:>@])], + [ac_enable_boost="$enableval"], + [ac_enable_boost="yes"]) + + AS_IF([test "x$ac_enable_boost" = "xyes"],[ + dnl link against libc because we're just looking for headers here + AC_LANG_PUSH(C++) + AC_LIB_HAVE_LINKFLAGS(c,, + [#include <boost/pool/pool.hpp>], + [boost::pool<> test_pool(1);], + [system]) + AC_LANG_POP() + ],[ + ac_cv_boost="no" + ]) + + + AS_IF([test "x$1" != "x"],[ + AC_CACHE_CHECK([if boost is recent enough], + [pandora_cv_recent_boost],[ + pandora_need_boost_version=`echo "$1" | perl -nle '/(\d+)\.(\d+)/; printf "%d%0.3d00", $[]1, $[]2 ;'` + AS_IF([test "x${pandora_need_boost_version}" = "x000000"],[ + pandora_cv_recent_boost=yes + ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include <boost/version.hpp> + +#if BOOST_VERSION < ${pandora_need_boost_version} +# error boost too old! +#endif + ]],[[]]) + ],[ + pandora_cv_recent_boost=yes + ],[ + pandora_cv_recent_boost=no + ]) + ]) + ]) + AS_IF([test "x${pandora_cv_recent_boost}" = "xno"],[ + ac_cv_boost=no + ]) + ]) + + AS_IF([test "x${ac_gcc_profile_mode}" = "xyes"],[ + AC_CACHE_CHECK([if boost is recent enough for GCC Profile Mode], + [pandora_cv_boost_profile],[ + pandora_need_boost_version=104300 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include <boost/version.hpp> + +#if BOOST_VERSION < ${pandora_need_boost_version} +# error boost too old! +#endif + ]],[[]]) + ],[ + pandora_cv_boost_profile=yes + ],[ + pandora_cv_boost_profile=no + ]) + ]) + AS_IF([test "x${pandora_cv_boost_profile}" = "xyes"],[ + AC_DEFINE([BOOST_DETAIL_NO_CONTAINER_FWD],[1],[Disable forward decl of stl in boost]) + ]) + ]) + + AM_CONDITIONAL(HAVE_BOOST, [test "x${ac_cv_boost}" = "xyes"]) + +]) + +AC_DEFUN([PANDORA_HAVE_BOOST],[ + _PANDORA_SEARCH_BOOST($1) +]) + +AC_DEFUN([PANDORA_REQUIRE_BOOST],[ + PANDORA_HAVE_BOOST($1) + AS_IF([test x$ac_cv_boost = xno], + AC_MSG_ERROR([boost is required for ${PACKAGE}])) +]) +
  73. Download patch m4/pandora_use_pipe.m4

    --- 0.98-1.1/m4/pandora_use_pipe.m4 2010-01-15 15:43:16.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_use_pipe.m4 2010-12-27 19:42:04.000000000 +0000 @@ -16,7 +16,7 @@ AC_DEFUN([PANDORA_USE_PIPE],[ AS_IF([test "$GCC" = "yes"],[ AC_CACHE_CHECK([for working -pipe], [pandora_cv_use_pipe], [ - AC_RUN_IFELSE([AC_LANG_SOURCE([[ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ #include <stdio.h> int main(int argc, char** argv)
  74. Download patch m4/pandora_python3_devel.m4

    --- 0.98-1.1/m4/pandora_python3_devel.m4 2010-01-15 15:43:15.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_python3_devel.m4 2010-12-27 19:42:04.000000000 +0000 @@ -4,12 +4,12 @@ dnl dnl pandora-build: A pedantic build system dnl dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de> -dnl Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca> -dnl Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net> -dnl Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za> -dnl Copyright (c) 2008 Matteo Settenvini <matteo@member.fsf.org> -dnl Copyright (c) 2008 Horst Knorr <hk_classes@knoda.org> +dnl Copyright (C) 2008 Sebastian Huber <sebastian-huber@web.de> +dnl Copyright (C) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca> +dnl Copyright (C) 2008 Rafael Laboissiere <rafael@laboissiere.net> +dnl Copyright (C) 2008 Andrew Collier <colliera@ukzn.ac.za> +dnl Copyright (C) 2008 Matteo Settenvini <matteo@member.fsf.org> +dnl Copyright (C) 2008 Horst Knorr <hk_classes@knoda.org> dnl dnl This program is free software: you can redistribute it and/or modify it dnl under the terms of the GNU General Public License as published by the
  75. Download patch m4/pandora_cxx_demangle.m4

    --- 0.98-1.1/m4/pandora_cxx_demangle.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_cxx_demangle.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  76. Download patch .pc/.quilt_patches

    --- 0.98-1.1/.pc/.quilt_patches 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/.pc/.quilt_patches 2015-09-15 17:07:44.227169620 +0000 @@ -0,0 +1 @@ +debian/patches
  77. Download patch m4/pandora_plugins.m4

    --- 0.98-1.1/m4/pandora_plugins.m4 2010-01-15 15:43:15.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_plugins.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl-------------------------------------------------------------------- @@ -24,14 +24,23 @@ AC_DEFUN([PANDORA_PLUGINS],[ dnl Add code here to read set plugin lists and set drizzled_default_plugin_list pandora_builtin_list=`echo $pandora_builtin_list | sed 's/, *$//'` - AS_IF([test "x$pandora_builtin_list" = "x"], pandora_builtin_list="NULL") + pandora_builtin_symbols_list=`echo $pandora_builtin_symbols_list | sed 's/, *$//'` + pandora_builtin_load_list=`echo $pandora_builtin_load_list | sed 's/, *$//'` + pandora_builtin_load_symbols_list=`echo $pandora_builtin_load_symbols_list | sed 's/, *$//'` + AS_IF([test "x$pandora_builtin_symbols_list" = "x"], pandora_builtin_symbols_list="NULL") + AS_IF([test "x$pandora_builtin_load_symbols_list" = "x"], pandora_builtin_load_symbols_list="NULL") AC_SUBST([PANDORA_BUILTIN_LIST],[$pandora_builtin_list]) + AC_SUBST([PANDORA_BUILTIN_SYMBOLS_LIST],[$pandora_builtin_symbols_list]) + AC_SUBST([PANDORA_BUILTIN_LOAD_LIST],[$pandora_builtin_load_list]) + AC_SUBST([PANDORA_BUILTIN_LOAD_SYMBOLS_LIST],[$pandora_builtin_load_symbols_list]) AC_SUBST([PANDORA_PLUGIN_LIST],[$pandora_default_plugin_list]) m4_ifval(m4_normalize([$1]),[ AC_CONFIG_FILES($*) ],[ - AC_DEFINE_UNQUOTED([PANDORA_BUILTIN_LIST],[$pandora_builtin_list], + AC_DEFINE_UNQUOTED([PANDORA_BUILTIN_LIST],["$pandora_builtin_list"], [List of plugins to be built in]) + AC_DEFINE_UNQUOTED([PANDORA_BUILTIN_SYMBOLS_LIST],["$pandora_builtin_symbols_list"], + [List of builtin plugin symbols to be built in]) AC_DEFINE_UNQUOTED([PANDORA_PLUGIN_LIST],["$pandora_default_plugin_list"], [List of plugins that should be loaded on startup if no value is given for --plugin-load]) @@ -45,7 +54,7 @@ AC_DEFUN([PANDORA_PLUGINS],[ AC_SUBST(pandora_plugin_defs) AC_SUBST(PANDORA_PLUGIN_DEP_LIBS) - AC_SUBST(pkgplugindir,"\$(pkglibdir)/plugin") + AC_SUBST(pkgplugindir,"\$(pkglibdir)") ]) AC_DEFUN([PANDORA_ADD_PLUGIN_DEP_LIB],[
  78. Download patch m4/pandora_have_libuuid.m4

    --- 0.98-1.1/m4/pandora_have_libuuid.m4 2010-01-15 15:43:15.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libuuid.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  79. Download patch m4/pandora_compile_stdcxx_0x.m4

    --- 0.98-1.1/m4/pandora_compile_stdcxx_0x.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_compile_stdcxx_0x.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,103 @@ +# =========================================================================== +# http://autoconf-archive.cryp.to/ac_cxx_compile_stdcxx_0x.html +# =========================================================================== +# +# SYNOPSIS +# +# AC_CXX_COMPILE_STDCXX_0X +# +# DESCRIPTION +# +# Check for baseline language coverage in the compiler for the C++0x +# standard. +# +# LICENSE +# +# Copyright (C) 2008 Benjamin Kosnik <bkoz@redhat.com> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + +AC_DEFUN([AC_CXX_COMPILE_STDCXX_0X], [ + AC_CACHE_CHECK(if g++ supports C++0x features without additional flags, + ac_cv_cxx_compile_cxx0x_native, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ + template <typename T> + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + typedef check<check<bool>> right_angle_brackets; + + int a; + decltype(a) b; + + typedef check<int> check_type; + check_type c; + check_type&& cr = c;],, + ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no) + AC_LANG_RESTORE + ]) + + AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x, + ac_cv_cxx_compile_cxx0x_cxx, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -std=c++0x" + AC_TRY_COMPILE([ + template <typename T> + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + typedef check<check<bool>> right_angle_brackets; + + int a; + decltype(a) b; + + typedef check<int> check_type; + check_type c; + check_type&& cr = c;],, + ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no) + CXXFLAGS="$ac_save_CXXFLAGS" + AC_LANG_RESTORE + ]) + + AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x, + ac_cv_cxx_compile_cxx0x_gxx, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -std=gnu++0x" + AC_TRY_COMPILE([ + template <typename T> + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + typedef check<check<bool>> right_angle_brackets; + + int a; + decltype(a) b; + + typedef check<int> check_type; + check_type c; + check_type&& cr = c;],, + ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no) + CXXFLAGS="$ac_save_CXXFLAGS" + AC_LANG_RESTORE + ]) + + if test "$ac_cv_cxx_compile_cxx0x_native" = yes || + test "$ac_cv_cxx_compile_cxx0x_cxx" = yes || + test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then + AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ]) + fi +])
  80. Download patch m4/ltoptions.m4
  81. Download patch Makefile.am

    --- 0.98-1.1/Makefile.am 2010-01-18 19:48:40.000000000 +0000 +++ 0.171.1-0ubuntu2/Makefile.am 2010-12-23 18:58:33.000000000 +0000 @@ -7,23 +7,28 @@ ACLOCAL_AMFLAGS= -I m4 -pandoradir= $(datadir)/pandora-build -pandora_DATA= \ +nobase_pkgdata_DATA= \ config/autorun.sh \ config/config.rpath \ + config/lcov.am \ config/pandora-plugin \ + config/pandora-plugin.ini \ config/uncrustify.cfg \ m4/lib-ld.m4 \ m4/lib-link.m4 \ m4/lib-prefix.m4 + aclocaldir= $(datadir)/aclocal aclocal_DATA= \ m4/pandora_64bit.m4 \ + m4/pandora_bison.m4 \ m4/pandora_canonical.m4 \ m4/pandora_check_compiler_version.m4 \ m4/pandora_check_cxx_standard.m4 \ m4/pandora_cinttypes.m4 \ + m4/pandora_clock_gettime.m4 \ + m4/pandora_compile_stdcxx_0x.m4 \ m4/pandora_cstdint.m4 \ m4/pandora_cxx_demangle.m4 \ m4/pandora_drizzle_build.m4 \ @@ -31,26 +36,47 @@ aclocal_DATA= \ m4/pandora_ensure_gcc_version.m4 \ m4/pandora_extensions.m4 \ m4/pandora_fdatasync.m4 \ + m4/pandora_flex.m4 \ m4/pandora_have_better_malloc.m4 \ + m4/pandora_have_boost.m4 \ m4/pandora_have_gcc_atomics.m4 \ - m4/pandora_have_innodb.m4 \ m4/pandora_have_libavahi.m4 \ m4/pandora_have_libbdb.m4 \ + m4/pandora_have_libboost_date_time.m4 \ + m4/pandora_have_libboost_filesystem.m4 \ + m4/pandora_have_libboost_iostreams.m4 \ + m4/pandora_have_libboost_options.m4 \ + m4/pandora_have_libboost_regex.m4 \ + m4/pandora_have_libboost_thread.m4 \ + m4/pandora_have_libcassandra.m4 \ + m4/pandora_have_libcurl.m4 \ m4/pandora_have_libdl.m4 \ m4/pandora_have_libdrizzle.m4 \ m4/pandora_have_libevent.m4 \ m4/pandora_have_libgearman.m4 \ + m4/pandora_have_libgtest.m4 \ + m4/pandora_have_libhaildb.m4 \ + m4/pandora_have_libhashkit.m4 \ + m4/pandora_have_libldap.m4 \ m4/pandora_have_libmemcached.m4 \ + m4/pandora_have_libmysqlclient.m4 \ + m4/pandora_have_libndbclient.m4 \ m4/pandora_have_libpcre.m4 \ m4/pandora_have_libpq.m4 \ + m4/pandora_have_libpqxx.m4 \ m4/pandora_have_libreadline.m4 \ m4/pandora_have_libsqlite3.m4 \ m4/pandora_have_libtokyocabinet.m4 \ m4/pandora_have_libuuid.m4 \ + m4/pandora_have_libvbucket.m4 \ m4/pandora_have_libxml2.m4 \ m4/pandora_have_libz.m4 \ m4/pandora_have_protobuf.m4 \ + m4/pandora_have_sasl.m4 \ + m4/pandora_have_thrift.m4 \ m4/pandora_header_assert.m4 \ + m4/pandora_header_stdcxx_98.m4 \ + m4/pandora_intltool.m4 \ m4/pandora_libtool.m4 \ m4/pandora_optimize.m4 \ m4/pandora_platform.m4 \ @@ -61,7 +87,6 @@ aclocal_DATA= \ m4/pandora_run_cpplint.m4 \ m4/pandora_sasl.m4 \ m4/pandora_shared_ptr.m4 \ - m4/pandora_stack_direction.m4 \ m4/pandora_stl_hash.m4 \ m4/pandora_swig.m4 \ m4/pandora_use_pipe.m4 \ @@ -69,15 +94,79 @@ aclocal_DATA= \ m4/pandora_version.m4 \ m4/pandora_visibility.m4 \ m4/pandora_warnings.m4 \ - m4/pandora_with_gettext.m4 \ m4/pandora_with_lua.m4 \ m4/pandora_with_memcached.m4 \ m4/pandora_with_perl.m4 \ m4/pandora_with_php.m4 \ - m4/pandora_with_python3.m4 \ m4/pandora_with_python.m4 \ + m4/pandora_with_python3.m4 \ m4/pandora_with_r.m4 \ m4/pandora_with_ruby.m4 +nobase_data_DATA= \ + quickly/templates/pandora-build-c/commandsconfig \ + quickly/templates/pandora-build-c/project_root/AUTHORS \ + quickly/templates/pandora-build-c/project_root/config/pandora-plugin.ini \ + quickly/templates/pandora-build-c/project_root/configure.ac \ + quickly/templates/pandora-build-c/project_root/docs/Doxyfile \ + quickly/templates/pandora-build-c/project_root/docs/header.html.in \ + quickly/templates/pandora-build-c/project_root/project_name/project_name.c \ + quickly/templates/pandora-build-c/project_root/project_name/project_name.h \ + quickly/templates/pandora-build-c/project_root/project_name/test/basic.c \ + quickly/templates/pandora-build-c/project_root/project_name/visibility.h \ + quickly/templates/pandora-build-c/project_root/test_run.sh \ + quickly/templates/pandora-build-c/project_root/valgrind.suppressions \ + quickly/templates/pandora-build-c/project_root_application/Makefile.am \ + quickly/templates/pandora-build/add.py \ + quickly/templates/pandora-build/commandsconfig \ + quickly/templates/pandora-build/create.py \ + quickly/templates/pandora-build/drizzle_plugin/AUTHORS \ + quickly/templates/pandora-build/drizzle_plugin/module.cc \ + quickly/templates/pandora-build/drizzle_plugin/plugin.ini \ + quickly/templates/pandora-build/drizzle_plugin/project_name.cc \ + quickly/templates/pandora-build/drizzle_plugin/project_name.h \ + quickly/templates/pandora-build/drizzle_plugin/tests/r/basic.result \ + quickly/templates/pandora-build/drizzle_plugin/tests/t/basic.test \ + quickly/templates/pandora-build/drizzle_plugin/tests/t/master.opt \ + quickly/templates/pandora-build/internal/__init__.py \ + quickly/templates/pandora-build/internal/apportutils.py \ + quickly/templates/pandora-build/internal/available_licenses/header_Apache-2.0 \ + quickly/templates/pandora-build/internal/available_licenses/header_BSD \ + quickly/templates/pandora-build/internal/available_licenses/header_GPL-2 \ + quickly/templates/pandora-build/internal/available_licenses/header_GPL-3 \ + quickly/templates/pandora-build/internal/available_licenses/header_LGPL-2 \ + quickly/templates/pandora-build/internal/available_licenses/header_LGPL-3 \ + quickly/templates/pandora-build/internal/available_licenses/header_MIT \ + quickly/templates/pandora-build/internal/bzrutils.py \ + quickly/templates/pandora-build/internal/createoradd.py \ + quickly/templates/pandora-build/internal/launchpad_helper.py \ + quickly/templates/pandora-build/internal/licensing.py \ + quickly/templates/pandora-build/internal/naming.py \ + quickly/templates/pandora-build/internal/packaging.py \ + quickly/templates/pandora-build/internal/pandoramacros.py \ + quickly/templates/pandora-build/internal/quicklyutils.py \ + quickly/templates/pandora-build/license.py \ + quickly/templates/pandora-build/project_root/AUTHORS \ + quickly/templates/pandora-build/project_root/config/pandora-plugin.ini \ + quickly/templates/pandora-build/project_root/configure.ac \ + quickly/templates/pandora-build/project_root/docs/Doxyfile \ + quickly/templates/pandora-build/project_root/docs/header.html.in \ + quickly/templates/pandora-build/project_root/project_name/class_name.cc \ + quickly/templates/pandora-build/project_root/project_name/class_name.h \ + quickly/templates/pandora-build/project_root/project_name/test/basic.cc \ + quickly/templates/pandora-build/project_root/project_name/visibility.h \ + quickly/templates/pandora-build/project_root/test_run.sh \ + quickly/templates/pandora-build/project_root/valgrind.suppressions \ + quickly/templates/pandora-build/project_root_application/Makefile.am \ + quickly/templates/pandora-build/project_root_application/bin/project_name.cc \ + quickly/templates/pandora-build/project_root_library/Makefile.am \ + quickly/templates/pandora-build/run.py \ + quickly/templates/pandora-build/tutorial.py \ + quickly/templates/pandora-build/upgrade.py \ + quickly/templates/pandora-build-c/project_root_application/bin/project_name.c \ + quickly/templates/pandora-build-c/project_root_library/Makefile.am + +install-data-hook: + -chmod ugo+x $(DESTDIR)$(datadir)/quickly/templates/pandora-build/*py -EXTRA_DIST= ${aclocal_DATA} ${pandora_DATA} +EXTRA_DIST= ${aclocal_DATA} ${nobase_pkgdata_DATA} ${nobase_data_DATA}
  82. Download patch m4/pandora_vc_build.m4
  83. Download patch m4/pandora_have_libmemcached.m4

    --- 0.98-1.1/m4/pandora_have_libmemcached.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libmemcached.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -24,6 +24,11 @@ AC_DEFUN([_PANDORA_SEARCH_LIBMEMCACHED], memcached_dump_func *df; memcached_lib_version(); ]) + ],[ + ac_cv_libmemcached="no" + ]) + + AS_IF([test "x$ac_enable_libmemcached" = "xyes"],[ AC_LIB_HAVE_LINKFLAGS(memcachedprotocol,,[ #include <libmemcached/protocol_handler.h> ],[ @@ -31,7 +36,7 @@ AC_DEFUN([_PANDORA_SEARCH_LIBMEMCACHED], protocol_handle= memcached_protocol_create_instance(); ]) ],[ - ac_cv_libmemcached="no" + ac_cv_libmemcachedprotocol="no" ]) AC_CACHE_CHECK([if libmemcached has memcached_server_fn], @@ -42,21 +47,60 @@ memcached_server_fn callbacks[1]; ]])], [pandora_cv_libmemcached_server_fn=yes], [pandora_cv_libmemcached_server_fn=no])]) + AS_IF([test "x$pandora_cv_libmemcached_server_fn" = "xyes"],[ AC_DEFINE([HAVE_MEMCACHED_SERVER_FN],[1],[If we have the new memcached_server_fn typedef]) ]) +]) + +AC_DEFUN([_PANDORA_RECENT_LIBMEMCACHED],[ - AM_CONDITIONAL(HAVE_LIBMEMCACHED, [test "x${ac_cv_libmemcached}" = "xyes"]) + AC_CACHE_CHECK([if libmemcached is recent enough], + [pandora_cv_recent_libmemcached],[ + AS_IF([test "x${ac_cv_libmemcached}" = "xno"],[ + pandora_cv_recent_libmemcached=no + ],[ + AS_IF([test "x$1" != "x"],[ + pandora_need_libmemcached_version=`echo "$1" | perl -nle '/(\d+)\.(\d+)/; printf "%d%0.3d000", $[]1, $[]2 ;'` + AS_IF([test "x${pandora_need_libmemcached_version}" = "x0000000"],[ + pandora_cv_recent_libmemcached=yes + ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include <libmemcached/configure.h> + +#if !defined(LIBMEMCACHED_VERSION_HEX) || LIBMEMCACHED_VERSION_HEX < 0x]]${pandora_need_libmemcached_version}[[ +# error libmemcached too old! +#endif + ]],[[]]) + ],[ + pandora_cv_recent_libmemcached=yes + ],[ + pandora_cv_recent_libmemcached=no + ]) + ]) + ],[ + pandora_cv_recent_libmemcached=yes + ]) + ]) + ]) + + AM_CONDITIONAL(HAVE_LIBMEMCACHED,[test "x${ac_cv_libmemcached}" = "xyes" -a "x${pandora_cv_recent_libmemcached}" = "xyes"]) ]) AC_DEFUN([PANDORA_HAVE_LIBMEMCACHED],[ AC_REQUIRE([_PANDORA_SEARCH_LIBMEMCACHED]) + _PANDORA_RECENT_LIBMEMCACHED($1) ]) AC_DEFUN([PANDORA_REQUIRE_LIBMEMCACHED],[ - AC_REQUIRE([PANDORA_HAVE_LIBMEMCACHED]) - AS_IF([test x$ac_cv_libmemcached = xno], + PANDORA_HAVE_LIBMEMCACHED($1) + AS_IF([test "x{$pandora_cv_recent_libmemcached}" = "xno"], AC_MSG_ERROR([libmemcached is required for ${PACKAGE}])) ]) +AC_DEFUN([PANDORA_REQUIRE_LIBMEMCACHEDPROTOCOL],[ + PANDORA_HAVE_LIBMEMCACHED($1) + AS_IF([test x$ac_cv_libmemcachedprotocol = xno], + AC_MSG_ERROR([libmemcachedprotocol is required for ${PACKAGE}])) +])
  84. Download patch m4/pandora_check_compiler_version.m4

    --- 0.98-1.1/m4/pandora_check_compiler_version.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_check_compiler_version.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  85. Download patch m4/pandora_header_assert.m4

    --- 0.98-1.1/m4/pandora_header_assert.m4 2010-01-15 15:43:15.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_header_assert.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  86. Download patch m4/pandora_have_gcc_atomics.m4

    --- 0.98-1.1/m4/pandora_have_gcc_atomics.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_gcc_atomics.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ AC_DEFUN([PANDORA_HAVE_GCC_ATOMICS],[ AC_CACHE_CHECK( [whether the compiler provides atomic builtins], [ac_cv_gcc_atomic_builtins], - [AC_RUN_IFELSE( + [AC_LINK_IFELSE( [AC_LANG_PROGRAM([],[[ int foo= -10; int bar= 10; if (!__sync_fetch_and_add(&foo, bar) || foo) @@ -34,4 +34,4 @@ AC_DEFUN([PANDORA_HAVE_GCC_ATOMICS],[ [Define to 1 if compiler provides atomic builtins.]) ]) -]) \ No newline at end of file +])
  87. Download patch m4/pandora_ensure_gcc_version.m4

    --- 0.98-1.1/m4/pandora_ensure_gcc_version.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_ensure_gcc_version.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,8 +1,22 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. +AC_DEFUN([_PANDORA_TRY_GCC],[ + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + AC_CHECK_PROGS([CC]NAME,[gcc$1]) + AC_CHECK_PROGS([CXX]NAME,[g++$1]) + AS_IF([test "x${CC]NAME[}" != "x" -a "x${ac_cv_env_CC_set}" = "x"], + [CC="${CC]NAME[}"]) + AS_IF([test "x${CXX]NAME[}" != "x" -a "x${ac_cv_env_CCX_set}" = "x"], + [CXX="${CXX]NAME[}"]) + AS_IF([test "x${CC]NAME[}" != "x" -a "x${ac_cv_env_CPP_set}" = "x"], + [CPP="${CC]NAME[} -E"]) +]) + dnl If the user is on a Mac and didn't ask for a specific compiler dnl You're gonna get 4.2. AC_DEFUN([PANDORA_MAC_GCC42], @@ -10,30 +24,39 @@ AC_DEFUN([PANDORA_MAC_GCC42], AS_IF([test "$host_vendor" = "apple" -a "x${ac_cv_env_CC_set}" = "x"],[ host_os_version=`echo ${host_os} | perl -ple 's/^\D+//g;s,\..*,,'` AS_IF([test "$host_os_version" -lt 10],[ - AS_IF([test -f /usr/bin/gcc-4.2], - [ - CPP="/usr/bin/gcc-4.2 -E" - CC=/usr/bin/gcc-4.2 - CXX=/usr/bin/g++-4.2 - ]) + _PANDORA_TRY_GCC([-4.2]) ]) ]) ]) ]) +dnl If the user is on CentOS or RHEL and didn't ask for a specific compiler +dnl You're gonna get 4.4 (forward compatible with 4.5) +AC_DEFUN([PANDORA_RH_GCC44], + [AS_IF([test "$GCC" = "yes"],[ + AS_IF([test "x${ac_cv_env_CC_set}" = "x"],[ + _PANDORA_TRY_GCC([44]) + _PANDORA_TRY_GCC([45]) + ]) + ]) +]) + dnl AC_DEFUN([PANDORA_ENSURE_GCC_VERSION],[ AC_REQUIRE([PANDORA_MAC_GCC42]) - AC_CACHE_CHECK([if GCC is recent enough], [ac_cv_gcc_recent], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#if !defined(__GNUC__) || (__GNUC__ < 4) || ((__GNUC__ >= 4) && (__GNUC_MINOR__ < 1)) + AC_REQUIRE([PANDORA_RH_GCC44]) + AS_IF([test "$GCC" = "yes"],[ + AC_CACHE_CHECK([if GCC is recent enough], [ac_cv_gcc_recent], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#if !defined(__GNUC__) || (__GNUC__ < 4) || ((__GNUC__ >= 4) && (__GNUC_MINOR__ < 2)) # error GCC is Too Old! #endif - ]])], - [ac_cv_gcc_recent=yes], - [ac_cv_gcc_recent=no])]) - AS_IF([test "$ac_cv_gcc_recent" = "no" -a "$host_vendor" = "apple"], - AC_MSG_ERROR([Your version of GCC is too old. At least version 4.2 is required on OSX. You may need to install a version of XCode >= 3.1.2])) - AS_IF([test "$ac_cv_gcc_recent" = "no"], - AC_MSG_ERROR([Your version of GCC is too old. At least version 4.1 is required])) + ]])], + [ac_cv_gcc_recent=yes], + [ac_cv_gcc_recent=no])]) + AS_IF([test "$ac_cv_gcc_recent" = "no" -a "$host_vendor" = "apple"], + AC_MSG_ERROR([Your version of GCC is too old. At least version 4.2 is required on OSX. You may need to install a version of XCode >= 3.1.2])) + AS_IF([test "$ac_cv_gcc_recent" = "no"], + AC_MSG_ERROR([Your version of GCC is too old. At least version 4.2 is required. On RHEL/CentOS systems this is found in the gcc44 and gcc44-c++ packages.])) + ]) ])
  88. Download patch m4/ltversion.m4

    --- 0.98-1.1/m4/ltversion.m4 2010-01-18 01:52:27.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/ltversion.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# ltversion.m4 -- version numbers -*- Autoconf -*- -# -# Copyright (C) 2004 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# Generated from ltversion.in. - -# serial 3012 ltversion.m4 -# This file is part of GNU Libtool - -m4_define([LT_PACKAGE_VERSION], [2.2.6]) -m4_define([LT_PACKAGE_REVISION], [1.3012]) - -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6' -macro_revision='1.3012' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -])
  89. Download patch m4/pandora_sasl.m4

    --- 0.98-1.1/m4/pandora_sasl.m4 2010-01-15 15:43:16.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_sasl.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  90. Download patch config/compile

    --- 0.98-1.1/config/compile 2010-01-18 01:52:34.000000000 +0000 +++ 0.171.1-0ubuntu2/config/compile 1970-01-01 00:00:00.000000000 +0000 @@ -1,143 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. - -scriptversion=2009-04-28.21; # UTC - -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. -# Written by Tom Tromey <tromey@cygnus.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake@gnu.org> or send patches to -# <automake-patches@gnu.org>. - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. - -Report bugs to <bug-automake@gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; -esac - -ofile= -cfile= -eat= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End:
  91. Download patch m4/pandora_print_callstack.m4

    --- 0.98-1.1/m4/pandora_print_callstack.m4 2010-01-15 15:43:15.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_print_callstack.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  92. Download patch m4/pandora_warnings.m4
  93. Download patch m4/pandora_have_libboost_filesystem.m4

    --- 0.98-1.1/m4/pandora_have_libboost_filesystem.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libboost_filesystem.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,45 @@ +dnl Copyright (C) 2010 Monty Taylor +dnl This file is free software; Monty Taylor +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_BOOST_FILESYSTEM],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for Boost.Filesystem + dnl -------------------------------------------------------------------- + + AC_LANG_PUSH(C++) + AC_LIB_HAVE_LINKFLAGS(boost_filesystem-mt,boost_system-mt,[ + #include <boost/filesystem.hpp> + ],[ + boost::filesystem::path my_path("some_dir/file.txt"); + ]) + AS_IF([test "x${ac_cv_libboost_filesystem_mt}" = "xno"],[ + AC_LIB_HAVE_LINKFLAGS(boost_filesystem,boost_system,[ + #include <boost/filesystem.hpp> + ],[ + boost::filesystem::path my_path("some_dir/file.txt"); + ]) + ]) + AC_LANG_POP() + + AM_CONDITIONAL(HAVE_BOOST_FILESYSTEM, + [test "x${ac_cv_libboost_filesystem}" = "xyes" -o "x${ac_cv_libboost_filesystem_mt}" = "xyes"]) + BOOST_LIBS="${BOOST_LIBS} ${LTLIBBOOST_FILESYSTEM_MT} ${LTLIBBOOST_FILESYSTEM}" + AC_SUBST(BOOST_LIBS) +]) + +AC_DEFUN([PANDORA_HAVE_BOOST_FILESYSTEM],[ + PANDORA_HAVE_BOOST($1) + _PANDORA_SEARCH_BOOST_FILESYSTEM($1) +]) + +AC_DEFUN([PANDORA_REQUIRE_BOOST_FILESYSTEM],[ + PANDORA_REQUIRE_BOOST($1) + _PANDORA_SEARCH_BOOST_FILESYSTEM($1) + AS_IF([test "x${ac_cv_libboost_filesystem}" = "xno" -a "x${ac_cv_libboost_filesystem_mt}" = "xno"], + AC_MSG_ERROR([Boost.Filesystem is required for ${PACKAGE}])) +]) +
  94. Download patch config.h.in
  95. Download patch m4/pandora_have_libvbucket.m4

    --- 0.98-1.1/m4/pandora_have_libvbucket.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libvbucket.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,40 @@ +dnl Copyright (C) 2010 NorthScale +dnl This file is free software; NorthScale +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([_PANDORA_SEARCH_LIBVBUCKET],[ + AC_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for libvbucket + dnl -------------------------------------------------------------------- + + AC_ARG_ENABLE([libvbucket], + [AS_HELP_STRING([--disable-libvbucket], + [Build with libvbucket support @<:@default=on@:>@])], + [ac_enable_libvbucket="$enableval"], + [ac_enable_libvbucket="yes"]) + + AS_IF([test "x$ac_enable_libvbucket" = "xyes"],[ + AC_LIB_HAVE_LINKFLAGS(vbucket,,[ + #include <libvbucket/vbucket.h> + ],[ + VBUCKET_CONFIG_HANDLE config = vbucket_config_parse_file(NULL); + ]) + ],[ + ac_cv_libvbucket="no" + ]) + + AM_CONDITIONAL(HAVE_LIBVBUCKET, [test "x${ac_cv_libvbucket}" = "xyes"]) +]) + +AC_DEFUN([PANDORA_HAVE_LIBVBUCKET],[ + AC_REQUIRE([_PANDORA_SEARCH_LIBVBUCKET]) +]) + +AC_DEFUN([PANDORA_REQUIRE_LIBVBUCKET],[ + AC_REQUIRE([PANDORA_HAVE_LIBVBUCKET]) + AS_IF([test x$ac_cv_libvbucket = xno], + AC_MSG_ERROR([libvbucket is required for ${PACKAGE}])) +])
  96. Download patch debian/source/format

    --- 0.98-1.1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/debian/source/format 2010-12-10 20:37:53.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)
  97. Download patch debian/copyright
  98. Download patch Makefile.in
  99. Download patch m4/pandora_have_libndbclient.m4

    --- 0.98-1.1/m4/pandora_have_libndbclient.m4 1970-01-01 00:00:00.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libndbclient.m4 2010-12-27 19:42:04.000000000 +0000 @@ -0,0 +1,80 @@ +dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- +dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: +dnl +dnl Copyright (C) 2010 Monty Taylor +dnl This file is free software; Sun Microsystems +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl + +AC_DEFUN([_PANDORA_SEARCH_LIBNDBCLIENT],[ + + AC_REQUIRE([AC_LIB_PREFIX]) + AC_REQUIRE([PANDORA_WITH_MYSQL]) + + AC_ARG_ENABLE([libndbclient], + [AS_HELP_STRING([--disable-libndbclient], + [Build with libndbclient support @<:@default=on@:>@])], + [ac_enable_libndbclient="$enableval"], + [ac_enable_libndbclient="yes"]) + + AC_ARG_WITH([libndbclient-prefix], + [AS_HELP_STRING([--with-libndbclient-prefix], + [search for libndbclient in DIR])], + [ac_with_libndbclient=${withval}], + [ac_with_libndbclient=${pandora_cv_mysql_base}]) + + save_LIBS="${LIBS}" + LIBS="" + save_CPPFLAGS="${CPPFLAGS}" + AS_IF([test "x${ac_with_libndbclient}" != "x"],[ + LIBS="-L${ac_with_libndbclient}/lib/mysql -L${ac_with_libndbclient}/lib" + AS_IF([test "$GCC" = "yes"],[ + ndb_include_prefix="-isystem " + ],[ + ndb_include_prefix="-I" + ]) + CPPFLAGS="${CPPFLAGS} ${ndb_include_prefix}${ac_with_libndbclient}/include ${ndb_include_prefix}${ac_with_libndbclient}/include/mysql ${ndb_include_prefix}${ac_with_libndbclient}/include/mysql/storage/ndb ${ndb_include_prefix}${ac_with_libndbclient}/include/mysql/storage/ndb/ndbapi ${ndb_include_prefix}${ac_with_libndbclient}/include/mysql/storage/ndb/mgmapi" + ]) + LIBS="${LIBS} -lndbclient -lmysqlclient_r" + + AC_CACHE_CHECK([if NdbApi works],[ac_cv_libndbclient],[ + AC_LANG_PUSH(C++) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[ +#include <NdbApi.hpp> + ]],[[ +Ndb *ndb; +ndb_init(); + ]]) + ],[ + ac_cv_libndbclient=yes + ],[ + ac_cv_libndbclient=no + ]) + ]) + AC_LANG_POP() + + LIBNDBCLIENT="${LIBS}" + LTLIBNDBCLIENT="${LIBS}" + AC_SUBST([LIBNDBCLIENT]) + AC_SUBST([LTLIBNDBCLIENT]) + + AS_IF([test "x${ac_cv_libndbclient}" = "xno"],[ + CPPFLAGS="${save_CPPFLAGS}" + ]) + LIBS="${save_LIBS}" + + AM_CONDITIONAL(HAVE_LIBNDBCLIENT, [test "x${ac_cv_libndbclient}" = "xyes"]) +]) + +AC_DEFUN([PANDORA_HAVE_LIBNDBCLIENT],[ + AC_REQUIRE([_PANDORA_SEARCH_LIBNDBCLIENT]) +]) + +AC_DEFUN([PANDORA_REQUIRE_LIBNDBCLIENT],[ + AC_REQUIRE([PANDORA_HAVE_LIBNDBCLIENT]) + AS_IF([test "x${ac_cv_libndbclient}" = "xno"], + AC_MSG_ERROR([libndbclient is required for ${PACKAGE}])) +]) +
  100. Download patch m4/pandora_have_libavahi.m4

    --- 0.98-1.1/m4/pandora_have_libavahi.m4 2010-01-15 15:43:14.000000000 +0000 +++ 0.171.1-0ubuntu2/m4/pandora_have_libavahi.m4 2010-12-27 19:42:04.000000000 +0000 @@ -1,5 +1,5 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems +dnl Copyright (C) 2009 Sun Microsystems, Inc. +dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
  101. ...
  1. pandora-build