2004-05-21 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Fri, 21 May 2004 15:25:16 +0000 (15:25 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Fri, 21 May 2004 15:25:16 +0000 (15:25 +0000)
* acinclude.m4 (QT_CHECK_DIRECT): Removed.
(QT_PATH_1_3): Do never invoke QT_CHECK_DIRECT.

ChangeLog
NEWS
acinclude.m4

index acfd8a2..c21a369 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-21  Marcus Brinkmann  <marcus@g10code.de>
+
+       * acinclude.m4 (QT_CHECK_DIRECT): Removed.
+       (QT_PATH_1_3): Do never invoke QT_CHECK_DIRECT.
+
 2004-04-21  Werner Koch  <wk@gnupg.org>
 
        Released 0.7.1.
diff --git a/NEWS b/NEWS
index f9d3542..79f1531 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,8 @@
 Noteworthy changes in version 0.7.2 (unreleased)
 ------------------------------------------------
 
-
-
+ * Remove bug in configure script that would use installed version of
+   Qt even if another path was explicitely specified with QTDIR.
 
 Noteworthy changes in version 0.7.1 (2004-04-21)
 ------------------------------------------------
index 6ba9d05..7587ea7 100644 (file)
@@ -962,58 +962,6 @@ fi
 ])
 
 
-AC_DEFUN(QT_CHECK_DIRECT,
-[
-AC_REQUIRE([QT_CHECK_VERSION])
-AC_MSG_CHECKING([if Qt compiles without flags])
-AC_CACHE_VAL(kde_cv_qt_direct,
-[
-AC_LANG_PUSH(C++)
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt_includes"
-LDFLAGS="$LDFLAGS $QT_LDFLAGS"
-LIBS="$QT_LIBS"
-LD_LIBRARY_PATH=
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-QT_PRINT_PROGRAM
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-  kde_cv_qt_direct="yes"
-else
-  kde_cv_qt_direct="no"
-  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
-  cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
-fi
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-AC_LANG_POP(C++)
-])
-
-if test "$kde_cv_qt_direct" = "yes"; then
-  AC_MSG_RESULT(yes)
-  $1
-else
-  AC_MSG_RESULT(no)
-  $2
-fi
-])
-
 dnl ------------------------------------------------------------------------
 dnl Try to find the Qt headers and libraries.
 dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
@@ -1251,10 +1199,6 @@ else
   qt_includes="$ac_qt_includes"
 fi
 
-if test ! "$kde_qt_libs_given" = "yes"; then
-QT_CHECK_DIRECT(qt_libraries= ,[])
-fi
-
 AC_SUBST(qt_libraries)
 AC_SUBST(qt_includes)