[cogl] build: Do not define "default" in m4



commit 38a728b45a3718d9db71c9dc46535ca188368627
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Wed Jun 29 10:12:47 2011 +0100

    build: Do not define "default" in m4
    
    The "default" m4 conflicts with one of libtool's internal symbols, one
    that is used to determine whether the -fPIC argument should be used;
    this breaks compilation onf 64bit platforms.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=653615
    
    Signed-off-by: Emmanuele Bassi <ebassi linux intel com>
    Signed-off-by: Neil Roberts <neil linux intel com>

 configure.ac |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fed7298..07ec0f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,12 +159,12 @@ dnl ================================================================
 dnl     ============================================================
 dnl     Enable debugging
 dnl     ============================================================
-m4_define([default], [m4_if(cogl_release_status, [git], [yes], [no])])
+m4_define([debug_default], [m4_if(cogl_release_status, [git], [yes], [no])])
 AC_ARG_ENABLE(
   [debug],
-  [AC_HELP_STRING([--enable-debug=@<:@no/yes@:>@], [Control Cogl debugging level @<:@default=]default[@:>@])],
+  [AC_HELP_STRING([--enable-debug=@<:@no/yes@:>@], [Control Cogl debugging level @<:@default=]debug_default[@:>@])],
   [],
-  enable_debug=default
+  enable_debug=debug_default
 )
 AS_CASE(
   [$enable_debug],
@@ -238,12 +238,12 @@ dnl     ============================================================
 
 # use strict compiler flags only when building from git; the rules for
 # distcheck will take care of turning this on when making a release
-m4_define([default], [m4_if(cogl_release_status, [git], [yes], [no])])
+m4_define([maintainer_default], [m4_if(cogl_release_status, [git], [yes], [no])])
 AC_ARG_ENABLE(
   [maintainer-flags],
-  [AC_HELP_STRING([--enable-maintainer-flags=@<:@no/yes/error@:>@], [Use strict compiler flags @<:@default=]default[@:>@])],
+  [AC_HELP_STRING([--enable-maintainer-flags=@<:@no/yes/error@:>@], [Use strict compiler flags @<:@default=]maintainer_default[@:>@])],
   [],
-  enable_maintainer_flags=default
+  enable_maintainer_flags=maintainer_default
 )
 
 MAINTAINER_COMPILER_FLAGS="-Wall -Wcast-align -Wuninitialized



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]