[Xfce4-commits] <xfce4-dev-tools:master> Fix XDT_FEATURE_LINKER_OPTS and XDT_FEATURE_VISIBILITY.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 90d686411e994a0adfe822e917b1954538d95b74 (commit)
       from 678b9705cb2424d0d690aee12ac56ba24e8aaebd (commit)

commit 90d686411e994a0adfe822e917b1954538d95b74
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sat Sep 19 17:32:07 2009 +0200

    Fix XDT_FEATURE_LINKER_OPTS and XDT_FEATURE_VISIBILITY.
    
    AC_ARG_ENABLE executes the code its last parameter if the --enable flag
    is not provided, not if the --disable flag is not provided. That's why
    we need to set the value to "no", not to "yes".
    
    Also don't show the --disable-debug option (with weird indentation)
    because the help message already explains that there are --disable
    variants for all --enable options.

 m4macros/xdt-features.m4 |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/m4macros/xdt-features.m4 b/m4macros/xdt-features.m4
index 5ec90d5..dc9b68b 100644
--- a/m4macros/xdt-features.m4
+++ b/m4macros/xdt-features.m4
@@ -61,8 +61,6 @@ AC_DEFUN([XDT_FEATURE_DEBUG],
   AC_ARG_ENABLE([debug],
                 AC_HELP_STRING([--enable-debug@<:@=no|minimum|yes|full@:>@],
                                [Build with debugging support @<:@default=m4_default([$1], [minimum])@:>@]),
-                AC_HELP_STRING([--disable-debug],
-                               [Include no debugging support]),
                 [enable_debug=$enableval], [enable_debug=m4_default([$1], [minimum])])
 
   AC_MSG_CHECKING([whether to build with debugging support])
@@ -131,7 +129,7 @@ AC_DEFUN([XDT_FEATURE_VISIBILITY],
   AC_ARG_ENABLE([visibility],
                 AC_HELP_STRING([--disable-visibility],
                                [Don't use ELF visibility attributes]),
-                [], [enable_visibility=yes])
+                [], [enable_visibility=no])
   have_gnuc_visibility=no
   if test "x$enable_visibility" != "xno"; then
     XDT_SUPPORTED_FLAGS([xdt_vis_test_cflags], [-Wall -Werror -Wno-unused-parameter])
@@ -180,7 +178,7 @@ AC_DEFUN([XDT_FEATURE_LINKER_OPTS],
   AC_ARG_ENABLE([linker-opts],
                 AC_HELP_STRING([--disable-linker-opts],
                                [Disable linker optimizations])
-                [], [enable_linker_opts=yes])
+                [], [enable_linker_opts=no])
 
   if test "x$enable_linker_opts" != "xno"; then
     AC_MSG_CHECKING([whether $LD accepts --as-needed])