Updated libglibmm2 to glibmm-2.12.5

git-svn-id: svn://localhost/ardour2/branches/2.1-staging@1415 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/glibmm2/scripts/.cvsignore

@@ -1,5 +0,0 @@
-config.guess
-config.sub
-install-sh
-ltmain.sh
-missing

libs/glibmm2/scripts/macros.m4

@@ -29,7 +29,7 @@ AC_DEFUN([AL_PROG_GNU_MAKE],[
 dnl 
 dnl Check for GNU make (stolen from gtk+/configure.in)
 AC_MSG_CHECKING(whether make is GNU Make)
-if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
+if ${MAKE-make} --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
         AC_MSG_RESULT(yes)
 else
         AC_MSG_RESULT(no)

libs/glibmm2/scripts/reduced.m4

@@ -0,0 +1,106 @@
+## GLIBMM_ARG_ENABLE_API_PROPERTIES()
+##
+## Provide the --enable-api-properties configure argument, enabled
+## by default.
+##
+AC_DEFUN([GLIBMM_ARG_ENABLE_API_PROPERTIES],
+[
+  AC_ARG_ENABLE([api-properties],
+      [  --enable-api-properties  Build properties API.
+                              [[default=yes]]],
+      [glibmm_enable_api_properties="$enableval"],
+      [glibmm_enable_api_properties='yes'])
+
+  if test "x$glibmm_enable_api_properties" = "xyes"; then
+  {
+    AC_DEFINE([GLIBMM_PROPERTIES_ENABLED],[1], [Defined when the --enable-api-properties configure argument was given])
+  }
+  fi
+])
+
+## GLIBMM_ARG_ENABLE_API_VFUNCS()
+##
+## Provide the --enable-api-vfuncs configure argument, enabled
+## by default.
+##
+AC_DEFUN([GLIBMM_ARG_ENABLE_API_VFUNCS],
+[
+  AC_ARG_ENABLE([api-vfuncs],
+      [  --enable-api-vfuncs  Build vfuncs API.
+                              [[default=yes]]],
+      [glibmm_enable_api_vfuncs="$enableval"],
+      [glibmm_enable_api_vfuncs='yes'])
+
+  if test "x$glibmm_enable_api_vfuncs" = "xyes"; then
+  {
+    AC_DEFINE([GLIBMM_VFUNCS_ENABLED],[1], [Defined when the --enable-api-vfuncs configure argument was given])
+  }
+  fi
+])
+
+## GLIBMM_ARG_ENABLE_API_EXCEPTIONS()
+##
+## Provide the --enable-api-exceptions configure argument, enabled
+## by default.
+##
+AC_DEFUN([GLIBMM_ARG_ENABLE_API_EXCEPTIONS],
+[
+  AC_ARG_ENABLE([api-exceptions],
+      [  --enable-api-exceptions  Build exceptions API.
+                              [[default=yes]]],
+      [glibmm_enable_api_exceptions="$enableval"],
+      [glibmm_enable_api_exceptions='yes'])
+
+  if test "x$glibmm_enable_api_exceptions" = "xyes"; then
+  {
+    AC_DEFINE([GLIBMM_EXCEPTIONS_ENABLED],[1], [Defined when the --enable-api-exceptions configure argument was given])
+  }
+  fi
+])
+
+## GLIBMM_ARG_ENABLE_API_DEPRECATED()
+##
+## Provide the --enable-deprecated-api configure argument, enabled
+## by default.
+##
+AC_DEFUN([GLIBMM_ARG_ENABLE_API_DEPRECATED],
+[
+  AC_ARG_ENABLE(deprecated-api, 
+      [  --enable-deprecated-api  Include (build) deprecated API in the libraries.
+                              [[default=yes]]],
+      [glibmm_enable_api_deprecated="$enableval"],
+      [glibmm_enable_api_deprecated='yes'])
+
+  if test "x$glibmm_enable_api_deprecated" = "xyes"; then
+  {
+    AC_MSG_WARN([Deprecated API will be built, for backwards-compatibility.])
+  }
+  else
+  {
+    AC_MSG_WARN([Deprecated API will not be built, breaking backwards-compatibility. Do not use this build for distribution packages.])
+    DISABLE_DEPRECATED_API_CFLAGS="-DGLIBMM_DISABLE_DEPRECATED"
+    AC_SUBST(DISABLE_DEPRECATED_API_CFLAGS)
+  }
+  fi
+])
+
+
+## GLIBMM_ARG_ENABLE_API_DEFAULT_SIGNAL_HANDLERS()
+##
+## Provide the --enable-api-default-signal-handlers configure argument, enabled
+## by default.
+##
+AC_DEFUN([GLIBMM_ARG_ENABLE_API_DEFAULT_SIGNAL_HANDLERS],
+[
+  AC_ARG_ENABLE([api-default-signal-handlers],
+      [  --enable-api-default-signal-handlers  Build default signal handlers API.
+                              [[default=yes]]],
+      [glibmm_enable_api_default_signal_handlers="$enableval"],
+      [glibmm_enable_api_default_signal_handlers='yes'])
+
+  if test "x$glibmm_enable_api_default_signal_handlers" = "xyes"; then
+  {
+    AC_DEFINE([GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED],[1], [Defined when the --enable-api-default-signal-handlers configure argument was given])
+  }
+  fi
+])

libs/glibmm2/scripts/sun.m4

@@ -0,0 +1,15 @@
+AC_DEFUN([GLIBMM_PROG_CXX_SUN],
+  [AC_CACHE_CHECK(whether we are using SUN CC compiler, ac_cv_prog_sun_cxx,
+    [if AC_TRY_COMMAND(${CXX-g++} -V 2>&1) | egrep "Sun WorkShop" >/dev/null 2>&1; then
+      ac_cv_prog_sun_cxx=yes
+    else
+      ac_cv_prog_sun_cxx=no
+    fi]
+   )]
+
+   if test "x${ac_cv_prog_sun_cxx}" = "xyes"; then
+   {
+     AC_DEFINE([GLIBMM_COMPILER_SUN_FORTE],[1], [Defined when the SUN Forte C++ compiler is being used.])
+   }
+   fi
+)