|
|
|
|
@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
|
|
|
|
|
dnl Please do not modify this file unless you expect your modifications to be
|
|
|
|
|
dnl carried into every other module in the repository.
|
|
|
|
|
dnl
|
|
|
|
|
dnl Single-module modifications are best placed in configure.in for kdelibs
|
|
|
|
|
dnl and kdebase or configure.in.in if present.
|
|
|
|
|
dnl Single-module modifications are best placed in configure.in for tdelibs
|
|
|
|
|
dnl and tdebase or configure.in.in if present.
|
|
|
|
|
|
|
|
|
|
# KDE_PATH_X_DIRECT
|
|
|
|
|
dnl Internal subroutine of AC_PATH_X.
|
|
|
|
|
@ -103,41 +103,41 @@ ac_x_libraries=],
|
|
|
|
|
[LIBS="$ac_save_LIBS"
|
|
|
|
|
# First see if replacing the include by lib works.
|
|
|
|
|
# Check X11 before X11Rn because it is often a symlink to the current release.
|
|
|
|
|
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
|
|
|
|
|
/usr/X11/lib${kdelibsuff} \
|
|
|
|
|
/usr/X11R6/lib${kdelibsuff} \
|
|
|
|
|
/usr/X11R5/lib${kdelibsuff} \
|
|
|
|
|
/usr/X11R4/lib${kdelibsuff} \
|
|
|
|
|
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
|
|
|
|
|
/usr/X11/lib${tdelibsuff} \
|
|
|
|
|
/usr/X11R6/lib${tdelibsuff} \
|
|
|
|
|
/usr/X11R5/lib${tdelibsuff} \
|
|
|
|
|
/usr/X11R4/lib${tdelibsuff} \
|
|
|
|
|
\
|
|
|
|
|
/usr/lib${kdelibsuff}/X11 \
|
|
|
|
|
/usr/lib${kdelibsuff}/X11R6 \
|
|
|
|
|
/usr/lib${kdelibsuff}/X11R5 \
|
|
|
|
|
/usr/lib${kdelibsuff}/X11R4 \
|
|
|
|
|
/usr/lib${tdelibsuff}/X11 \
|
|
|
|
|
/usr/lib${tdelibsuff}/X11R6 \
|
|
|
|
|
/usr/lib${tdelibsuff}/X11R5 \
|
|
|
|
|
/usr/lib${tdelibsuff}/X11R4 \
|
|
|
|
|
\
|
|
|
|
|
/usr/local/X11/lib${kdelibsuff} \
|
|
|
|
|
/usr/local/X11R6/lib${kdelibsuff} \
|
|
|
|
|
/usr/local/X11R5/lib${kdelibsuff} \
|
|
|
|
|
/usr/local/X11R4/lib${kdelibsuff} \
|
|
|
|
|
/usr/local/X11/lib${tdelibsuff} \
|
|
|
|
|
/usr/local/X11R6/lib${tdelibsuff} \
|
|
|
|
|
/usr/local/X11R5/lib${tdelibsuff} \
|
|
|
|
|
/usr/local/X11R4/lib${tdelibsuff} \
|
|
|
|
|
\
|
|
|
|
|
/usr/local/lib${kdelibsuff}/X11 \
|
|
|
|
|
/usr/local/lib${kdelibsuff}/X11R6 \
|
|
|
|
|
/usr/local/lib${kdelibsuff}/X11R5 \
|
|
|
|
|
/usr/local/lib${kdelibsuff}/X11R4 \
|
|
|
|
|
/usr/local/lib${tdelibsuff}/X11 \
|
|
|
|
|
/usr/local/lib${tdelibsuff}/X11R6 \
|
|
|
|
|
/usr/local/lib${tdelibsuff}/X11R5 \
|
|
|
|
|
/usr/local/lib${tdelibsuff}/X11R4 \
|
|
|
|
|
\
|
|
|
|
|
/usr/X386/lib${kdelibsuff} \
|
|
|
|
|
/usr/x386/lib${kdelibsuff} \
|
|
|
|
|
/usr/XFree86/lib${kdelibsuff}/X11 \
|
|
|
|
|
/usr/X386/lib${tdelibsuff} \
|
|
|
|
|
/usr/x386/lib${tdelibsuff} \
|
|
|
|
|
/usr/XFree86/lib${tdelibsuff}/X11 \
|
|
|
|
|
\
|
|
|
|
|
/usr/lib${kdelibsuff} \
|
|
|
|
|
/usr/local/lib${kdelibsuff} \
|
|
|
|
|
/usr/unsupported/lib${kdelibsuff} \
|
|
|
|
|
/usr/athena/lib${kdelibsuff} \
|
|
|
|
|
/usr/local/x11r5/lib${kdelibsuff} \
|
|
|
|
|
/usr/lpp/Xamples/lib${kdelibsuff} \
|
|
|
|
|
/lib/usr/lib${kdelibsuff}/X11 \
|
|
|
|
|
/usr/lib${tdelibsuff} \
|
|
|
|
|
/usr/local/lib${tdelibsuff} \
|
|
|
|
|
/usr/unsupported/lib${tdelibsuff} \
|
|
|
|
|
/usr/athena/lib${tdelibsuff} \
|
|
|
|
|
/usr/local/x11r5/lib${tdelibsuff} \
|
|
|
|
|
/usr/lpp/Xamples/lib${tdelibsuff} \
|
|
|
|
|
/lib/usr/lib${tdelibsuff}/X11 \
|
|
|
|
|
\
|
|
|
|
|
/usr/openwin/lib${kdelibsuff} \
|
|
|
|
|
/usr/openwin/share/lib${kdelibsuff} \
|
|
|
|
|
/usr/openwin/lib${tdelibsuff} \
|
|
|
|
|
/usr/openwin/share/lib${tdelibsuff} \
|
|
|
|
|
; \
|
|
|
|
|
do
|
|
|
|
|
dnl Don't even attempt the hair of trying to link an X program!
|
|
|
|
|
@ -367,7 +367,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then
|
|
|
|
|
else
|
|
|
|
|
AC_MSG_ERROR([your system fails at linking a small KDE application!
|
|
|
|
|
Check, if your compiler is installed correctly and if you have used the
|
|
|
|
|
same compiler to compile Qt and kdelibs as you did use now.
|
|
|
|
|
same compiler to compile Qt and tdelibs as you did use now.
|
|
|
|
|
For more details about this problem, look at the end of config.log.])
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
@ -609,9 +609,9 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
|
|
|
|
|
if test -x "$KDECONFIG"; then # it can be "compiled"
|
|
|
|
|
kde_libs_prefix=`$KDECONFIG --prefix`
|
|
|
|
|
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
|
|
|
|
|
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
|
|
|
|
|
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
|
|
|
|
|
This means it has been moved since you installed it.
|
|
|
|
|
This won't work. Please recompile kdelibs for the new prefix.
|
|
|
|
|
This won't work. Please recompile tdelibs for the new prefix.
|
|
|
|
|
])
|
|
|
|
|
fi
|
|
|
|
|
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
|
|
|
|
|
@ -910,7 +910,7 @@ mips-sgi-irix6*)
|
|
|
|
|
ac_x_includes="."
|
|
|
|
|
fi
|
|
|
|
|
if test -z "$ac_x_libraries"; then
|
|
|
|
|
ac_x_libraries="/usr/lib${kdelibsuff}"
|
|
|
|
|
ac_x_libraries="/usr/lib${tdelibsuff}"
|
|
|
|
|
fi
|
|
|
|
|
esac
|
|
|
|
|
#from now on we use our own again
|
|
|
|
|
@ -1394,7 +1394,7 @@ qt_includes=""
|
|
|
|
|
AC_ARG_WITH(qt-dir,
|
|
|
|
|
AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
|
|
|
|
|
[ ac_qt_includes="$withval"/include
|
|
|
|
|
ac_qt_libraries="$withval"/lib${kdelibsuff}
|
|
|
|
|
ac_qt_libraries="$withval"/lib${tdelibsuff}
|
|
|
|
|
ac_qt_bindir="$withval"/bin
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
@ -1435,7 +1435,7 @@ ac_qt_includes="$qt_incdir"
|
|
|
|
|
|
|
|
|
|
qt_libdirs=""
|
|
|
|
|
for dir in $kde_qt_dirs; do
|
|
|
|
|
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
|
|
|
|
|
qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
|
|
|
|
|
done
|
|
|
|
|
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
|
|
|
|
|
if test ! "$ac_qt_libraries" = "NO"; then
|
|
|
|
|
@ -1619,7 +1619,7 @@ rm -f actest.ui actest.cpp
|
|
|
|
|
|
|
|
|
|
AC_MSG_RESULT([$kde_cv_uic_plugins])
|
|
|
|
|
if test "$kde_cv_uic_plugins" != yes; then
|
|
|
|
|
AC_MSG_ERROR([you need to install kdelibs first.])
|
|
|
|
|
AC_MSG_ERROR([you need to install tdelibs first.])
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
])
|
|
|
|
|
@ -1750,8 +1750,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
|
|
|
|
|
So, check this please and use another prefix!])
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
|
|
|
|
|
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
|
|
|
|
|
kde_libdirs="/usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
|
|
|
|
|
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs"
|
|
|
|
|
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
|
|
|
|
|
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
|
|
|
|
|
ac_kde_libraries="$kde_libdir"
|
|
|
|
|
@ -1769,7 +1769,7 @@ fi
|
|
|
|
|
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
|
|
|
|
|
AC_MSG_ERROR([
|
|
|
|
|
I can't find the designer plugins. These are required and should have been installed
|
|
|
|
|
by kdelibs])
|
|
|
|
|
by tdelibs])
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test -n "$kde_widgetdir"; then
|
|
|
|
|
@ -3066,26 +3066,26 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
|
|
|
|
|
|
|
|
|
|
AC_DEFUN([KDE_CHECK_LIB64],
|
|
|
|
|
[
|
|
|
|
|
kdelibsuff=no
|
|
|
|
|
tdelibsuff=no
|
|
|
|
|
AC_ARG_ENABLE(libsuffix,
|
|
|
|
|
AC_HELP_STRING([--enable-libsuffix],
|
|
|
|
|
[/lib directory suffix (64,32,none[=default])]),
|
|
|
|
|
kdelibsuff=$enableval)
|
|
|
|
|
tdelibsuff=$enableval)
|
|
|
|
|
# TODO: add an auto case that compiles a little C app to check
|
|
|
|
|
# where the glibc is
|
|
|
|
|
if test "$kdelibsuff" = "no"; then
|
|
|
|
|
kdelibsuff=
|
|
|
|
|
if test "$tdelibsuff" = "no"; then
|
|
|
|
|
tdelibsuff=
|
|
|
|
|
fi
|
|
|
|
|
if test -z "$kdelibsuff"; then
|
|
|
|
|
if test -z "$tdelibsuff"; then
|
|
|
|
|
AC_MSG_RESULT([not using lib directory suffix])
|
|
|
|
|
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
|
|
|
|
|
else
|
|
|
|
|
if test "$libdir" = '${exec_prefix}/lib'; then
|
|
|
|
|
libdir="$libdir${kdelibsuff}"
|
|
|
|
|
libdir="$libdir${tdelibsuff}"
|
|
|
|
|
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
|
|
|
|
|
fi
|
|
|
|
|
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories)
|
|
|
|
|
AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
|
|
|
|
|
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${tdelibsuff}\""], Suffix for lib directories)
|
|
|
|
|
AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
|
|
|
|
|
fi
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
@ -4076,7 +4076,7 @@ fi
|
|
|
|
|
|
|
|
|
|
PYTHONINC=-I$python_incdir
|
|
|
|
|
|
|
|
|
|
python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
|
|
|
|
|
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
|
|
|
|
|
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
|
|
|
|
|
if test ! -r $python_libdir/libpython$version.so; then
|
|
|
|
|
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
|
|
|
|
|
@ -5116,7 +5116,7 @@ ssl_includes=""
|
|
|
|
|
AC_ARG_WITH(ssl-dir,
|
|
|
|
|
AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
|
|
|
|
|
[ ac_ssl_includes="$withval"/include
|
|
|
|
|
ac_ssl_libraries="$withval"/lib$kdelibsuff
|
|
|
|
|
ac_ssl_libraries="$withval"/lib$tdelibsuff
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
want_ssl=yes
|
|
|
|
|
@ -5136,7 +5136,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
|
|
|
|
|
AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
|
|
|
|
|
ac_ssl_includes="$ssl_incdir"
|
|
|
|
|
|
|
|
|
|
ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
|
|
|
|
|
ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
|
|
|
|
|
if test ! "$ac_ssl_libraries" = "NO"; then
|
|
|
|
|
ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
|
|
|
|
|
fi
|
|
|
|
|
|
