From 7a116936798b1a3833e37075fb608b248a9b3e6b Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Tue, 25 Oct 2011 19:17:14 -0700 Subject: [PATCH] Remove dead pandora files --- m4/pandora_bison.m4 | 33 ----- m4/pandora_flex.m4 | 33 ----- m4/pandora_have_libbdb.m4 | 40 ------ m4/pandora_have_libcassandra.m4 | 44 ------- m4/pandora_have_libldap.m4 | 73 ----------- m4/pandora_have_libndbclient.m4 | 80 ------------ m4/pandora_have_thrift.m4 | 45 ------- m4/pandora_intltool.m4 | 225 -------------------------------- m4/pandora_shared_ptr.m4 | 59 --------- m4/pandora_stl_hash.m4 | 94 ------------- m4/pandora_with_gettext.m4 | 44 ------- m4/pandora_with_lua.m4 | 55 -------- m4/pandora_with_r.m4 | 33 ----- 13 files changed, 858 deletions(-) delete mode 100644 m4/pandora_bison.m4 delete mode 100644 m4/pandora_flex.m4 delete mode 100644 m4/pandora_have_libbdb.m4 delete mode 100644 m4/pandora_have_libcassandra.m4 delete mode 100644 m4/pandora_have_libldap.m4 delete mode 100644 m4/pandora_have_libndbclient.m4 delete mode 100644 m4/pandora_have_thrift.m4 delete mode 100644 m4/pandora_intltool.m4 delete mode 100644 m4/pandora_shared_ptr.m4 delete mode 100644 m4/pandora_stl_hash.m4 delete mode 100644 m4/pandora_with_gettext.m4 delete mode 100644 m4/pandora_with_lua.m4 delete mode 100644 m4/pandora_with_r.m4 diff --git a/m4/pandora_bison.m4 b/m4/pandora_bison.m4 deleted file mode 100644 index c95896c7..00000000 --- a/m4/pandora_bison.m4 +++ /dev/null @@ -1,33 +0,0 @@ -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"]) - ) -]) diff --git a/m4/pandora_flex.m4 b/m4/pandora_flex.m4 deleted file mode 100644 index 0fb2f81c..00000000 --- a/m4/pandora_flex.m4 +++ /dev/null @@ -1,33 +0,0 @@ -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"]) - ) -]) diff --git a/m4/pandora_have_libbdb.m4 b/m4/pandora_have_libbdb.m4 deleted file mode 100644 index 443d3cc2..00000000 --- a/m4/pandora_have_libbdb.m4 +++ /dev/null @@ -1,40 +0,0 @@ -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_LIBBDB],[ - AC_REQUIRE([AC_LIB_PREFIX]) - - dnl -------------------------------------------------------------------- - dnl Check for bekerely db - dnl -------------------------------------------------------------------- - - AC_ARG_ENABLE([libbdb], - [AS_HELP_STRING([--disable-libbdb], - [Build with libbdb support @<:@default=on@:>@])], - [ac_enable_libbdb="$enableval"], - [ac_enable_libbdb="yes"]) - - AS_IF([test "x$ac_enable_libbdb" = "xyes"],[ - AC_LIB_HAVE_LINKFLAGS(db,,[ - #include - ],[ - const char *test= DB_VERSION_STRING; - ]) - ],[ - ac_cv_libbdb="no" - ]) - - AM_CONDITIONAL(HAVE_LIBBDB, [test "x${ac_cv_libbdb}" = "xyes"]) -]) - -AC_DEFUN([PANDORA_HAVE_LIBBDB],[ - AC_REQUIRE([_PANDORA_SEARCH_LIBBDB]) -]) - -AC_DEFUN([PANDORA_REQUIRE_LIBBDB],[ - AC_REQUIRE([_PANDORA_SEARCH_LIBBDB]) - AS_IF([test "x${ac_cv_libbdb}" = "xno"], - AC_MSG_ERROR([libbdb is required for ${PACKAGE}])) -]) diff --git a/m4/pandora_have_libcassandra.m4 b/m4/pandora_have_libcassandra.m4 deleted file mode 100644 index e61eb2f4..00000000 --- a/m4/pandora_have_libcassandra.m4 +++ /dev/null @@ -1,44 +0,0 @@ -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::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}]) - ]) -]) diff --git a/m4/pandora_have_libldap.m4 b/m4/pandora_have_libldap.m4 deleted file mode 100644 index 7533e856..00000000 --- a/m4/pandora_have_libldap.m4 +++ /dev/null @@ -1,73 +0,0 @@ -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 *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; - ldap_initialize(&ldap, "ldap://localhost/"); - ]) - AS_IF([test "x$ac_cv_libldap" = "xyes"], [ - ac_cv_ldap_location="" - ]) - ],[ - ac_cv_ldap_location="" - ]) - - 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]) -]) diff --git a/m4/pandora_have_libndbclient.m4 b/m4/pandora_have_libndbclient.m4 deleted file mode 100644 index 08337ea7..00000000 --- a/m4/pandora_have_libndbclient.m4 +++ /dev/null @@ -1,80 +0,0 @@ -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 - ]],[[ -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}])) -]) - diff --git a/m4/pandora_have_thrift.m4 b/m4/pandora_have_thrift.m4 deleted file mode 100644 index b0b3a6c0..00000000 --- a/m4/pandora_have_thrift.m4 +++ /dev/null @@ -1,45 +0,0 @@ -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 - ],[ - 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}]) - ]) -]) - diff --git a/m4/pandora_intltool.m4 b/m4/pandora_intltool.m4 deleted file mode 100644 index b3e70625..00000000 --- a/m4/pandora_intltool.m4 +++ /dev/null @@ -1,225 +0,0 @@ -## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- -## Copyright (C) 2001 Eazel, Inc. -## Author: Maciej Stachowiak -## Kenneth Christiansen -## -## 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 of the License, 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, write to the Free Software -## Foundation, Inc., 51 Franklin Place - Suite 330, Boston, MA 02110-1301, USA. -## -## 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. - -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], [ -AC_PREREQ([2.50])dnl -AC_REQUIRE([AM_NLS])dnl - -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac - -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - AS_IF([test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"],[ - pandora_have_intltool=yes - ],[ - pandora_have_intltool=no - AC_MSG_WARN([Your intltool is too old. You need intltool $1 or later.]) - ]) -fi -AC_CHECK_HEADERS([libintl.h]) -AS_IF([test "x${ac_cv_header_libintl_h}" = "xfalse" -o "x${ac_cv_header_libintl_h}" = "xno"],[ - pandora_have_intltool=no -]) - -AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) -AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) -AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - AC_MSG_WARN([The intltool scripts were not found. Please install intltool.]) - AC_MSG_WARN([On Debian: apt-get install intltool. On Redhat: yum install intltool]) -fi - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - -_IT_SUBST(INTLTOOL_DESKTOP_RULE) -_IT_SUBST(INTLTOOL_DIRECTORY_RULE) -_IT_SUBST(INTLTOOL_KEYS_RULE) -_IT_SUBST(INTLTOOL_PROP_RULE) -_IT_SUBST(INTLTOOL_OAF_RULE) -_IT_SUBST(INTLTOOL_PONG_RULE) -_IT_SUBST(INTLTOOL_SERVER_RULE) -_IT_SUBST(INTLTOOL_SHEET_RULE) -_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) -_IT_SUBST(INTLTOOL_UI_RULE) -_IT_SUBST(INTLTOOL_XAM_RULE) -_IT_SUBST(INTLTOOL_KBD_RULE) -_IT_SUBST(INTLTOOL_XML_RULE) -_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) -_IT_SUBST(INTLTOOL_CAVES_RULE) -_IT_SUBST(INTLTOOL_SCHEMAS_RULE) -_IT_SUBST(INTLTOOL_THEME_RULE) -_IT_SUBST(INTLTOOL_SERVICE_RULE) -_IT_SUBST(INTLTOOL_POLICY_RULE) - -# Check the gettext tools to make sure they are GNU -AC_PATH_PROG(XGETTEXT, xgettext) -AC_PATH_PROG(MSGMERGE, msgmerge) -AC_PATH_PROG(MSGFMT, msgfmt) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - AC_MSG_WARN([GNU gettext tools not found; required for intltool]) -fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - AC_MSG_WARN([GNU gettext tools not found; required for intltool]) -fi - -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_WARN([perl not found]) -fi -AC_MSG_CHECKING([for perl >= 5.8.1]) -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - AC_MSG_WARN([perl 5.8.1 is required for intltool]) -else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" - AC_MSG_RESULT([$IT_PERL_VERSION]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_WARN([XML::Parser perl module is required for intltool]) - fi -fi - -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) - -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - -IT_PO_SUBDIR([po]) -]) - - -# IT_PO_SUBDIR(DIRNAME) -# --------------------- -# All po subdirs have to be declared with this macro; the subdir "po" is -# declared by IT_PROG_INTLTOOL. -# -AC_DEFUN([IT_PO_SUBDIR], -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -dnl -dnl The following CONFIG_COMMANDS should be exetuted at the very end -dnl of config.status. -AC_CONFIG_COMMANDS_PRE([ - AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then - AC_MSG_WARN([$1/Makefile.in.in was not created by intltoolize.]) - else - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.in" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" - fi - ]) -])dnl -]) - -# _IT_SUBST(VARIABLE) -# ------------------- -# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -# -AC_DEFUN([_IT_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - -# deprecated macros -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -# A hint is needed for aclocal from Automake <= 1.9.4: -# AC_DEFUN([AC_PROG_INTLTOOL], ...) - diff --git a/m4/pandora_shared_ptr.m4 b/m4/pandora_shared_ptr.m4 deleted file mode 100644 index 61fdf151..00000000 --- a/m4/pandora_shared_ptr.m4 +++ /dev/null @@ -1,59 +0,0 @@ -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 We check two things: where is the memory include file, and in what -dnl namespace does shared_ptr reside. -dnl We include AC_COMPILE_IFELSE for all the combinations we've seen in the -dnl wild: -dnl -dnl GCC 4.3: namespace: std:: #include -dnl GCC 4.2: namespace: tr1:: #include -dnl GCC 4.2: namespace: boost:: #include -dnl -dnl We define one of HAVE_HAVE_TR1_SHARED_PTR or HAVE_BOOST_SHARED_PTR -dnl depending on location, and SHARED_PTR_NAMESPACE to be the namespace in -dnl which shared_ptr is defined. -dnl - -AC_DEFUN([PANDORA_SHARED_PTR],[ - AC_REQUIRE([PANDORA_CHECK_CXX_STANDARD]) - AC_LANG_PUSH(C++) - save_CXXFLAGS="${CXXFLAGS}" - CXXFLAGS="${CXX_STANDARD} ${CXXFLAGS}" - AC_CHECK_HEADERS(memory tr1/memory boost/shared_ptr.hpp) - AC_CACHE_CHECK([the location of shared_ptr header file], - [ac_cv_shared_ptr_h],[ - for namespace in std tr1 std::tr1 boost - do - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[ -#if defined(HAVE_MEMORY) -# include -#endif -#if defined(HAVE_TR1_MEMORY) -# include -#endif -#if defined(HAVE_BOOST_SHARED_PTR_HPP) -# include -#endif -#include - -using $namespace::shared_ptr; -using namespace std; - ]],[[ -shared_ptr test_ptr(new string("test string")); - ]])], - [ - ac_cv_shared_ptr_namespace="${namespace}" - break - ],[ac_cv_shared_ptr_namespace=missing]) - done - ]) - AC_DEFINE_UNQUOTED([SHARED_PTR_NAMESPACE], - ${ac_cv_shared_ptr_namespace}, - [The namespace in which SHARED_PTR can be found]) - CXXFLAGS="${save_CXXFLAGS}" - AC_LANG_POP() -]) diff --git a/m4/pandora_stl_hash.m4 b/m4/pandora_stl_hash.m4 deleted file mode 100644 index ef1daac7..00000000 --- a/m4/pandora_stl_hash.m4 +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright (C) 2008 Sun Microsystems, Inc. -# This file is free software; Sun Microsystems, Inc. -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# 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 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 ]], - [[std::unordered_map 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 - ]],[[ -std::tr1::unordered_map t - ]])], - [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 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]) - ]) -]) diff --git a/m4/pandora_with_gettext.m4 b/m4/pandora_with_gettext.m4 deleted file mode 100644 index 9b13e56f..00000000 --- a/m4/pandora_with_gettext.m4 +++ /dev/null @@ -1,44 +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]) - - m4_if(m4_substr(m4_esyscmd(test -d po && echo 0),0,1),0, [ - 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:"]) - ]) - -]) diff --git a/m4/pandora_with_lua.m4 b/m4/pandora_with_lua.m4 deleted file mode 100644 index 322271f8..00000000 --- a/m4/pandora_with_lua.m4 +++ /dev/null @@ -1,55 +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_LUA],[ - dnl Check for lua - AC_ARG_WITH([lua], - [AS_HELP_STRING([--with-lua], - [Build Lua Bindings @<:@default=yes@:>@])], - [with_lua=$withval], - [with_lua=yes]) - - AS_IF([test "x$with_lua" != "xno"],[ - AS_IF([test "x$with_lua" = "xyes"], - [LUAPC=lua], - [LUAPC=$with_lua]) - - PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [ - AC_DEFINE([HAVE_LUA], [1], [liblua]) - AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) - with_lua=yes - ],[ - LUAPC=lua5.1 - PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [ - AC_DEFINE([HAVE_LUA], [1], [liblua]) - AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) - with_lua=yes - ],[ - AC_DEFINE([HAVE_LUA],["x"],["x"]) - with_lua=no - ]) - ]) - - AC_CACHE_CHECK([for LUA installation location],[pandora_cv_lua_archdir],[ - AS_IF([test "$prefix" = "NONE"],[ - pandora_cv_lua_archdir=`${PKG_CONFIG} --define-variable=prefix=${ac_default_prefix} --variable=INSTALL_CMOD ${LUAPC}` - ],[ - pandora_cv_lua_archdir=`${PKG_CONFIG} --define-variable=prefix=${prefix} --variable=INSTALL_CMOD ${LUAPC}` - ]) - ]) - LUA_ARCHDIR="${pandora_cv_lua_archdir}" - AC_SUBST(LUA_ARCHDIR) - AC_SUBST(LUA_CFLAGS) - AC_SUBST(LUA_LIBS) - ]) - AM_CONDITIONAL(BUILD_LUA, test "$with_lua" = "yes") - -]) diff --git a/m4/pandora_with_r.m4 b/m4/pandora_with_r.m4 deleted file mode 100644 index 843b201b..00000000 --- a/m4/pandora_with_r.m4 +++ /dev/null @@ -1,33 +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_R],[ - dnl Check for GNU R - AC_ARG_WITH([r], - [AS_HELP_STRING([--with-r], - [Build R Bindings @<:@default=yes@:>@])], - [with_r=$withval], - [with_r=yes]) - - AS_IF([test "x$with_r" != "xno"],[ - - PKG_CHECK_MODULES([R], [libR], [ - with_r=yes - ],[ - with_r=no - ]) - - AC_SUBST(R_CFLAGS) - AC_SUBST(R_LIBS) - ]) - AM_CONDITIONAL(BUILD_R, test "$with_r" = "yes") - -]) -- 2.30.2