TDE
/
kvirc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvirc
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove unnecessary files and Qt4 support

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/21/head
Michele Calgaro 9 months ago
parent a0a87c061d
commit fbb5c61c16
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
4 changed files with 30 additions and 12465 deletions
Show Stats Download Patch File Download Diff File

10195
acinclude.m4
View File

File diff suppressed because it is too large Load Diff

1608
aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

385
admin/acinclude.m4.in
Unescape View File

@ -1453,12 +1453,6 @@ 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
@ -1469,19 +1463,6 @@ AC_DEFUN([AC_SS_FIND_QT],
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
fi
])
AC_DEFUN([AC_SS_FIND_QT3_NAME],
@ -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,7 +1808,6 @@ 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
@ -2144,10 +1815,6 @@ AC_DEFUN([AC_SS_CHECK_IF_KDE_IS_REQUESTED],
else
AC_MSG_RESULT([no])
fi
else
SS_KDE_REQUESTED="no"
AC_MSG_RESULT([unsupported with qt 4.x])
fi
])
AC_DEFUN([AC_SS_FIND_KDE_GENERAL_DIR],
@ -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
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
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
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
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
AC_SUBST(SS_QT_MOC)
AC_SUBST(SS_QT_MOC_FLAGS)

269
doc/win32.compiling.1.2.txt
Unescape View File

@ -1,269 +0,0 @@
Win32 KVIrc compiling 1.2
a tutorial by <Grifisx>
updated by <LoSko> on 2007/01/18
english translation by <etherea`>
Index
@ Prologue
@ Ingredients
@ Providing ingredients
@ Setting up the ambiency
@ Setting ambiency variables
@ Compiling
@ Creating ambiency for setup
@ Creating setup
@ Prologue
This is meant to be a simple guide to KVIrc compiling under Windows ambiency, so
that everyone who's willing to try to compile the latest version of this cross platform
client can easily do without the need for the latest snapshot/development to be
released.
@ Ingredients
1) CVS version of KVIrc
2) Visual C++ 2005 Express
3) SDK package from Microsoft
4) Perl.
5) gettext for Windows
6) Innosetup or NSIS
7) Non Commercial QT 3.2.1
8) OpenSSL
9) zlib for Win32
@ Providing ingredients
So, let's see where to find the necessary ingredients to bake up our freshy KVIrc.
-1) CVS version of KVIrc
To get this out you will need a CVS client for Windows, then type the following
command:
cvs -z3 -d:pserver:anonymous@cvs.kvirc.net:/cvs co kvirccvs
And just in case you can find instructions here:
Link: http://www.kvirc.net/?id=cvs
A suggestion for a tiny and free CVS is Tortoise CVS.
Link: http://www.tortoisecvs.org/
-2) Visual C++ 2005 Express
This compiler is free (at least for the moment), you will only need to register in order to
get it and use it for free, use it!
Link: http://msdn.microsoft.com/vstudio/express/visualc/
-3) SDK package from Microsoft
This one too is for free, then download and install it!
Link: http://www.microsoft.com/downloads/details.aspx?FamilyId=A55B6B43-E24F-4EA3A93E-40C0EC4F68E5&displaylang=en
-4) Perl
Perl is needed to create documentation and make perl module works, you can
download it from here:
Link: http://www.activestate.com/Products/ActivePerl/?
-5) gettext for Windows
Download and install it, it's needed to create languages localization files:
Link: http://sourceforge.net/projects/gettext
Note: be sure to install gettext in this directory C:\Program Files\GnuWin32 so that all the
executables are located in C:\Program Files\GnuWin32\bin otherwise you'll be forced to
change something in the file needed to create the setup ambiency.
-6) Innosetup
Another free program, required to create the final setup.
Link: http://www.jrsoftware.org/isinfo.php
If you are using NSIS you can have your copy here:
Link: http://nsis.sourceforge.net/Download
-7) Non Commercial QT 3.2.1
That's probably the most difficult thing to acquire; you can try find a book on QT that
has it enclosed (the non commercial one) or you'll have to figure out how to find it out.
You can buy a commercial version too, 3.x.x higher than 3.2.1.
Book: C++ GUI Programming with QT 3
Link: http://www.amazon.com/gp/product/0131240722/102-11831924381702?v=glance&n=283155
If you are pretty acknowledged with compiling you can try these instructions:
Link: http://qtwin.sourceforge.net/qt3-win32/compile-msvc-2005.php
Even if this last choice's a bit nasty to make out working =)
You still can find some precompiled version of this free stand (found on the same site of
qtwin even if a bit older) but beware: choosing this last chance will make KVIrc XP
themes not supported.
By using a different version of QT you'll need to modify every KVIrc project adapting
the qt.xxxx.dll and headers and libraries paths.
For example, assuming you have installed commercial QT 3.3.4 you'll have to modify
the projects this way:
a) selecting Properties of each project then ->Linker and ->Input
b) store the right library in the qt-mtnc321.lib matching the installed version
requirements, ie qt-3.3.4.lib. To know the exact name of your .lib file to be linked just go
to the directory where you did installed QT, in the subfolder /lib (like C:\Qt\3.3.4\lib)
-8) OpenSSL
That is needed in order to compile SSL support for KVIrc, you can have libraries and
everything else from here:
Link: http://www.slproweb.com/products/Win32OpenSSL.html
-9) zlib for win32
To give KVIrc the ability to save log files in compressed format that's what you need.
Link: http://gnuwin32.sourceforge.net/packages/zlib.htm
That's the main page, but you will need the developers files:
Link: http://gnuwin32.sourceforge.net/downloadlinks/zlib-lib-zip.php
Extract them in any folder you may like, my own suggestion is folder C:\lib for your
convenience; directory tree will be as follows:
C:(dir)
|__zlib(dir)
|__include(dir)
| |__zconf.h
| |__zlib.h
|__lib(dir)
|__zlib.lib
|__zlib.exp
Remember where did you have this folder extract because you will have to setup paths
of the include files (the .h files) and of the libraries (the .lib files) in ambiency variables
of your operating system.
@ Setting up the ambiency
Install in the following order (theoretically it is not necessary a given order but this
“recipe” is fully oriented to non expert users):
1-Visual C++ 2005 Express
2-SDK ; once you have installed it take the folders Lib, Include and Bin (you will find
them all in the SDK given path – generally in folder C:\Program Files\Microsoft Platform
SDK) and copy them in the folder \SDK\v2.0 that is under the installation path of Visual
C++ (generally in C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0).
Attention: when copying these files you'll be prompted to overwrite one or more files;
just answer NO.
3-QT 3.x.x ; during the installation you'll be prompted to record ambiency variables:
answer YES.
4-OpenSSL ; during the installation you'll be prompted to record ambiency variables:
answer YES.
5-Perl ; during the installation you'll be prompted to record ambiency variables:
answer YES.
6-gettext
7-Innosetup or NSIS or both =) (Freedom is the power to choose ;))
8-zlib ; if you did download the install&compile package; otherwise just unpack
and/or extract the ready-to-use pakage wherever you may like (generally in folder C:\).
@ Setting ambiency variables
Now we need to set up every variable of this ambiency, needed in order the compiler
will be able to find every library from which KVIrc depends.
Right-button on Resources then Properties -> Advanced -> Ambient Variables and this will
engage all QT system variables (TQTDIR) set; if that doesn't match you will need to
reinstall QT and remember to answer YES once you're prompted for setting all ambiency
variables, otherwise you will need to set them manually – that parts from this tutorial.
In the section dedicated to variables of the actual user add (if you don't have it yet) the
following and then give the right paths that are on your own machine (hereby are my
own paths):
Variable:
PERLDIR
Value:
C:\perl
Meaning:
Directory that stores Perl
Variable:
ZLIBLIBDIR
Value:
C:\zlib\lib
Meaning:
Directory that stores file .lib of zlib installed library, the file name must be zlib.lib
Variable:
OPENSSL
Value:
C:\OpenSLL
Meaning:
Installation folder of OpenSSL
Variable:
SSLINCDIR
Value:
C:\OpenSSL\include
Meaning:
Directory that stores OpenSSL .h files
Variable:
SSLLIBDIR
Value:
C:\OpenSSL\lib\VC
Meaning:
OpenSSL .lib files storage
Variable:
MSGFMT
Value:
C:\Program Files\GnuWin32\bin\msgfmt.exe
Meaning:
msgfmt executable path
After you've added all the variables with their own values you need to reboot.
@ Compiling
Go to folder kvirccvs\kvirc and open the file kvirc_vc05.sln then -for the less
experienced-select Build -> Configure Manager -> Release and run the compiling with
Build ->Build Solution.
You'll need to wait a little before the building ends, mostly that's up to your processor
(on a P3 800MHz it takes about 40/45 minutes, on a P4 3000 just 10/15 minutes).
Now.. pray everything is going to get the right place and no unexpected to happen; but
in case you do have troubles here are 3 different solutions:
a) read this tutorial once more, hoping you missed some points;
b) try to find out where the problem is;
c) step to Azzurranet on channel #kvirc.net and ask for Grifisx or Noldor or Pragma.
@ Creating ambiency for setup
If you're reading this, thank God, your patience and your mother (yes, yet she didn't
managed to kill you death nevertheless you spent 28 hours a day reading lines on a
monitor) you're almost done!
The latest 2 steps are quite easy.
Go to folder kvirccvs\kvirc\win32build and run makedist.vbs file.
Then run the process, on which end you'll get a folder named pakage; be sure inside
there are kvirc.exe, kvilib.dll, the folder with every KVIrc module and the following dlls:
ssleay32.dll
libeay32.dll
qt-mtnc3321.dll
perl58.dll
zlib1.dll
idleui.dll
msvcr80.dll
If you see something missing just run up a search onto your system and copy them into
the pakage directory.
Check even the file Microsoft.VC80.CRT.manifest is placed both in root folder and sub folder
modules, otherwise copy it into them (files are stored into kvirccvs\kvirc\data\manifests ;
in this last case you will only need to rename the given file
Microsoft.VC80.CRT.modules.manifest into Microsoft.VC80.CRT.manifest before you put it in
the modules folder).
@ Creating setup
Easypeasy!
After installation of Innosetup launch file KVIrc.iss that houses in folder
kvirccvs\kvirc\win32build and run the script so that at the end of the process you'll find
a freshy hot setup.exe in folder kvirccvs\kvirc\win32build\package\setup.
If you did chose NSIS: right click on the KVIrc.nsi installation script that is found in
folder kvirccvs\kvirc\win32build and run Compile NSIS Script.
This way you'll have a KVIrc.VERSION-dev-DATE.exe in your actual directory!
Run.
If everything went ok then.. EnjoY! =D
Tonino Imbesi
<Grifisx>
Write Preview
Loading…
Cancel
Save