From kde-commits Thu Apr 21 10:57:46 2005 From: Stephan Kulow Date: Thu, 21 Apr 2005 10:57:46 +0000 To: kde-commits Subject: kde-common/admin Message-Id: <20050421105746.A30DF496 () office ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=111408107703184 CVS commit by coolo: this check was broken with --as-needed M +10 -7 acinclude.m4.in 2.508 --- kde-common/admin/acinclude.m4.in #2.507:2.508 @@ -3810,9 +3810,11 @@ AC_LANG_SAVE AC_LANG_CPLUSPLUS - ac_save_ldflags="$LDFLAGS" - ac_save_cxxflags="$CXXFLAGS" - LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lGL -lGLU" - test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11" - LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET" + ac_save_ldflags=$LDFLAGS + ac_save_cxxflags=$CXXFLAGS + ac_save_libs=$LIBS + LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries + LIBS="$LIBS -lGL -lGLU" + test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11" + LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET" CXXFLAGS="$CFLAGS $X_INCLUDES" test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" @@ -3822,6 +3824,7 @@ ac_cv_have_gl="yes", ac_cv_have_gl="no") AC_LANG_RESTORE - LDFLAGS="$ac_save_ldflags" - CXXFLAGS="$ac_save_cxxflags" + LDFLAGS=$ac_save_ldflags + CXXFLAGS=$ac_save_cxxflags + LIBS=$ac_save_libs ])dnl