diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/acinclude.m4.in | 423 |
1 files changed, 30 insertions, 393 deletions
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index 0c7f0e72..3e7bfb37 100644 --- a/admin/acinclude.m4.in +++ b/admin/acinclude.m4.in @@ -1453,34 +1453,15 @@ AC_DEFUN([AC_SS_FIND_QT], AC_HELP_STRING([--disable-qt-check],[Do not check if Qt and X compile]), SS_CHECK_QTX_COMPILE="$withval",SS_CHECK_QTX_COMPILE="NOTGIVEN") - AC_ARG_ENABLE(qt4, - AC_HELP_STRING([--enable-qt4],[Enable WORK IN PROGRESS Qt4 support]), - SS_USE_QT4="$withval",SS_USE_QT4="no") - - if test "$SS_USE_QT4" = "no"; then - - AC_SS_FIND_QT3_NAME - AC_SS_FIND_QT3_GENERAL_DIR - AC_SS_FIND_QT3_LIBRARY_DIR - AC_SS_FIND_QT3_INCLUDE_DIR - AC_SS_FIND_QT3_MOC - AC_SS_FIND_QT3_MT - - if test "$SS_CHECK_QTX_COMPILE" = "NOTGIVEN"; then - AC_SS_ENSURE_CAN_COMPILE_X_AND_QT3 - fi - else - - AC_SS_FIND_QT4_GENERAL_DIR - AC_SS_FIND_QT4_LIBRARY_DIR - AC_SS_FIND_QT4_INCLUDE_DIR - AC_SS_FIND_QT4_MOC - - - if test "$SS_CHECK_QTX_COMPILE" = "NOTGIVEN"; then - AC_SS_ENSURE_CAN_COMPILE_X_AND_QT4 - fi + AC_SS_FIND_QT3_NAME + AC_SS_FIND_QT3_GENERAL_DIR + AC_SS_FIND_QT3_LIBRARY_DIR + AC_SS_FIND_QT3_INCLUDE_DIR + AC_SS_FIND_QT3_MOC + AC_SS_FIND_QT3_MT + if test "$SS_CHECK_QTX_COMPILE" = "NOTGIVEN"; then + AC_SS_ENSURE_CAN_COMPILE_X_AND_QT3 fi ]) @@ -1537,47 +1518,6 @@ AC_DEFUN([AC_SS_FIND_QT3_GENERAL_DIR], fi ]) -AC_DEFUN([AC_SS_FIND_QT4_GENERAL_DIR], -[ - AC_MSG_CHECKING([for the general Qt4.x directory]) - - ss_qt_general_test_dirs="/usr/local /usr /usr/X11R6 /usr/lib /opt /opt/kde /kde /usr/kde /usr/build /usr/src /usr/local/lib /" - ss_qt_general_test_dirs="$ss_qt_general_test_dirs /usr/local/kde /usr/opt/kde /usr/lib/qt4 /usr/local/lib/qt4" - - if test -n "$HOME"; then - ss_qt_general_test_dirs="$ss_qt_general_test_dirs $HOME $HOME/lib" - fi - - if test -n "$TQTDIR"; then - ss_qt_general_test_dirs="$TQTDIR $ss_qt_general_test_dirs" - fi - - ss_qt_general_test_path_suffix="qt$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED.$SS_QT4_PATCH_LEVEL_REQUIRED" - ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt.$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED.$SS_QT4_PATCH_LEVEL_REQUIRED" - ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt.$SS_QT4_MAJOR_VERSION_REQUIRED$SS_QT4_MINOR_VERSION_REQUIRED$SS_QT4_PATCH_LEVEL_REQUIRED" - ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt-$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED.$SS_QT4_PATCH_LEVEL_REQUIRED" - ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt-$SS_QT4_MAJOR_VERSION_REQUIRED$SS_QT4_MINOR_VERSION_REQUIRED$SS_QT4_PATCH_LEVEL_REQUIRED" - ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED" - ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt.$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED" - ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt.$SS_QT4_MAJOR_VERSION_REQUIRED$SS_QT4_MINOR_VERSION_REQUIRED" - ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt-$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED" - ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt-$SS_QT4_MAJOR_VERSION_REQUIRED$SS_QT4_MINOR_VERSION_REQUIRED" - ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt$SS_QT4_MAJOR_VERSION_REQUIRED" - ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt.$SS_QT4_MAJOR_VERSION_REQUIRED" - ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt-$SS_QT4_MAJOR_VERSION_REQUIRED" - ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix lib" - ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt ." - - AC_SS_FIND_FILE_PATH_EXT($SS_QT4_GENERAL_FILE_TO_SEARCH,$ss_qt_general_test_dirs,$ss_qt_general_test_path_suffix,SS_QT4_GENERAL_DIR) - if test "$SS_QT4_GENERAL_DIR" = "FAILED"; then - AC_MSG_RESULT([failed...continuing with normal checks]) - unset SS_QT4_GENERAL_DIR - else - AC_MSG_RESULT([Seems to be $SS_QT4_GENERAL_DIR]) - fi -]) - - AC_DEFUN([AC_SS_FIND_QT3_INCLUDE_DIR], [ AC_ARG_WITH(qt-include-dir,[ --with-qt-include-dir path to the Qt 3.x headers ],SS_QT3_INCDIR="$withval",SS_QT3_INCDIR="NOTGIVEN") @@ -1599,77 +1539,14 @@ AC_DEFUN([AC_SS_FIND_QT3_INCLUDE_DIR], fi if test "$SS_QT3_INCDIR" = "FAILED"; then - - dnl HACK HACK HACK - - ss_qt_include_test_dirs="$SS_QT4_GENERAL_DIR/include /include /usr/include /usr/local/include /usr/qt/include /usr/include/qt4 /usr/qt4/include /usr/local/qt/include /usr/X11R6/include /usr/lib/qt/include /usr/lib/qt /usr/include/X11" - test -n "$TQTDIR" && ss_qt_include_test_dirs="$TQTDIR/include $TQTDIR $ss_qt_include_test_dirs" - ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt /usr/include/qt4 /usr/local/include/qt /include/qt /usr/X11R6/include/qt /usr/build/qt/include" - ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED /usr/include/qt-$SS_QT4_MAJOR_VERSION_REQUIRED /usr/local/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED" - ss_qt_include_test_dirs="$ss_qt_include_test_dirs /include/qt$SS_QT4_MAJOR_VERSION_REQUIRED /usr/X11R6/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED" - ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/X11/qt$SS_QT4_MAJOR_VERSION_REQUIRED /opt/qt /opt/kde/qt" - - AC_SS_FIND_FILE_PATH($SS_QT4_INCLUDE_FILE_TO_SEARCH,$ss_qt_include_test_dirs,SS_QT4_INCDIR) - - SS_QT3_INCDIR="$SS_QT4_INCDIR -I/usr/include/tqt -include tqt.h" - AC_MSG_RESULT([TQt4 detected--Qt4 found in $SS_QT3_INCDIR]) - -dnl AC_MSG_RESULT([FAILED]) -dnl AC_SS_SET_REDINK -dnl echo "################################################################################" -dnl echo "### CONFIGURE ERROR:" -dnl echo "### Can not find the qt 3.x header files." -dnl echo "### Make sure that qt is correctly installed on your system," -dnl echo "### and the qt version is the one requested by this version of kvirc." -dnl echo "### Try to run configure again, this time passing the --with-qt-include-dir" -dnl echo "### option (see ./configure --help)." -dnl echo "### You may also take a look at the config.log file in this directory," -dnl echo "### that will tell you which check has failed and maybe more about the reason" -dnl echo "### of the failure." -dnl echo "### If you're feeling that this may be a bug in this configure script" -dnl echo "### and want to report this to me , please include your configure script," -dnl echo "### the config.log file as well as the complete configure output." -dnl echo "################################################################################" -dnl AC_SS_SET_NORMALINK -dnl AC_MSG_ERROR([This was a fatal one...aborting]) - else - SS_QT3_INCDIR="$SS_QT3_INCDIR -I/usr/include/tqt -include tqt.h" - - AC_MSG_RESULT([found in $SS_QT3_INCDIR]) - fi - - else - AC_MSG_RESULT([using user supplied path for the Qt 3.x include files $SS_QT3_INCDIR]) - SS_QT3_INCDIR="$SS_QT3_INCDIR -I/usr/include/tqt -include tqt.h" - fi -]) - - -AC_DEFUN([AC_SS_FIND_QT4_INCLUDE_DIR], -[ - AC_ARG_WITH(qt4-include-dir,[ --with-qt4-include-dir path to the Qt 4.x headers ],SS_QT4_INCDIR="$withval",SS_QT4_INCDIR="NOTGIVEN") - if test "$SS_QT4_INCDIR" = "NOTGIVEN"; then - - AC_MSG_CHECKING([for the Qt 4.x header files]) - - ss_qt_include_test_dirs="$SS_QT4_GENERAL_DIR/include /include /usr/include /usr/local/include /usr/qt/include /usr/include/qt4 /usr/qt4/include /usr/local/qt/include /usr/X11R6/include /usr/lib/qt/include /usr/lib/qt /usr/include/X11" - test -n "$TQTDIR" && ss_qt_include_test_dirs="$TQTDIR/include $TQTDIR $ss_qt_include_test_dirs" - ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt /usr/include/qt4 /usr/local/include/qt /include/qt /usr/X11R6/include/qt /usr/build/qt/include" - ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED /usr/include/qt-$SS_QT4_MAJOR_VERSION_REQUIRED /usr/local/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED" - ss_qt_include_test_dirs="$ss_qt_include_test_dirs /include/qt$SS_QT4_MAJOR_VERSION_REQUIRED /usr/X11R6/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED" - ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/X11/qt$SS_QT4_MAJOR_VERSION_REQUIRED /opt/qt /opt/kde/qt" - - AC_SS_FIND_FILE_PATH($SS_QT4_INCLUDE_FILE_TO_SEARCH,$ss_qt_include_test_dirs,SS_QT4_INCDIR) - - if test "$SS_QT4_INCDIR" = "FAILED"; then AC_MSG_RESULT([FAILED]) AC_SS_SET_REDINK echo "################################################################################" echo "### CONFIGURE ERROR:" - echo "### Can not find the qt 4.x header files." + echo "### Can not find the qt 3.x header files." echo "### Make sure that qt is correctly installed on your system," echo "### and the qt version is the one requested by this version of kvirc." - echo "### Try to run configure again, this time passing the --with-qt4-include-dir" + echo "### Try to run configure again, this time passing the --with-qt-include-dir" echo "### option (see ./configure --help)." echo "### You may also take a look at the config.log file in this directory," echo "### that will tell you which check has failed and maybe more about the reason" @@ -1681,14 +1558,15 @@ AC_DEFUN([AC_SS_FIND_QT4_INCLUDE_DIR], AC_SS_SET_NORMALINK AC_MSG_ERROR([This was a fatal one...aborting]) else - AC_MSG_RESULT([found in $SS_QT4_INCDIR]) + SS_QT3_INCDIR="$SS_QT3_INCDIR -I/usr/include/tqt -include tqt.h" + + AC_MSG_RESULT([found in $SS_QT3_INCDIR]) fi else - AC_MSG_RESULT([using user supplied path for the Qt 4.x include files $SS_QT4_INCDIR]) + AC_MSG_RESULT([using user supplied path for the Qt 3.x include files $SS_QT3_INCDIR]) + SS_QT3_INCDIR="$SS_QT3_INCDIR -I/usr/include/tqt -include tqt.h" fi - - SS_QT4_INCDIRECTORIES="-I$SS_QT4_INCDIR -I$SS_QT4_INCDIR/Qt/ -I$SS_QT4_INCDIR/QtCore/ -I$SS_QT4_INCDIR/QtGui/"; ]) @@ -1725,93 +1603,15 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR], AC_SS_FIND_FILE_PATH($ss_qt_libs_to_find,$ss_qt_library_test_dirs,SS_QT3_LIBDIR) if test "$SS_QT3_LIBDIR" = "FAILED"; then - - dnl HACK HACK HACK - - AC_MSG_CHECKING([for the Qt 4.x libraries]) - - ss_qt_library_test_dirs="$SS_QT4_GENERAL_DIR/lib /lib /usr/lib /usr/local/lib /usr/qt/lib /usr/local/qt/lib /usr/X11R6/lib /usr/lib/qt/lib /usr/lib/qt /usr/local/lib/qt/lib" - test -n "$TQTDIR" && ss_qt_library_test_dirs="$TQTDIR/lib $TQTDIR $ss_qt_library_test_dirs" - ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/local/lib/qt /usr/X11R6/lib/qt /usr/build/qt/lib /opt/lib /opt/qt/lib" - ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/lib/qt4 /usr/local/lib/qt4 /usr/X11R6/lib/qt4" - ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/build/qt4/lib /opt/qt4/lib" - - ss_qt_libs_to_find="libQtCore.so.$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED.$SS_QT4_PATCH_LEVEL_REQUIRED" - ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED" - ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.$SS_QT4_MAJOR_VERSION_REQUIRED" - ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so" - ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED.dylib" - ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.$SS_QT4_MAJOR_VERSION_REQUIRED.dylib" - ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.dylib" - ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.a" - - AC_SS_FIND_FILE_PATH($ss_qt_libs_to_find,$ss_qt_library_test_dirs,SS_QT4_LIBDIR) - - SS_QT3_LIBDIR="$SS_QT4_LIBDIR" - SS_TQTLIB_NAME="tqt" - AC_MSG_RESULT([TQt4 detected--Qt4 found in $SS_QT3_LIBDIR]) - -dnl AC_MSG_RESULT([FAILED]) -dnl AC_SS_SET_REDINK -dnl echo "################################################################################" -dnl echo "### CONFIGURE ERROR:" -dnl echo "### Can not find the qt 3.x library file." -dnl echo "### Make sure that qt is correctly installed on your system," -dnl echo "### and the qt version is the one requested by this version of kvirc." -dnl echo "### (Usually a greater version is OK too)" -dnl echo "### Try to run configure again, this time passing the --with-qt-library-dir" -dnl echo "### option (see ./configure --help)." -dnl echo "### You may also take a look at the config.log file in this directory," -dnl echo "### that will tell you which check has failed and maybe more about the reason" -dnl echo "### of the failure." -dnl echo "### If you're feeling that this may be a bug in this configure script" -dnl echo "### and want to report this to me , please include your configure script," -dnl echo "### the config.log file as well as the complete configure output." -dnl echo "################################################################################" -dnl AC_SS_SET_NORMALINK -dnl AC_MSG_ERROR([This was a fatal one...aborting]) - else - AC_MSG_RESULT([TQt3 found in $SS_QT3_LIBDIR]) - fi - else - AC_MSG_RESULT([using user supplied path for the Qt library $SS_QT3_LIBDIR]) - fi -]) - - -AC_DEFUN([AC_SS_FIND_QT4_LIBRARY_DIR], -[ - AC_ARG_WITH(qt4-library-dir,[ --with-qt4-library-dir path to the Qt 4.x library ],SS_QT4_LIBDIR="$withval",SS_QT4_LIBDIR="NOTGIVEN") - if test "$SS_QT4_LIBDIR" = "NOTGIVEN"; then - AC_MSG_CHECKING([for the Qt 4.x libraries]) - - ss_qt_library_test_dirs="$SS_QT4_GENERAL_DIR/lib /lib /usr/lib /usr/local/lib /usr/qt/lib /usr/local/qt/lib /usr/X11R6/lib /usr/lib/qt/lib /usr/lib/qt /usr/local/lib/qt/lib" - test -n "$TQTDIR" && ss_qt_library_test_dirs="$TQTDIR/lib $TQTDIR $ss_qt_library_test_dirs" - ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/local/lib/qt /usr/X11R6/lib/qt /usr/build/qt/lib /opt/lib /opt/qt/lib" - ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/lib/qt4 /usr/local/lib/qt4 /usr/X11R6/lib/qt4" - ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/build/qt4/lib /opt/qt4/lib" - - ss_qt_libs_to_find="libQtCore.so.$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED.$SS_QT4_PATCH_LEVEL_REQUIRED" - ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED" - ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.$SS_QT4_MAJOR_VERSION_REQUIRED" - ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so" - ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED.dylib" - ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.$SS_QT4_MAJOR_VERSION_REQUIRED.dylib" - ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.dylib" - ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.a" - - AC_SS_FIND_FILE_PATH($ss_qt_libs_to_find,$ss_qt_library_test_dirs,SS_QT4_LIBDIR) - - if test "$SS_QT4_LIBDIR" = "FAILED"; then AC_MSG_RESULT([FAILED]) AC_SS_SET_REDINK echo "################################################################################" echo "### CONFIGURE ERROR:" - echo "### Can not find the qt 4.x library files." + echo "### Can not find the qt 3.x library file." echo "### Make sure that qt is correctly installed on your system," echo "### and the qt version is the one requested by this version of kvirc." echo "### (Usually a greater version is OK too)" - echo "### Try to run configure again, this time passing the --with-qt4-library-dir" + echo "### Try to run configure again, this time passing the --with-qt-library-dir" echo "### option (see ./configure --help)." echo "### You may also take a look at the config.log file in this directory," echo "### that will tell you which check has failed and maybe more about the reason" @@ -1823,10 +1623,10 @@ AC_DEFUN([AC_SS_FIND_QT4_LIBRARY_DIR], AC_SS_SET_NORMALINK AC_MSG_ERROR([This was a fatal one...aborting]) else - AC_MSG_RESULT([found in $SS_QT4_LIBDIR]) + AC_MSG_RESULT([TQt3 found in $SS_QT3_LIBDIR]) fi else - AC_MSG_RESULT([using user supplied path for the Qt 4.x library $SS_QT4_LIBDIR]) + AC_MSG_RESULT([using user supplied path for the Qt library $SS_QT3_LIBDIR]) fi ]) @@ -1875,52 +1675,6 @@ AC_DEFUN([AC_SS_FIND_QT3_MOC], ]) -AC_DEFUN([AC_SS_FIND_QT4_MOC], -[ - AC_ARG_WITH(qt4-moc,[ --with-qt4-moc filename of the Qt 4.x meta object compiler ],SS_QT4_MOC="$withval",SS_QT4_MOC="NOTGIVEN") - - if test "$SS_QT4_MOC" = "NOTGIVEN"; then - AC_MSG_CHECKING([for the Qt 4.x moc]) - - unset SS_QT4_MOC - ss_moc_test_dirs="$TQTDIR/bin $PATH /usr/bin /bin /usr/local/bin /usr/X11R6/bin /usr/lib/qt/bin /usr/local/qt/bin /usr/X11R6/qt/bin /usr/qt/bin /usr/build/qt/bin" - if test -n "$SS_QT4_GENERAL_DIR"; then - ss_moc_test_dirs="$SS_QT4_GENERAL_DIR/bin $ss_moc_test_dirs" - fi - - AC_SS_FIND_FILE_PATH(moc,$ss_moc_test_dirs,SS_QT4_MOC) - - if test "$SS_QT4_MOC" = "FAILED"; then - AC_MSG_RESULT([FAILED]) - AC_SS_SET_REDINK - echo "################################################################################" - echo "### CONFIGURE ERROR:" - echo "### The Qt 4.x meta object compiler can not be found." - echo "### Make sure that qt is correctly installed on your system, it is on your path," - echo "### and the qt version is the one requested by this version of kvirc." - echo "### In particular you should make sure that the moc compiler is NOT the one" - echo "### shipped with Qt 3.x." - echo "### Try to run configure again, this time passing the --with-qt4-moc" - echo "### option (see ./configure --help)." - echo "### You may also take a look at the config.log file in this directory," - echo "### that will tell you which check has failed and maybe more about the reason" - echo "### of the failure." - echo "### If you're feeling that this may be a bug in this configure script" - echo "### and want to report this to me , please include your configure script," - echo "### the config.log file as well as the complete configure output." - echo "################################################################################" - AC_SS_SET_NORMALINK - AC_MSG_ERROR([This was a fatal one...aborting]) - else - SS_QT4_MOC="$SS_QT4_MOC/moc" - AC_MSG_RESULT([found as $SS_QT4_MOC]) - fi - else - AC_MSG_RESULT([trusting you: using $SS_QT4_MOC]) - fi -]) - - AC_DEFUN([AC_SS_FIND_QT3_MT], [ AC_ARG_ENABLE(qt-mt,[ --disable-qt-mt ignore the threaded version of Qt],SS_QT3_NOMT="$withval",SS_QT3_NOMT="NOTGIVEN") @@ -2029,88 +1783,6 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_AND_QT3], ]) -AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_AND_QT4], -[ - - AC_MSG_CHECKING([if we can compile an X-Qt 4.x application]) - AC_LANG_CPLUSPLUS - ss_save_CPPFLAGS="$CPPFLAGS" - ss_save_CXXFLAGS="$CXXFLAGS" - ss_save_LDFLAGS="$LDFLAGS" - ss_save_LIBS="$LIBS" - if test -n "$SS_X_INCDIR"; then - CPPFLAGS="-I$SS_X_INCDIR" - else - CPPFLAGS="" - fi - CPPFLAGS="$CPPFLAGS $SS_QT4_INCDIRECTORIES" - CXXFLAGS="-O2 -Wall $CXXFLAGS" - if test -n "$SS_X_LIBDIR"; then - LIBS="-L$SS_X_LIBDIR" - else - LIBS="" - fi - LIBS="$LIBS -L$SS_QT4_LIBDIR -lQtCore" - if test -n "$SS_X_LDFLAGS"; then - LIBS="$LIBS $SS_X_LDFLAGS" - fi - if test -n "$SS_X_LIBLINK"; then - LIBS="$LIBS $SS_X_LIBLINK" - fi - LDFLAGS="-s $LDFLAGS" - AC_TRY_LINK([ - #include <qglobal.h> - #if (TQT_VERSION < 0x040000) - #error "Bad qt version: too old" - #endif - ],[return 0; ],SS_QTX_LINKED_OK="TRUE",SS_QTX_LINKED_OK="FALSE") - if test "$SS_QTX_LINKED_OK" = "FALSE"; then - AC_MSG_RESULT([FAILED]); - AC_SS_SET_REDINK - echo "################################################################################" - echo "### CONFIGURE ERROR:" - echo "### Failed to compile the Qt 4.x library test program." - echo "### This may be a bad sign :)" - echo "### First of all, make sure that qt is correctly installed on your system," - echo "### and the qt version is the one requested by this version of kvirc." - echo "### Ensure that you have only one copy of qt visible at a time." - echo "### You may also take a look at the config.log file in this directory," - echo "### that will tell you which check has failed and maybe more about the reason" - echo "### of the failure." - echo "### The CPPFLAGS used were:" - for a_flag in $CPPFLAGS ; do - echo "### $a_flag" - done - echo "### The CXXFLAGS used were:" - for a_flag in $CXXFLAGS ; do - echo "### $a_flag" - done - echo "### The LIBS used were:" - for a_flag in $LIBS ; do - echo "### $a_flag" - done - echo "### The LDFLAGS used were:" - for a_flag in $LDFLAGS ; do - echo "### $a_flag" - done - echo "### If you're sure that qt is correctly installed , you may force configure" - echo "### to skip this check and try to compile kvirc anyway." - echo "### Try using the --without-qt-check option." - echo "### If you're feeling that this may be a bug in this configure script" - echo "### and want to report this to me , please include your configure script," - echo "### the config.log file as well as the complete configure output." - echo "################################################################################" - AC_SS_SET_NORMALINK - AC_MSG_ERROR([This was a fatal one...aborting]) - fi - LIBS="$ss_save_LIBS" - LDFLAGS="$ss_save_LDFLAGS" - CXXFLAGS="$ss_save_CXXFLAGS" - CPPFLAGS="$ss_save_CPPFLAGS" - AC_MSG_RESULT([success]) -]) - - dnl ################################################################################################################### dnl ### KDE dnl ################################################################################################################### @@ -2136,17 +1808,12 @@ AC_DEFUN([AC_SS_FIND_KDE], AC_DEFUN([AC_SS_CHECK_IF_KDE_IS_REQUESTED], [ AC_MSG_CHECKING([if KDE support is requested]) - if test "$SS_USE_QT4" = "no"; then - SS_KDE_REQUESTED="yes" - AC_ARG_WITH(kde-support,[ --without-kde-support Disable the KDE support even if it is detected ],SS_KDE_REQUESTED="$withval") - if test "$SS_KDE_REQUESTED" = "yes"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi + SS_KDE_REQUESTED="yes" + AC_ARG_WITH(kde-support,[ --without-kde-support Disable the KDE support even if it is detected ],SS_KDE_REQUESTED="$withval") + if test "$SS_KDE_REQUESTED" = "yes"; then + AC_MSG_RESULT([yes]) else - SS_KDE_REQUESTED="no" - AC_MSG_RESULT([unsupported with qt 4.x]) + AC_MSG_RESULT([no]) fi ]) @@ -2446,13 +2113,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG], SS_CPPFLAGS="$SS_CPPFLAGS $SS_X_CPPFLAGS" fi - if test "$SS_USE_QT4" = "no"; then - SS_INCDIRS="-I$SS_QT3_INCDIR -I$SS_X_INCDIR" - else - AC_DEFINE([COMPILE_USE_QT4], 1, [define if you want to compile the Qt 4.x support]) - SS_INCDIRS="$SS_QT4_INCDIRECTORIES -I$SS_X_INCDIR" - SS_CPPFLAGS="$SS_CPPFLAGS -DQT3_SUPPORT" - fi + SS_INCDIRS="-I$SS_QT3_INCDIR -I$SS_X_INCDIR" if test -n "$SS_X_INCDIR"; then SS_INCDIRS="$SS_INCDIRS -I$SS_X_INCDIR" @@ -2464,38 +2125,19 @@ AC_DEFUN([AC_SS_FINAL_CONFIG], SS_LDFLAGS="" fi - if test "$SS_USE_QT4" = "no"; then - SS_RPATH="-rpath $SS_QT3_LIBDIR -rpath $libdir" - else - SS_RPATH="-rpath $SS_QT4_LIBDIR -rpath $libdir" - fi + SS_RPATH="-rpath $SS_QT3_LIBDIR -rpath $libdir" if test -n "$SS_X_LIBDIR"; then SS_RPATH="$SS_RPATH -rpath $SS_X_LIBDIR" fi - if test "$SS_USE_QT4" = "no"; then - SS_LIBDIRS="-L$SS_TOPSRCDIR/src/kvilib/build/ -L$SS_QT3_LIBDIR" - else - SS_LIBDIRS="-L$SS_TOPSRCDIR/src/kvilib/build/ -L$SS_QT4_LIBDIR" - fi + SS_LIBDIRS="-L$SS_TOPSRCDIR/src/kvilib/build/ -L$SS_QT3_LIBDIR" if test -n "$SS_X_LIBDIR"; then SS_LIBDIRS="$SS_LIBDIRS -L$SS_X_LIBDIR" fi - if test "$SS_USE_QT4" = "no"; then - SS_LIBLINK="-l$SS_TQTLIB_NAME" - else - #if test -n "SS_LOCAL_ADD_DEBUG_SYMBOLS"; then - # SS_LIBLINK="-lQtCore_debug -lQtGui_debug -lQt3Support_debug" - #else - - SS_LIBLINK="-lQtCore -lQtGui -lQt3Support" - - #fi - fi - + SS_LIBLINK="-l$SS_TQTLIB_NAME" if test -n "$SS_X_LIBLINK"; then SS_LIBLINK="$SS_LIBLINK $SS_X_LIBLINK" fi @@ -2567,13 +2209,8 @@ AC_DEFUN([AC_SS_FINAL_CONFIG], AC_SUBST(SS_LIBDIRS) AC_SUBST(SS_LIBLINK) - if test "$SS_USE_QT4" = "no"; then - SS_QT_MOC=$SS_QT3_MOC - SS_QT_MOC_FLAGS="" - else - SS_QT_MOC=$SS_QT4_MOC - SS_QT_MOC_FLAGS="-DCOMPILE_USE_QT4" - fi + SS_QT_MOC=$SS_QT3_MOC + SS_QT_MOC_FLAGS="" AC_SUBST(SS_QT_MOC) AC_SUBST(SS_QT_MOC_FLAGS) |