[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 22:56:19
Message-ID: 20050107225619.AB3131BB62 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

New patch from Thiago: restore variable name so that Makefile.ams referencing it still work,
and rename configure option to the slightly less confusing --enable-new-ldflags


  M +12 -10    acinclude.m4.in   2.494


--- kde-common/admin/acinclude.m4.in  #2.493:2.494
@@ -986,5 +986,5 @@
 fi
 all_includes="$X_INCLUDES"
-all_libraries="$X_LDFLAGS $LDFLAGS_NEW_DTAGS"
+all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS"
 
 # Check for libraries that X11R6 Xt/Xaw programs need.
@@ -1699,21 +1699,23 @@
 
 dnl Check if the linker supports --enable-new-dtags and --as-needed
-AC_DEFUN([KDE_CHECK_NEW_DTAGS],
+AC_DEFUN([KDE_CHECK_NEW_LDFLAGS],
 [
-  AC_ARG_ENABLE(new_dtags,
-                AC_HELP_STRING([--enable-new-dtags],
+  AC_ARG_ENABLE(new_ldflags,
+                AC_HELP_STRING([--enable-new-ldflags],
                 [enable the new linker flags]),
-        kde_use_new_dtags=$enableval, 
-        kde_use_new_dtags=no)
+        kde_use_new_ldflags=$enableval, 
+        kde_use_new_ldflags=no)
 
+  LDFLAGS_AS_NEEDED=""
   LDFLAGS_NEW_DTAGS=""
-  if test "x$kde_use_new_dtags" = "xyes"; then
+  if test "x$kde_use_new_ldflags" = "xyes"; then
        LDFLAGS_NEW_DTAGS=""
        KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags],
-                [LDFLAGS_NEW_DTAGS="$LDFLAGS_NEW_DTAGS -Wl,--enable-new-dtags"],)
+                [LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"],)
 
        KDE_CHECK_COMPILER_FLAG([Wl,--as-needed],
-                [LDFLAGS_NEW_DTAGS="$LDFLAGS_NEW_DTAGS -Wl,--as-needed"],)
+                [LDFLAGS_AS_NEEDED="-Wl,--as-needed"],)
   fi
+  AC_SUBST(LDFLAGS_AS_NEEDED)
   AC_SUBST(LDFLAGS_NEW_DTAGS)
 ])
@@ -3185,5 +3187,5 @@
   AC_SUBST(ENABLE_PERMISSIVE_FLAG)
 
-  KDE_CHECK_NEW_DTAGS
+  KDE_CHECK_NEW_LDFLAGS
   KDE_CHECK_FINAL
   KDE_CHECK_CLOSURE


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