From 67ad8f16cd122cb3cc3097fbde2db59257ae2a3e Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 4 Jul 2011 07:08:26 +0000
Subject: Fix kchmviewer FTBFS

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kchmviewer@1239258 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 configure.in    | 12 ++++++------
 configure.in.in | 12 ++++++------
 src/kde-qt.h    |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/configure.in b/configure.in
index 45b5bc5..5061cac 100644
--- a/configure.in
+++ b/configure.in
@@ -19,8 +19,13 @@ AC_DEFINE_UNQUOTED(APP_NAME, "$PACKAGE", [ Application name ] )
 AC_DEFINE_UNQUOTED(APP_VERSION, "$VERSION", [ Application version as text ])
 AC_DEFINE_UNQUOTED(APP_INT_VERSION,$INT_VERSION, [ Application version as integer ])
 
-dnl Checks for programs.
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_CXX
 AC_CHECK_COMPILERS
+AC_ENABLE_SHARED(yes)
+AC_ENABLE_STATIC(no)
+KDE_PROG_LIBTOOL
 
 dnl Check for X and extra X libs needed
 AC_PATH_XTRA
@@ -28,11 +33,6 @@ if test "$no_x" = yes; then
   AC_MSG_ERROR(You need to have the X11 libraries and headers installed)
 fi
 
-KDE_PROG_LIBTOOL
-AC_ENABLE_SHARED(yes)
-AC_ENABLE_STATIC(no)
-AC_PATH_QT
-
 CHMLIBDIR="lib/chmlib"
 EXTRA_SUBDIRS=""
 
diff --git a/configure.in.in b/configure.in.in
index e60b13c..157a6ba 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -15,8 +15,13 @@ AC_DEFINE_UNQUOTED(APP_NAME, "$PACKAGE", [ Application name ] )
 AC_DEFINE_UNQUOTED(APP_VERSION, "$VERSION", [ Application version as text ])
 AC_DEFINE_UNQUOTED(APP_INT_VERSION,$INT_VERSION, [ Application version as integer ])
 
-dnl Checks for programs.
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_CXX
 AC_CHECK_COMPILERS
+AC_ENABLE_SHARED(yes)
+AC_ENABLE_STATIC(no)
+KDE_PROG_LIBTOOL
 
 dnl Check for X and extra X libs needed
 AC_PATH_XTRA
@@ -26,11 +31,6 @@ fi
 
 KDE_SET_DEFAULT_BINDIRS
 
-KDE_PROG_LIBTOOL
-AC_ENABLE_SHARED(yes)
-AC_ENABLE_STATIC(no)
-AC_PATH_QT
-
 CHMLIBDIR="lib/chmlib"
 EXTRA_SUBDIRS=""
 
diff --git a/src/kde-qt.h b/src/kde-qt.h
index 233442f..14cbff5 100644
--- a/src/kde-qt.h
+++ b/src/kde-qt.h
@@ -51,7 +51,7 @@
 	#include <tqapplication.h>
 	#include <tqmainwindow.h>
 	#include <tqstring.h>
-	#include <statusbar.h>
+	#include <tqstatusbar.h>
 	#include <tqlistview.h>
 	#include <tqfiledialog.h>
 	#include <tqmenubar.h>
-- 
cgit v1.2.3