[beast/devel: 74/77] BUILD: remove BIRNET, use acbeast.m4 for configure, based on birnet & rapicorn

From: Tim Janik <timj src gnome org>
To: commits-list gnome org
Cc:
Subject: [beast/devel: 74/77] BUILD: remove BIRNET, use acbeast.m4 for configure, based on birnet & rapicorn
Date: Wed, 1 May 2013 17:33:33 +0000 (UTC)
commit e6a513c78519b3859d77bb6b641b83c0e6c596de
Author: Tim Janik <timj gnu org>
Date:   Mon Apr 15 03:31:49 2013 +0200

    BUILD: remove BIRNET, use acbeast.m4 for configure, based on birnet & rapicorn

 Makefile.am                      |    4 +-
 birnet/acbirnet.m4 => acbeast.m4 |   75 ++++++++++--------
 birnet/Makefile.am               |   17 ----
 birnet/configure.inc             |  158 --------------------------------------
 birnet/tests/Makefile.am         |   12 ---
 configure.in                     |   31 ++------
 6 files changed, 48 insertions(+), 249 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0d23e79..73dfbec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # BEAST/BSE - Better Audio System / Better Sound Engine
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = . data birnet sfi bse plugins drivers shell beast-gtk launchers library tools po tests docs
+SUBDIRS = . data sfi bse plugins drivers shell beast-gtk launchers library tools po tests docs
 
 noinst_DATA =
 
@@ -12,8 +12,6 @@ ACLOCAL_AMFLAGS = -I autotools
 site site-preview site-update site-update-all site-update-pages site-update-galleries:
        @$(MAKE) -C web/ $(AM_MAKEFLAGS) $@
 
-# extra dependencies
-configure: birnet/acbirnet.m4 birnet/configure.inc
 MAINTAINERCLEANFILES += configure
 
 EXTRA_DIST += $(strip          \
diff --git a/birnet/acbirnet.m4 b/acbeast.m4
similarity index 84%
rename from birnet/acbirnet.m4
rename to acbeast.m4
index b018e52..47e4931 100644
--- a/birnet/acbirnet.m4
+++ b/acbeast.m4
@@ -1,4 +1,4 @@
-dnl # Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
+dnl # Licensed GNU LGPL v2 or later: http://www.gnu.org/licenses/lgpl.html
 
 ## Portability defines that help interoperate with classic and modern autoconfs
 ifdef([AC_TR_SH],[
@@ -26,7 +26,7 @@ $1
 AC_DIVERT_POP()])])])
 
 
-dnl GLIB_SIZEOF (INCLUDES, TYPE, ALIAS [, CROSS-SIZE])
+dnl # GLIB_SIZEOF (INCLUDES, TYPE, ALIAS [, CROSS-SIZE])
 AC_DEFUN([GLIB_SIZEOF],
 [pushdef([glib_Sizeof], GLIB_TR_SH([glib_cv_sizeof_$3]))dnl
 AC_CACHE_CHECK([size of $2], glib_Sizeof,
@@ -52,7 +52,7 @@ popdef([glib_Sizeof])dnl
 ])
 
 
-dnl MC_IF_VAR_EQ(environment-variable, value [, equals-action] [, else-action])
+dnl # MC_IF_VAR_EQ(environment-variable, value [, equals-action] [, else-action])
 AC_DEFUN([MC_IF_VAR_EQ], [
        case "$[$1]" in
        "[$2]"[)]
@@ -65,7 +65,7 @@ AC_DEFUN([MC_IF_VAR_EQ], [
 ])
 
 
-dnl MC_STR_CONTAINS(src-string, sub-string [, contains-action] [, else-action])
+dnl # MC_STR_CONTAINS(src-string, sub-string [, contains-action] [, else-action])
 AC_DEFUN([MC_STR_CONTAINS], [
        case "[$1]" in
        *"[$2]"*[)]
@@ -77,17 +77,17 @@ AC_DEFUN([MC_STR_CONTAINS], [
        esac
 ])
 
-dnl MC_EVAR_ADD(environment-variable, check-string, add-string)
+dnl # MC_EVAR_ADD(environment-variable, check-string, add-string)
 AC_DEFUN([MC_EVAR_ADD], [
        MC_STR_CONTAINS($[$1], [$2], [$1]="$[$1]", [$1]="$[$1] [$3]")
 ])
-dnl MC_EVAR_SUPPLEMENT(environment-variable, check-string, add-string)
+dnl # MC_EVAR_SUPPLEMENT(environment-variable, check-string, add-string)
 AC_DEFUN([MC_EVAR_SUPPLEMENT], [
        MC_STR_CONTAINS($[$1], [$2], [$1]="$[$1] [$3]", [$1]="$[$1]")
 ])
 
 
-dnl MC_CHECK_VERSION() extracts up to 6 decimal numbers out of given-version
+dnl # MC_CHECK_VERSION() extracts up to 6 decimal numbers out of given-version
 dnl and required-version, using any non-number letters as delimiters. it then
 dnl compares each of those 6 numbers in order 1..6 to each other, requirering
 dnl all of the 6 given-version numbers to be greater than, or at least equal
@@ -121,7 +121,7 @@ case $ac_vm in
 esac
 ])
 
-dnl MC_ASSERT_NONEMPTY(variable, program, srcpackage)
+dnl # MC_ASSERT_NONEMPTY(variable, program, srcpackage)
 AC_DEFUN([MC_ASSERT_NONEMPTY], [
     case "x$[$1]"y in
     xy)
@@ -130,28 +130,27 @@ AC_DEFUN([MC_ASSERT_NONEMPTY], [
     esac
 ])
 
-dnl Find program
-dnl MC_ASSERT_PROG(variable, program, srcpackage)
+dnl # MC_ASSERT_PROG(variable, program, srcpackage) - Find program
 AC_DEFUN([MC_ASSERT_PROG], [
-    AC_PATH_PROG([$1], [$2], no)
-    case "x$[$1]" in
-    xno)
+    AC_PATH_PROG([$1], [$2], missing!)
+    case "_$[$1]" in
+    '_missing!')
        AC_MSG_ERROR([failed to find $2 which is required for a functional build. $3])
        ;;
     esac
 ])
-dnl MC_ASSERT_PROGS(variable, programs, srcpackage)
+dnl # MC_ASSERT_PROGS(variable, programs, srcpackage)
 AC_DEFUN([MC_ASSERT_PROGS], [
-    AC_PATH_PROGS([$1], [$2], no)
-    case "x$[$1]" in
-    xno)
+    AC_PATH_PROGS([$1], [$2], missing!)
+    case "_$[$1]" in
+    '_missing!')
        AC_MSG_ERROR([failed to find any of ($2) which is required for a functional build. $3])
        ;;
     esac
 ])
 
-dnl MC_PKG_CONFIG_REQUIRE(package, version, clfgas-var, libs-var)
-dnl Find package through $PKG_CONFIG
+dnl # MC_PKG_CONFIG_REQUIRE(package, version, clfgas-var, libs-var)
+dnl # Find package through $PKG_CONFIG
 AC_DEFUN([MC_PKG_CONFIG_REQUIRE], [
     mc_PACKAGE="[$1]"
     mc_VERSION="[$2]"
@@ -169,8 +168,8 @@ AC_DEFUN([MC_PKG_CONFIG_REQUIRE], [
     unset mc_VERSION
 ])
 
-dnl Check whether cc accepts a certain option
-dnl MC_PROG_CC_SUPPORTS_OPTION(OPTIONS, ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND])
+dnl # MC_PROG_CC_SUPPORTS_OPTION(OPTIONS, ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND])
+dnl # Check whether cc accepts a certain option
 AC_DEFUN([MC_PROG_CC_SUPPORTS_OPTION], [
 AC_MSG_CHECKING([whether ${CC-cc} supports $1])
 echo >conftest.c;
@@ -184,6 +183,7 @@ fi
 rm -fr conftest*
 ])dnl
 
+dnl # MC_PROG_CC_WITH_CFLAGS()
 dnl # Setup CC with default CFLAGS value.
 AC_DEFUN([MC_PROG_CC_WITH_CFLAGS], [
        MC_IF_VAR_EQ(CFLAGS, "", CFLAGS="-g")
@@ -209,13 +209,15 @@ AC_DEFUN([MC_PROG_CC_WITH_CFLAGS], [
 
        dnl Further setup CFLAGS for GCC.
        MC_IF_VAR_EQ(GCC, yes,
-               dnl Debugging
-               MC_EVAR_SUPPLEMENT(CFLAGS, -g, -ggdb3)
-               
-               dnl Sane Behaviour
+               dnl # Sane Behaviour
                MC_EVAR_ADD(CFLAGS, -fno-cond-mismatch, -fno-cond-mismatch)
+               MC_PROG_CC_SUPPORTS_OPTION(-mcx16, MC_EVAR_ADD(CFLAGS, -mcx16, -mcx16))
+               MC_PROG_CC_SUPPORTS_OPTION(-rdynamic, MC_EVAR_ADD(CFLAGS, -rdynamic, -rdynamic))
+
+               dnl # Debugging
+               MC_EVAR_SUPPLEMENT(CFLAGS, -g, -ggdb3)
 
-               dnl Warnings.
+               dnl # Warnings.
                MC_EVAR_ADD(CFLAGS, -Wall, -Wall)
                MC_EVAR_ADD(CFLAGS, -Wmissing-prototypes, -Wmissing-prototypes)
                MC_EVAR_ADD(CFLAGS, -Wmissing-declarations, -Wmissing-declarations)
@@ -225,7 +227,7 @@ AC_DEFUN([MC_PROG_CC_WITH_CFLAGS], [
                    MC_EVAR_ADD(CFLAGS, -ansi, -ansi)
                    MC_EVAR_ADD(CFLAGS, -pedantic, -pedantic)
                )
-               dnl avoid lots of bogus warnings with string pointers
+               dnl # avoid lots of bogus warnings with string pointers
                MC_PROG_CC_SUPPORTS_OPTION(-Wno-pointer-sign,
                  MC_EVAR_ADD(CFLAGS, -Wno-pointer-sign, -Wno-pointer-sign))
                dnl problematic, triggers warnings in glibc headers
@@ -241,7 +243,7 @@ AC_DEFUN([MC_PROG_CC_WITH_CFLAGS], [
                MC_PROG_CC_SUPPORTS_OPTION($mc_opt_warn_no_return,
                      MC_EVAR_ADD(CFLAGS, $mc_opt_warn_no_return, $mc_opt_warn_no_return))
 
-               dnl Optimizations
+               dnl # Optimizations
                MC_EVAR_ADD(CFLAGS, -pipe, -pipe)
                MC_EVAR_ADD(CFLAGS, -O, -O2)
                MC_PROG_CC_SUPPORTS_OPTION(-ftracer,
@@ -251,11 +253,11 @@ AC_DEFUN([MC_PROG_CC_WITH_CFLAGS], [
                    MC_EVAR_ADD(CFLAGS, -fno-keep-static-consts, -fno-keep-static-consts))
                dnl MC_EVAR_ADD(CFLAGS, -freg-struct-return, -freg-struct-return) dnl buggy with gcc-3.2
 
-               dnl Fun options
+               dnl # Fun options
                dnl MC_EVAR_ADD(CFLAGS, -Q, -Q) dnl report each compiled function
                dnl MC_EVAR_ADD(CFLAGS, -ftime-report, -ftime-report)
                dnl MC_EVAR_ADD(CFLAGS, -fmem-report, -fmem-report)
-       ,       
+       ,
                MC_IF_VAR_EQ(CFLAGS_include_O, yes,
                        MC_EVAR_ADD(CFLAGS, -O, -O2)
                )
@@ -271,6 +273,7 @@ AC_DEFUN([MC_PROG_CC_SPECIAL_FLAGS], [
        AC_MSG_RESULT($[$1])
 ])
 
+dnl # MC_PROG_CXX_WITH_CXXFLAGS()
 dnl # Setup CXX with default CXXFLAGS value.
 AC_DEFUN([MC_PROG_CXX_WITH_CXXFLAGS], [
        MC_IF_VAR_EQ(CXXFLAGS, "", CXXFLAGS="-g")
@@ -282,7 +285,7 @@ AC_DEFUN([MC_PROG_CXX_WITH_CXXFLAGS], [
        MC_STR_CONTAINS($CXXFLAGS, -O, CXXFLAGS_include_O=yes)
        CXXFLAGS="$CXXFLAGS_saved"
 
-       dnl Setup CXXFLAGS for debugging.
+       dnl # Setup CXXFLAGS for debugging.
        MC_IF_VAR_EQ(enable_debug, yes,
                MC_IF_VAR_EQ(CXXFLAGS_include_g, yes,
                        MC_EVAR_ADD(CXXFLAGS, -g, -g)
@@ -294,15 +297,19 @@ AC_DEFUN([MC_PROG_CXX_WITH_CXXFLAGS], [
                )
        )
 
-       dnl Further setup CXXFLAGS for GXX.
+       dnl # Further setup CXXFLAGS for GXX.
        MC_IF_VAR_EQ(GXX, yes,
+               dnl # Sane Behaviour
+                MC_PROG_CC_SUPPORTS_OPTION(-mcx16,    MC_EVAR_ADD(CXXFLAGS, -mcx16, -mcx16))
+               MC_PROG_CC_SUPPORTS_OPTION(-rdynamic, MC_EVAR_ADD(CXXFLAGS, -rdynamic, -rdynamic))
+
                dnl # enable many useful warnings
                MC_EVAR_ADD(CXXFLAGS, -Wall, -Wall)
                MC_EVAR_ADD(CXXFLAGS, -Wdeprecated, -Wdeprecated)
                MC_EVAR_ADD(CXXFLAGS, -Wno-cast-qual, -Wno-cast-qual)
                dnl # MC_EVAR_ADD(CXXFLAGS, -Wmissing-prototypes, -Wmissing-prototypes)
                dnl # MC_EVAR_ADD(CXXFLAGS, -Winline, -Winline)
-               
+
                dnl # avoid bogus offsetof()-usage warnings
                dnl MC_PROG_CC_SUPPORTS_OPTION(-Wno-invalid-offsetof,
                dnl   MC_EVAR_ADD(CXXFLAGS, -Wno-invalid-offsetof, -Wno-invalid-offsetof))
@@ -331,7 +338,7 @@ AC_DEFUN([MC_PROG_CXX_WITH_CXXFLAGS], [
                fi
                dnl
 
-       ,       
+       ,
                MC_IF_VAR_EQ(CXXFLAGS_include_O, yes,
                        MC_EVAR_ADD(CXXFLAGS, -O, -O2)
                )
diff --git a/configure.in b/configure.in
index ce93ad6..e8e769d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,7 @@
-# Birnet
-# GNU Lesser General Public License version 2 or any later version.
+# Licensed GNU LGPL v2 or later: http://www.gnu.org/licenses/lgpl.html
 
 # include various m4 macros
-builtin(include, birnet/acbirnet.m4)dnl
+m4_include(acbeast.m4)
 m4_include(autotools/glib-gettext.m4)
 
 
@@ -156,19 +155,6 @@ MC_IF_VAR_EQ(GXX, yes,,
 # require pkg-config
 MC_ASSERT_PROG(PKG_CONFIG, pkg-config, [pkg-config can be found at 
http://www.freedesktop.org/software/pkgconfig/])
 
-
-dnl #
-dnl # Include sub-package macro definitions
-dnl #
-builtin(include, birnet/configure.inc)dnl
-#include(birnet/configure.inc)
-AC_DEFUN([DUMMY_DEFS],
-[
-    # work around stupid automake (doesn't figure includes)
-    AC_SUBST(BIRNET_CFLAGS)
-    AC_SUBST(BIRNET_LIBS)
-])
-
 dnl #
 dnl # Define package requirements.
 dnl #
@@ -217,12 +203,12 @@ AC_DEFUN([AC_I18N_REQUIREMENTS],
 ])
 AC_DEFUN([AC_SFI_REQUIREMENTS],
 [
-    dnl # check for GLib libs, libbirnet already provides gthread-2.0 and glib-2.0
-    PKG_CHECK_MODULES(GLIB_GOMT, glib-2.0 >= 2.32.3 gobject-2.0 gmodule-no-export-2.0)
+    dnl # check for GLib libs
+    PKG_CHECK_MODULES(GLIB_GOMT, glib-2.0 >= 2.32.3 gobject-2.0 gmodule-no-export-2.0 gthread-2.0)
     AC_SUBST(GLIB_GOMT_CFLAGS)
     AC_SUBST(GLIB_GOMT_LIBS)
-    SFI_CFLAGS="$BIRNET_CFLAGS $GLIB_GOMT_CFLAGS"
-    SFI_LIBS="$BIRNET_LIBS $GLIB_GOMT_LIBS"
+    SFI_CFLAGS="$GLIB_GOMT_CFLAGS"
+    SFI_LIBS="$GLIB_GOMT_LIBS"
     AC_SUBST(SFI_CFLAGS)
     AC_SUBST(SFI_LIBS)
 
@@ -658,9 +644,6 @@ fi
 AC_SUBST(PERLRULE)
 AM_CONDITIONAL(WITH_PERLRULE, [test "$PERLRULE" != "#"])
 
-# Check sub-package requirements
-AC_BIRNET_REQUIREMENTS
-
 # Check requirement sets
 AC_I18N_REQUIREMENTS
 AC_SFI_REQUIREMENTS
@@ -694,8 +677,6 @@ Makefile
 data/Makefile
 data/bse.pc
 data/beast.applications
-birnet/Makefile
-birnet/tests/Makefile
 sfi/Makefile
 sfi/tests/Makefile
 bse/bseconfig.h
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]