@ -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 k delibs
dnl and k debase or configure.in.in if present.
dnl Single-module modifications are best placed in configure.in for t delibs
dnl and t debase 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${k delibsuff}/` \
/usr/X11/lib${k delibsuff} \
/usr/X11R6/lib${k delibsuff} \
/usr/X11R5/lib${k delibsuff} \
/usr/X11R4/lib${k delibsuff} \
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${t delibsuff}/` \
/usr/X11/lib${t delibsuff} \
/usr/X11R6/lib${t delibsuff} \
/usr/X11R5/lib${t delibsuff} \
/usr/X11R4/lib${t delibsuff} \
\
/usr/lib${k delibsuff}/X11 \
/usr/lib${k delibsuff}/X11R6 \
/usr/lib${k delibsuff}/X11R5 \
/usr/lib${k delibsuff}/X11R4 \
/usr/lib${t delibsuff}/X11 \
/usr/lib${t delibsuff}/X11R6 \
/usr/lib${t delibsuff}/X11R5 \
/usr/lib${t delibsuff}/X11R4 \
\
/usr/local/X11/lib${k delibsuff} \
/usr/local/X11R6/lib${k delibsuff} \
/usr/local/X11R5/lib${k delibsuff} \
/usr/local/X11R4/lib${k delibsuff} \
/usr/local/X11/lib${t delibsuff} \
/usr/local/X11R6/lib${t delibsuff} \
/usr/local/X11R5/lib${t delibsuff} \
/usr/local/X11R4/lib${t delibsuff} \
\
/usr/local/lib${k delibsuff}/X11 \
/usr/local/lib${k delibsuff}/X11R6 \
/usr/local/lib${k delibsuff}/X11R5 \
/usr/local/lib${k delibsuff}/X11R4 \
/usr/local/lib${t delibsuff}/X11 \
/usr/local/lib${t delibsuff}/X11R6 \
/usr/local/lib${t delibsuff}/X11R5 \
/usr/local/lib${t delibsuff}/X11R4 \
\
/usr/X386/lib${k delibsuff} \
/usr/x386/lib${k delibsuff} \
/usr/XFree86/lib${k delibsuff}/X11 \
/usr/X386/lib${t delibsuff} \
/usr/x386/lib${t delibsuff} \
/usr/XFree86/lib${t delibsuff}/X11 \
\
/usr/lib${k delibsuff} \
/usr/local/lib${k delibsuff} \
/usr/unsupported/lib${k delibsuff} \
/usr/athena/lib${k delibsuff} \
/usr/local/x11r5/lib${k delibsuff} \
/usr/lpp/Xamples/lib${k delibsuff} \
/lib/usr/lib${k delibsuff}/X11 \
/usr/lib${t delibsuff} \
/usr/local/lib${t delibsuff} \
/usr/unsupported/lib${t delibsuff} \
/usr/athena/lib${t delibsuff} \
/usr/local/x11r5/lib${t delibsuff} \
/usr/lpp/Xamples/lib${t delibsuff} \
/lib/usr/lib${t delibsuff}/X11 \
\
/usr/openwin/lib${k delibsuff} \
/usr/openwin/share/lib${k delibsuff} \
/usr/openwin/lib${t delibsuff} \
/usr/openwin/share/lib${t delibsuff} \
; \
do
dnl Don't even attempt the hair of trying to link an X program!
@ -378,7 +378,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 k delibs as you did use now.
same compiler to compile Qt and t delibs as you did use now.
For more details about this problem, look at the end of config.log.])
fi
@ -937,7 +937,7 @@ mips-sgi-irix6*)
ac_x_includes="."
fi
if test -z "$ac_x_libraries"; then
ac_x_libraries="/usr/lib${k delibsuff}"
ac_x_libraries="/usr/lib${t delibsuff}"
fi
esac
#from now on we use our own again
@ -1418,7 +1418,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${k delibsuff}
ac_qt_libraries="$withval"/lib${t delibsuff}
ac_qt_bindir="$withval"/bin
])
@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir"
qt_libdirs=""
for dir in $kde_qt_dirs; do
qt_libdirs="$qt_libdirs $dir/lib${k delibsuff} $dir"
qt_libdirs="$qt_libdirs $dir/lib${t delibsuff} $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
@ -1644,11 +1644,11 @@ 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 k delibs first.
you need to install t delibs first.
If you did install k delibs, then the Qt version that is picked up by
this configure is not the same version you used to compile k delibs.
The Qt Plugin installed by k delibs is *ONLY* loadable if it is the
If you did install t delibs, then the Qt version that is picked up by
this configure is not the same version you used to compile t delibs.
The Qt Plugin installed by t delibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings.
])
@ -1796,8 +1796,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="$kde_libs_prefix/lib${kdelibsuff} /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${k delibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${k delibsuff} $KDEDIR $kde_libdirs"
kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /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${t delibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${t delibsuff} $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"
@ -1815,7 +1815,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 k delibs])
by t delibs])
fi
if test -n "$kde_widgetdir"; then
@ -1830,7 +1830,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi
else dnl test -z $1, e.g. from k delibs
else dnl test -z $1, e.g. from t delibs
ac_cv_have_kde="have_kde=no"
@ -3490,9 +3490,9 @@ AC_DEFUN([KDE_CHECK_LIB64],
AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none,auto[=default])]),
kdelibsuff=$enableval, k delibsuff="auto")
tdelibsuff=$enableval, t delibsuff="auto")
if test "$k delibsuff" = "auto"; then
if test "$t delibsuff" = "auto"; then
cat > conftest.c << EOF
#include <stdio.h>
@ -3500,26 +3500,26 @@ int main() {
return 0;
}
EOF
k delibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
t delibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
s,.*/lib\([[^\/]]*\)/.*,\1,
p
}'`
rm -rf conftest.*
fi
if test "$kdelibsuff" = "no" || test "$k delibsuff" = "none"; then
k delibsuff=
if test "$tdelibsuff" = "no" || test "$t delibsuff" = "none"; then
t delibsuff=
fi
if test -z "$k delibsuff"; then
if test -z "$t delibsuff"; 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${k delibsuff}"
libdir="$libdir${t delibsuff}"
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
fi
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${k delibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $k delibsuff])
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${t delibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $t delibsuff])
fi
])
@ -4544,7 +4544,7 @@ fi
PYTHONINC=-I$python_incdir
python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$k delibsuff $kde_extra_libs"
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$t delibsuff $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)
@ -4934,7 +4934,7 @@ AC_DEFUN([KDE_CONF_FILES],
AC_SUBST(CONF_FILES)
])dnl
dnl This sets the prefix, for arts and k delibs
dnl This sets the prefix, for arts and t delibs
dnl Do NOT use in any other module.
dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
AC_DEFUN([KDE_SET_PREFIX_CORE],
@ -4981,9 +4981,9 @@ AC_DEFUN([KDE_SET_PREFIX],
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 k delibs.
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for t delibs.
This means it has been moved since you installed it.
This won't work. Please recompile k delibs for the new prefix.
This won't work. Please recompile t delibs for the new prefix.
])
fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@ -5649,7 +5649,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$k delibsuff
ac_ssl_libraries="$withval"/lib$t delibsuff
])
want_ssl=yes
@ -5669,7 +5669,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$k delibsuff $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$t delibsuff $kde_extra_libs"
if test ! "$ac_ssl_libraries" = "NO"; then
ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
fi
@ -5906,9 +5906,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
dnl also defines KSTUFF_PKG_ERRORS on error
AC_DEFUN([KDE_PKG_CHECK_MODULES], [
PKG_CONFIG_PATH="$prefix/lib${k delibsuff}/pkgconfig:$PKG_CONFIG_PATH"
PKG_CONFIG_PATH="$prefix/lib${t delibsuff}/pkgconfig:$PKG_CONFIG_PATH"
if test "$prefix" != "$kde_libs_prefix"; then
PKG_CONFIG_PATH="$kde_libs_prefix/lib${k delibsuff}/pkgconfig:$PKG_CONFIG_PATH"
PKG_CONFIG_PATH="$kde_libs_prefix/lib${t delibsuff}/pkgconfig:$PKG_CONFIG_PATH"
fi
export PKG_CONFIG_PATH
PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
Timothy Pearson
13 years ago