[Libreoffice-commits] .: configure.in

[Lubos Lunak]

 configure.in |   46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 15f26e7194df882c9ee9f8dc340dc714810d62bf
Author: Lubos Lunak <l.lunak at suse.cz>
Date:   Tue Oct 19 16:58:17 2010 +0200

    explicitly state the version 3 when referring to Qt3/KDE3 in messages
    
    given that Qt3/KDE3 are the obsolete versions by now, it's not good
    to name them just Qt/KDE

diff --git a/configure.in b/configure.in
index 7aadf7c..a52d6cf 100644
--- a/configure.in
+++ b/configure.in
@@ -272,11 +272,11 @@ AC_ARG_ENABLE(nss_module,
 [  --disable-nss-module    Whether to use provided NSS module
 ],,enable_nss_module=yes)
 AC_ARG_ENABLE(kde,
-[  --enable-kde            Determines whether to use Qt/KDE vclplug on platforms
-                          where Qt and KDE are available.
+[  --enable-kde            Determines whether to use Qt3/KDE3 vclplug on platforms
+                          where Qt3 and KDE3 are available.
 ],,)
 AC_ARG_ENABLE(kdeab,
-[  --disable-kdeab         Disable the KDE address book support
+[  --disable-kdeab         Disable the KDE3 address book support
 ],,if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi)
 AC_ARG_ENABLE(kde4,
 [  --enable-kde4            Determines whether to use Qt4/KDE4 vclplug on platforms
@@ -6524,14 +6524,14 @@ AC_SUBST(COMMONS_HTTPCLIENT_JAR)
 AC_SUBST(COMMONS_LOGGING_JAR)
 
 dnl ===================================================================
-dnl Check whether the Qt and KDE libraries are available.
+dnl Check whether the Qt3 and KDE3 libraries are available.
 dnl ===================================================================
 
 KDE_CFLAGS=""
 KDE_LIBS=""
 MOC="moc"
 if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
-    dnl Search paths for Qt and KDE
+    dnl Search paths for Qt3 and KDE3
     if test "$build_cpu" != "x86_64" ; then
         qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include $x_includes"
         qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries"
@@ -6569,8 +6569,8 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
     kde_test_include="kapp.h"
     kde_test_library="libDCOP.so"
 
-    dnl Check for Qt headers
-    AC_MSG_CHECKING([for Qt headers])
+    dnl Check for Qt3 headers
+    AC_MSG_CHECKING([for Qt3 headers])
     qt_incdir="no"
     for kde_check in $qt_incdirs ; do
         if test -r "$kde_check/$qt_test_include" ; then
@@ -6580,12 +6580,12 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
     done
     AC_MSG_RESULT([$qt_incdir])
     if test "x$qt_incdir" = "xno" ; then
-        AC_MSG_ERROR([Qt headers not found.  Please specify the root of
-your Qt installation by exporting QTDIR before running "configure".])
+        AC_MSG_ERROR([Qt3 headers not found.  Please specify the root of
+your Qt3 installation by exporting QTDIR before running "configure".])
     fi
 
-    dnl Check for Qt libraries
-    AC_MSG_CHECKING([for Qt libraries])
+    dnl Check for Qt3 libraries
+    AC_MSG_CHECKING([for Qt3 libraries])
     qt_libdir="no"
     for qt_check in $qt_libdirs ; do
         if test -r "$qt_check/$qt_test_library" ; then
@@ -6595,19 +6595,19 @@ your Qt installation by exporting QTDIR before running "configure".])
     done
     AC_MSG_RESULT([$qt_libdir])
     if test "x$qt_libdir" = "xno" ; then
-        AC_MSG_ERROR([Qt libraries not found.  Please specify the root of
-your Qt installation by exporting QTDIR before running "configure".])
+        AC_MSG_ERROR([Qt3 libraries not found.  Please specify the root of
+your Qt3 installation by exporting QTDIR before running "configure".])
     fi
 
     dnl Check for Meta Object Compiler
     AC_PATH_PROG( MOC, moc, no, [`dirname $qt_libdir`/bin:$QTDIR/bin:$PATH] )
     if test "$MOC" = "no" ; then
-        AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
-the root of your Qt installation by exporting QTDIR before running "configure".])
+        AC_MSG_ERROR([Qt3 Meta Object Compiler not found.  Please specify
+the root of your Qt3 installation by exporting QTDIR before running "configure".])
     fi
 
-    dnl Check for KDE headers
-    AC_MSG_CHECKING([for KDE headers])
+    dnl Check for KDE3 headers
+    AC_MSG_CHECKING([for KDE3 headers])
     kde_incdir="no"
     for kde_check in $kde_incdirs ; do
         if test -r "$kde_check/$kde_test_include" ; then
@@ -6617,12 +6617,12 @@ the root of your Qt installation by exporting QTDIR before running "configure".]
     done
     AC_MSG_RESULT([$kde_incdir])
     if test "x$kde_incdir" = "xno" ; then
-        AC_MSG_ERROR([KDE headers not found.  Please specify the root of
-your KDE installation by exporting KDEDIR before running "configure".])
+        AC_MSG_ERROR([KDE3 headers not found.  Please specify the root of
+your KDE3 installation by exporting KDEDIR before running "configure".])
     fi
 
-    dnl Check for KDE libraries
-    AC_MSG_CHECKING([for KDE libraries])
+    dnl Check for KDE3 libraries
+    AC_MSG_CHECKING([for KDE3 libraries])
     kde_libdir="no"
     for kde_check in $kde_libdirs ; do
         if test -r "$kde_check/$kde_test_library" ; then
@@ -6632,8 +6632,8 @@ your KDE installation by exporting KDEDIR before running "configure".])
     done
     AC_MSG_RESULT([$kde_libdir])
     if test "x$kde_libdir" = "xno" ; then
-        AC_MSG_ERROR([KDE libraries not found.  Please specify the root of
-your KDE installation by exporting KDEDIR before running "configure".])
+        AC_MSG_ERROR([KDE3 libraries not found.  Please specify the root of
+your KDE3 installation by exporting KDEDIR before running "configure".])
     fi
 
     dnl Set the variables