QTDIR is precious

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10169 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 0da4fe89ad7ab258694e169c43c4ba4e038a36c8..003920d45a4773fb19cd4c04146947ceecc22d15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-12  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * INSTALL: small tweak.
+
 2005-06-01  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * configure.ac: if the xforms frontend is added just to help gtk,

diff --git a/INSTALL b/INSTALL
index a3d4db782ee5bda2b41a1e27a41feb7f221d3f6b..2837c2b8e7ed3b41b7e8520948b50e008cbfaf78 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -13,7 +13,8 @@ These four steps will compile, test and install LyX:
           configures LyX to your system. By default, LyX configures
            the xforms frontend, use --with-frontend=qt to build a Qt
            version. You may have to set
-           --with-qt-dir=<path-to-your-qt-installation> to succeed.
+             --with-qt-dir=<path-to-your-qt-installation>
+           if the environment variable QTDIR is not set. 
 
        2) make
           compiles the program.

diff --git a/config/ChangeLog b/config/ChangeLog
index f3bda3bc8ab07fae5cde1f06e61b12267bff717a..ab25855927e12ead18b8b7aed01e3c1477285f7e 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-12  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * qt.m4 (QT_DO_IT_ALL): mark the QTDIR variable as precious.
+
 2005-05-04  Angus Leeming  <leeming@lyx.org>
 
        * common.am (*.o *.lo *.obj): make the TARGETS depend on $(PCH_FILE),

diff --git a/config/qt.m4 b/config/qt.m4
index 22167f6aa0442019ce0810a3d0ea4f698bb2930f..6fc6908a9b06f446948842a27122fa6d4e712e74 100644 (file)
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -159,6 +159,9 @@ EOF
 dnl start here
 AC_DEFUN([QT_DO_IT_ALL],
 [
+       dnl this variable is precious
+       AC_ARG_VAR(QTDIR, [the place where the Qt files are, e.g. /usr/lib/qt])
+
        dnl Please leave this alone. I use this file in
        dnl oprofile.
        FATAL=0