diff -r e8292658d5b3 -r c1941114ca88 aclocal.m4
--- a/aclocal.m4	Fri Nov 28 14:20:00 2008 +0100
+++ b/aclocal.m4	Fri Dec 05 23:14:02 2008 +0100
@@ -1,12 +1,12 @@
 ##
 ##  OSSP asgui - Accounting system graphical user interface
-##  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
-##  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
-##  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
-##  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
+##  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
+##  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
+##  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
+##  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
 ##
 ##  This file is part of OSSP GUI, a graphical user interface
-##  for OSSP which can be found at http://www.ossp.org/
+##  for OSSP which can be found at http://asgui.europalab.com/
 ##
 ##  Permission to use, copy, modify, and distribute this software for
 ##  any purpose with or without fee is hereby granted, provided that
@@ -313,52 +313,14 @@
     AC_MSG_ERROR([Neither \$QTDIR nor --with-qt=[DIR] paths exist])
 fi
 
-dnl ## Now search for libs and headers
-changequote(, )dnl
-for file in x `find $QTBASE/include -name "qapplication.h" -print`; do
-    test .$file = .x && continue
-    c_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
-done
-
-dnl ## Scan to find out which Qt library to link against
-dnl ## FIXME Merge static and dynamic library search blocks
-dnl ## FIXME Remove this qt-mt check and do --enable-threads instead
-for file in x `find $QTBASE/lib -name "libqt.so" -print`; do
-    test .$file = .x && continue
-    l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
-    lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.so;\1;'`
-done
-
-dnl ## If we have a multithreaded shared library, then it's better
-for file in x `find $QTBASE/lib -name "libqt-mt.so" -print`; do
-    test .$file = .x && continue
-    l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
-    lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.so;\1;'`
-done
-
-dnl ## If we have static libraries, then prefer to use those
-for file in x `find $QTBASE/lib -name "libqt.a" -print`; do
-    test .$file = .x && continue
-    l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
-    lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.a;\1;'`
-done
-
-dnl ## But the static multithreaded library is preferred above all
-for file in x `find $QTBASE/lib -name "libqt-mt.a" -print`; do
-    test .$file = .x && continue
-    l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
-    lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.a;\1;'`
-done
-changequote([, ])dnl
-
 dnl ## Append paths of libs and headers
 if test ".$lib" != .; then
     LIBS="$LIBS -l$lib"
 fi
-LDFLAGS="$LDFLAGS -L$l_dir"
+LDFLAGS="$LDFLAGS `$PKG_CONFIG --ldlags Qt3Support QtCore QtGui`"
 CPPFLAGS="$CPPFLAGS -DQT_THREAD_SUPPORT"
 CXXCPP="$CXXCPP -DQT_THREAD_SUPPORT"
-CXXFLAGS="$CXXFLAGS -I$c_dir"
+CXXFLAGS="$CXXFLAGS `$PKG_CONFIG --cflags-only-I Qt3Support QtCore QtGui`"
 ])