configure.ac (10e8ff58) configure.ac (c1d0fc05)
1dnl /******************************************************************
2dnl * vi:set sw=3 ts=3 et:
3dnl *
4dnl * Name: configure.in
5dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
6dnl * Date: $Date: 2008-09-08 07:38:40 $
7dnl *
8dnl * Desc: This file serves as input for the GNU autoconf package

--- 6466 unchanged lines hidden (view full) ---

6475
6476KDE4_CFLAGS=""
6477KDE4_LIBS=""
6478MOC4="moc"
6479if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
6480 qt_incdirs="$QT4INC $QT4DIR /usr/include/qt4 /usr/include $x_includes"
6481 qt_libdirs="$QT4LIB /usr/lib $x_libraries"
6482
1dnl /******************************************************************
2dnl * vi:set sw=3 ts=3 et:
3dnl *
4dnl * Name: configure.in
5dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
6dnl * Date: $Date: 2008-09-08 07:38:40 $
7dnl *
8dnl * Desc: This file serves as input for the GNU autoconf package

--- 6466 unchanged lines hidden (view full) ---

6475
6476KDE4_CFLAGS=""
6477KDE4_LIBS=""
6478MOC4="moc"
6479if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
6480 qt_incdirs="$QT4INC $QT4DIR /usr/include/qt4 /usr/include $x_includes"
6481 qt_libdirs="$QT4LIB /usr/lib $x_libraries"
6482
6483 kde_incdirs="/usr/include $x_includes"
6484 kde_libdirs="/usr/lib $x_libraries"
6483 kde_incdirs="/usr/include /usr/include/kde4 $x_includes"
6484 kde_libdirs="/usr/lib /usr/lib/kde4 /usr/lib/kde4/devel $x_libraries"
6485
6486 if test "$build_cpu" = "x86_64" ; then
6487 qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
6485
6486 if test "$build_cpu" = "x86_64" ; then
6487 qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
6488 kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
6488 kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4 /usr/lib64/kde4/devel"
6489 fi
6490
6491 if test -n "$KDE4DIR" ; then
6492 kde_incdirs="$KDE4DIR/include $kde_incdirs"
6493 if test "$build_cpu" != "x86_64" ; then
6494 kde_libdirs="$KDE4DIR/lib $kde_libdirs"
6495 else
6496 kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs"

--- 30 unchanged lines hidden (view full) ---

6527
6528 AC_MSG_RESULT([$qt_lib_dir])
6529
6530 if test "x$qt_lib_dir" = "xno" ; then
6531 AC_MSG_ERROR([Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
6532 fi
6533
6534 dnl Check for Meta Object Compiler
6489 fi
6490
6491 if test -n "$KDE4DIR" ; then
6492 kde_incdirs="$KDE4DIR/include $kde_incdirs"
6493 if test "$build_cpu" != "x86_64" ; then
6494 kde_libdirs="$KDE4DIR/lib $kde_libdirs"
6495 else
6496 kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs"

--- 30 unchanged lines hidden (view full) ---

6527
6528 AC_MSG_RESULT([$qt_lib_dir])
6529
6530 if test "x$qt_lib_dir" = "xno" ; then
6531 AC_MSG_ERROR([Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
6532 fi
6533
6534 dnl Check for Meta Object Compiler
6535 AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] )
6535 AC_PATH_PROG( MOCQT4, moc-qt4, no, [$QT4DIR/bin:$PATH] )
6536 MOC4="$MOCQT4"
6536 if test "$MOC4" = "no" ; then
6537 if test "$MOC4" = "no" ; then
6537 AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
6538the root of your Qt installation by exporting QT4DIR before running "configure".])
6538 AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] )
6539 if test "$MOC4" = "no" ; then
6540 AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify the root of your Qt installation by exporting QT4DIR before running "configure".])
6541 fi
6539 fi
6540
6541 dnl Check for KDE4 headers
6542 AC_MSG_CHECKING([for KDE4 headers])
6543 kde_incdir="no"
6544 for kde_check in $kde_incdirs ; do
6545 if test -r "$kde_check/$kde_test_include" ; then
6546 kde_incdir="$kde_check"

--- 832 unchanged lines hidden --- 		6542 fi
6543
6544 dnl Check for KDE4 headers
6545 AC_MSG_CHECKING([for KDE4 headers])
6546 kde_incdir="no"
6547 for kde_check in $kde_incdirs ; do
6548 if test -r "$kde_check/$kde_test_include" ; then
6549 kde_incdir="$kde_check"

--- 832 unchanged lines hidden ---