[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kde-common/admin
From:       David Faure <faure () kde ! org>
Date:       2005-01-07 18:36:19
Message-ID: 20050107183619.031261B8E8 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Patch by Thiago to disable --as-needed by default, since it leads to too many problems
while developing, e.g. /usr preferred over $KDEDIR due to libstdc++ being in /usr.

Packagers should use --enable-new-dtags to build smaller libraries (with less dependencies
to other libraries).
CCMAIL: kde-packager@kde.org


  M +15 -21    acinclude.m4.in   2.493


--- kde-common/admin/acinclude.m4.in  #2.492:2.493
@@ -986,5 +986,5 @@
 fi
 all_includes="$X_INCLUDES"
-all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS"
+all_libraries="$X_LDFLAGS $LDFLAGS_NEW_DTAGS"
 
 # Check for libraries that X11R6 Xt/Xaw programs need.
@@ -1698,29 +1698,23 @@
 ])
 
-dnl Check if the linker supports --enable-new-dtags
+dnl Check if the linker supports --enable-new-dtags and --as-needed
 AC_DEFUN([KDE_CHECK_NEW_DTAGS],
 [
-  LDFLAGS_NEW_DTAGS=""
-  KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags],
-       [LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"],)
-  AC_SUBST(LDFLAGS_NEW_DTAGS)
-])
-
-dnl Check for the linker if it supports --as-needed
-AC_DEFUN([KDE_CHECK_AS_NEEDED],
-[
-  KDE_CHECK_NEW_DTAGS
+  AC_ARG_ENABLE(new_dtags,
+                AC_HELP_STRING([--enable-new-dtags],
+                [enable the new linker flags]),
+        kde_use_new_dtags=$enableval, 
+        kde_use_new_dtags=no)
 
-  AC_ARG_ENABLE(as_needed,
-                AC_HELP_STRING([--disable-as-needed],[disable the --as-needed flag for the linker]),
-        kde_use_as_needed=$enableval, kde_use_as_needed=$kde_cv_prog_cxx_Wl___enable_new_dtags)
+  LDFLAGS_NEW_DTAGS=""
+  if test "x$kde_use_new_dtags" = "xyes"; then
+       LDFLAGS_NEW_DTAGS=""
+       KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags],
+                [LDFLAGS_NEW_DTAGS="$LDFLAGS_NEW_DTAGS -Wl,--enable-new-dtags"],)
 
-  LDFLAGS_AS_NEEDED=""
-  if test "x$kde_use_as_needed" = "xyes"; then
        KDE_CHECK_COMPILER_FLAG([Wl,--as-needed],
-       [LDFLAGS_AS_NEEDED="-Wl,--as-needed"],)
+                [LDFLAGS_NEW_DTAGS="$LDFLAGS_NEW_DTAGS -Wl,--as-needed"],)
   fi
-  AC_SUBST(LDFLAGS_AS_NEEDED)
-  
+  AC_SUBST(LDFLAGS_NEW_DTAGS)
 ])
 
@@ -3191,5 +3185,5 @@
   AC_SUBST(ENABLE_PERMISSIVE_FLAG)
 
-  KDE_CHECK_AS_NEEDED
+  KDE_CHECK_NEW_DTAGS
   KDE_CHECK_FINAL
   KDE_CHECK_CLOSURE


[prev in list] [next in list] [prev in thread] [next in thread]