From e095cc42c244ddb81b1a1e8104582da76be0d0e4 Mon Sep 17 00:00:00 2001 From: Alexandre Savard <alexandre.savard@savoirfairelinux.net> Date: Fri, 29 May 2009 12:27:57 -0400 Subject: [PATCH] [#1469] Remove configure stuff in dbus-c++ --- sflphone-common/configure.ac | 2 +- sflphone-common/libs/dbus-c++/ChangeLog | 0 sflphone-common/libs/dbus-c++/autogen.sh | 3 - sflphone-common/libs/dbus-c++/bootstrap | 75 -------- sflphone-common/libs/dbus-c++/configure.ac | 210 --------------------- 5 files changed, 1 insertion(+), 289 deletions(-) delete mode 100644 sflphone-common/libs/dbus-c++/ChangeLog delete mode 100755 sflphone-common/libs/dbus-c++/autogen.sh delete mode 100755 sflphone-common/libs/dbus-c++/bootstrap delete mode 100644 sflphone-common/libs/dbus-c++/configure.ac diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac index c2c254719c..781e1fa540 100644 --- a/sflphone-common/configure.ac +++ b/sflphone-common/configure.ac @@ -193,7 +193,7 @@ dnl DBus-C++ detection (used to be in library own build system) DBUS_REQUIRED_VERSION=0.60 PKG_CHECK_MODULES(dbus, [dbus-1 >= $DBUS_REQUIRED_VERSION],, AC_MSG_ERROR([You need the DBus libraries (version 0.6 or better)] - [http://www.freedesktop.org/wiki/Software_2fdbus]) + [http://gitorious.org/dbus-cplusplus]) ) AC_SUBST(dbus_CFLAGS) AC_SUBST(dbus_LIBS) diff --git a/sflphone-common/libs/dbus-c++/ChangeLog b/sflphone-common/libs/dbus-c++/ChangeLog deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/sflphone-common/libs/dbus-c++/autogen.sh b/sflphone-common/libs/dbus-c++/autogen.sh deleted file mode 100755 index 677a76a774..0000000000 --- a/sflphone-common/libs/dbus-c++/autogen.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -./bootstrap && ./configure $@ diff --git a/sflphone-common/libs/dbus-c++/bootstrap b/sflphone-common/libs/dbus-c++/bootstrap deleted file mode 100755 index 292c9811ff..0000000000 --- a/sflphone-common/libs/dbus-c++/bootstrap +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -# Run this to bootstrap the files - -PACKAGE=dbus-c++ - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -DIE=0 - -# check if configure.ac is there -(test -f $srcdir/configure.ac) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level package directory" - exit 1 -} - -# check for autoconf -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`autoconf' installed." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -# check for libtool -(libtool --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`libtool' installed." - echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -# check for automake -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`automake' installed." - echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" - DIE=1 - NO_AUTOMAKE=yes -} - - -# if no automake, don't bother testing for aclocal -test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: Missing \`aclocal'. The version of \`automake'" - echo "installed doesn't appear recent enough." - echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -echo "Running libtoolize..." -libtoolize --force --copy - -aclocalinclude="$ACLOCAL_FLAGS -I config" -echo "Running aclocal $aclocalinclude ..." -aclocal $aclocalinclude - -echo "Running autoheader..." -autoheader - -echo "Running automake..." -automake --add-missing --foreign $am_opt - -echo "Running autoconf ..." -autoconf - -echo "You could now exec ./configure --help to see available options" - diff --git a/sflphone-common/libs/dbus-c++/configure.ac b/sflphone-common/libs/dbus-c++/configure.ac deleted file mode 100644 index 2054a07e29..0000000000 --- a/sflphone-common/libs/dbus-c++/configure.ac +++ /dev/null @@ -1,210 +0,0 @@ -# Autojunk script for libdbus-c++ - -AC_PREREQ(2.59) -AC_INIT([libdbus-c++], 0.5.0, [shackan@gmail.com]) - -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -AM_CONFIG_HEADER([config.h]) - -AC_CANONICAL_HOST - -AC_SUBST(PACKAGE_VERSION) - - -# Set configuration options - -AC_ARG_ENABLE(debug, - AS_HELP_STRING([--enable-debug], - [enable debugging support]), - [enable_debug=$enableval], - [enable_debug=no] -) - -AC_ARG_ENABLE(ecore, - AS_HELP_STRING([--enable-ecore], - [enable ecore integration]), - [enable_ecore=$enableval], - [enable_ecore=no] -) - -AC_ARG_ENABLE(glib, - AS_HELP_STRING([--enable-glib], - [enable glib integration]), - [enable_glib=$enableval], - [enable_glib=no] -) - -AC_ARG_ENABLE(doxygen-docs, - AS_HELP_STRING([--enable-doxygen-docs], - [build DOXYGEN documentation (requires Doxygen)]), - [enable_doxygen_docs=$enableval], - [enable_doxygen_docs=no] -) - -# Check for programs - -AC_LANG_CPLUSPLUS - -AC_PROG_CC -AC_PROG_CXX - -CXX_FOR_BUILD=${CXX_FOR_BUILD-${CXX}} -AC_SUBST(CXX_FOR_BUILD) - -AM_PROG_LIBTOOL - -PKG_PROG_PKG_CONFIG - - -AC_MSG_CHECKING([whether $CXX supports symbol visibility]) - -vtest=`$CXX --help --verbose 2>&1 | grep fvisibility` - -if test -n "$vtest"; then - AC_MSG_RESULT(yes) - - AC_DEFINE(GCC_HASCLASSVISIBILITY, 1, [to enable hidden symbols]) - CXXFLAGS="-fvisibility=hidden" -else - AC_MSG_RESULT(no) -fi - - -# Check for dependencies - -DBUS_REQUIRED_VERSION=0.60 -PKG_CHECK_MODULES(dbus, [dbus-1 >= $DBUS_REQUIRED_VERSION],, - AC_MSG_ERROR([You need the DBus libraries (version 0.6 or better)] - [http://www.freedesktop.org/wiki/Software_2fdbus]) -) -AC_SUBST(dbus_CFLAGS) -AC_SUBST(dbus_LIBS) - -DBUS_API_STABLE_VERSION=1.0.0 -PKG_CHECK_EXISTS([dbus-1 < $DBUS_API_STABLE_VERSION], - [AC_DEFINE(DBUS_API_SUBJECT_TO_CHANGE, , [unstable DBus])] -) - -DBUS_THREADS_INIT_DEFAULT_VERSION=0.93 -PKG_CHECK_EXISTS([dbus-1 >= $DBUS_THREADS_INIT_DEFAULT_VERSION], - [AC_DEFINE(DBUS_HAS_THREADS_INIT_DEFAULT, , [dbus_threads_init_default (needs DBus >= 0.93)])] -) - -DBUS_RECURSIVE_MUTEX_VERSION=0.95 -PKG_CHECK_EXISTS([dbus-1 >= $DBUS_RECURSIVE_MUTEX_VERSION], - [AC_DEFINE(DBUS_HAS_RECURSIVE_MUTEX, , [DBus supports recursive mutexes (needs DBus >= 0.95)])] -) - - -if test "$enable_glib" = "yes" ; then -PKG_CHECK_MODULES([glib], glib-2.0) -AC_SUBST(glib_CFLAGS) -AC_SUBST(glib_LIBS) -AM_CONDITIONAL(ENABLE_GLIB, test 1 = 1) -PKG_CHECK_MODULES([gtkmm], gtkmm-2.4, - AM_CONDITIONAL(HAVE_GTKMM, test 1 = 1), - AM_CONDITIONAL(HAVE_GTKMM, test 0 = 1) -) -AC_SUBST(gtkmm_CFLAGS) -AC_SUBST(gtkmm_LIBS) -else -AM_CONDITIONAL(ENABLE_GLIB, test 0 = 1) -AM_CONDITIONAL(HAVE_GTKMM, test 0 = 1) -fi - -if test "$enable_ecore" = "yes" ; then -PKG_CHECK_MODULES([ecore], ecore) -AC_SUBST(ecore_CFLAGS) -AC_SUBST(ecore_LIBS) -AM_CONDITIONAL(ENABLE_ECORE, test 1 = 1) -else -AM_CONDITIONAL(ENABLE_ECORE, test 0 = 1) -fi - -AC_CHECK_LIB([expat], XML_ParserCreate_MM, - [AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false)], - have_expat=false) - -if ! $have_expat; then - AC_MSG_ERROR([You need the eXpat xml parser] - [http://expat.sourceforge.net/]) -fi - -xml_CFLAGS= -xml_LIBS=-lexpat - -AC_SUBST(xml_CFLAGS) -AC_SUBST(xml_LIBS) - -ACX_PTHREAD -if test x"$acx_pthread_ok" = xyes; then - AC_DEFINE(HAVE_PTHREAD_H, 1, [Define to enable pthread support]) - AM_CONDITIONAL(HAVE_PTHREAD, test x"$acx_pthread_ok" = xyes) -fi - -if test "$enable_debug" = "yes" ; then - CXXFLAGS="$CXXFLAGS -Wall -ggdb -O0" - AC_DEFINE(DEBUG, 1, [Define to enable debug build]) -else - CXXFLAGS="$CXXFLAGS -Wall -O3" -fi - -# Doxygen Documentation - -AC_PATH_PROG(DOXYGEN, doxygen, no) - -AC_MSG_CHECKING([whether to build Doxygen documentation]) - -if test "$DOXYGEN" = "no" ; then - have_doxygen=no -else - have_doxygen=yes -fi - -if test "$enable_doxygen_docs" = "auto" ; then - enable_doxygen_docs=no - - AC_MSG_RESULT(no) -fi - -if test "$enable_doxygen_docs" = "yes" ; then - if test "$have_doxygen" = "no"; then - AC_MSG_ERROR([Building Doxygen docs explicitly required, but Doxygen not found]) - fi - - AC_MSG_RESULT(yes) -fi - -AM_CONDITIONAL(DBUS_DOXYGEN_DOCS_ENABLED, test "$enable_doxygen_docs" = "yes") - -# For the tools/, we need libdbus-c++ for the "build" architecture as well - -AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes") - -AC_ARG_WITH(build-libdbus-cxx, - AS_HELP_STRING([--with-build-libdbus-cxx], - [For cross compilation: path to libdbus-cxx which was compiled for the 'build' system.]), - [ BUILD_LIBDBUS_CXX_DIR=${withval} ], - [ BUILD_LIBDBUS_CXX_DIR="\$(top_builddir)" ] -) -AC_SUBST(BUILD_LIBDBUS_CXX_DIR) - -# Save processed files - -AC_OUTPUT( - Makefile - src/Makefile - tools/Makefile - data/Makefile - doc/Makefile - doc/Doxyfile - examples/Makefile - examples/properties/Makefile - examples/echo/Makefile - examples/ecore/Makefile - examples/hal/Makefile - examples/glib/Makefile - dbus-c++-1.pc - dbus-c++-1-uninstalled.pc - libdbus-c++.spec -) -- GitLab