1.1 --- a/aclocal.m4 Fri Nov 28 14:20:00 2008 +0100
1.2 +++ b/aclocal.m4 Fri Dec 05 23:14:02 2008 +0100
1.3 @@ -1,12 +1,12 @@
1.4 ##
1.5 ## OSSP asgui - Accounting system graphical user interface
1.6 -## Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
1.7 -## Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
1.8 -## Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
1.9 -## Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
1.10 +## Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
1.11 +## Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
1.12 +## Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
1.13 +## Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
1.14 ##
1.15 ## This file is part of OSSP GUI, a graphical user interface
1.16 -## for OSSP which can be found at http://www.ossp.org/
1.17 +## for OSSP which can be found at http://asgui.europalab.com/
1.18 ##
1.19 ## Permission to use, copy, modify, and distribute this software for
1.20 ## any purpose with or without fee is hereby granted, provided that
1.21 @@ -313,52 +313,14 @@
1.22 AC_MSG_ERROR([Neither \$QTDIR nor --with-qt=[DIR] paths exist])
1.23 fi
1.24
1.25 -dnl ## Now search for libs and headers
1.26 -changequote(, )dnl
1.27 -for file in x `find $QTBASE/include -name "qapplication.h" -print`; do
1.28 - test .$file = .x && continue
1.29 - c_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
1.30 -done
1.31 -
1.32 -dnl ## Scan to find out which Qt library to link against
1.33 -dnl ## FIXME Merge static and dynamic library search blocks
1.34 -dnl ## FIXME Remove this qt-mt check and do --enable-threads instead
1.35 -for file in x `find $QTBASE/lib -name "libqt.so" -print`; do
1.36 - test .$file = .x && continue
1.37 - l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
1.38 - lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.so;\1;'`
1.39 -done
1.40 -
1.41 -dnl ## If we have a multithreaded shared library, then it's better
1.42 -for file in x `find $QTBASE/lib -name "libqt-mt.so" -print`; do
1.43 - test .$file = .x && continue
1.44 - l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
1.45 - lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.so;\1;'`
1.46 -done
1.47 -
1.48 -dnl ## If we have static libraries, then prefer to use those
1.49 -for file in x `find $QTBASE/lib -name "libqt.a" -print`; do
1.50 - test .$file = .x && continue
1.51 - l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
1.52 - lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.a;\1;'`
1.53 -done
1.54 -
1.55 -dnl ## But the static multithreaded library is preferred above all
1.56 -for file in x `find $QTBASE/lib -name "libqt-mt.a" -print`; do
1.57 - test .$file = .x && continue
1.58 - l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
1.59 - lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.a;\1;'`
1.60 -done
1.61 -changequote([, ])dnl
1.62 -
1.63 dnl ## Append paths of libs and headers
1.64 if test ".$lib" != .; then
1.65 LIBS="$LIBS -l$lib"
1.66 fi
1.67 -LDFLAGS="$LDFLAGS -L$l_dir"
1.68 +LDFLAGS="$LDFLAGS `$PKG_CONFIG --ldlags Qt3Support QtCore QtGui`"
1.69 CPPFLAGS="$CPPFLAGS -DQT_THREAD_SUPPORT"
1.70 CXXCPP="$CXXCPP -DQT_THREAD_SUPPORT"
1.71 -CXXFLAGS="$CXXFLAGS -I$c_dir"
1.72 +CXXFLAGS="$CXXFLAGS `$PKG_CONFIG --cflags-only-I Qt3Support QtCore QtGui`"
1.73 ])
1.74
1.75
