|
|
|
@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
|
|
|
|
dnl Please do not modify this file unless you expect your modifications to be
|
|
|
|
dnl Please do not modify this file unless you expect your modifications to be
|
|
|
|
dnl carried into every other module in the repository.
|
|
|
|
dnl carried into every other module in the repository.
|
|
|
|
dnl
|
|
|
|
dnl
|
|
|
|
dnl Single-module modifications are best placed in configure.in for kdelibs
|
|
|
|
dnl Single-module modifications are best placed in configure.in for tdelibs
|
|
|
|
dnl and kdebase or configure.in.in if present.
|
|
|
|
dnl and tdebase or configure.in.in if present.
|
|
|
|
|
|
|
|
|
|
|
|
dnl ------------------------------------------------------------------------
|
|
|
|
dnl ------------------------------------------------------------------------
|
|
|
|
dnl Forward compatibility macros (make autoconf 2.13 look like 2.50),
|
|
|
|
dnl Forward compatibility macros (make autoconf 2.13 look like 2.50),
|
|
|
|
@ -113,41 +113,41 @@ ac_x_libraries=],
|
|
|
|
[LIBS="$ac_save_LIBS"
|
|
|
|
[LIBS="$ac_save_LIBS"
|
|
|
|
# First see if replacing the include by lib works.
|
|
|
|
# First see if replacing the include by lib works.
|
|
|
|
# Check X11 before X11Rn because it is often a symlink to the current release.
|
|
|
|
# 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}/` \
|
|
|
|
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
|
|
|
|
/usr/X11/lib${kdelibsuff} \
|
|
|
|
/usr/X11/lib${tdelibsuff} \
|
|
|
|
/usr/X11R6/lib${kdelibsuff} \
|
|
|
|
/usr/X11R6/lib${tdelibsuff} \
|
|
|
|
/usr/X11R5/lib${kdelibsuff} \
|
|
|
|
/usr/X11R5/lib${tdelibsuff} \
|
|
|
|
/usr/X11R4/lib${kdelibsuff} \
|
|
|
|
/usr/X11R4/lib${tdelibsuff} \
|
|
|
|
\
|
|
|
|
\
|
|
|
|
/usr/lib${kdelibsuff}/X11 \
|
|
|
|
/usr/lib${tdelibsuff}/X11 \
|
|
|
|
/usr/lib${kdelibsuff}/X11R6 \
|
|
|
|
/usr/lib${tdelibsuff}/X11R6 \
|
|
|
|
/usr/lib${kdelibsuff}/X11R5 \
|
|
|
|
/usr/lib${tdelibsuff}/X11R5 \
|
|
|
|
/usr/lib${kdelibsuff}/X11R4 \
|
|
|
|
/usr/lib${tdelibsuff}/X11R4 \
|
|
|
|
\
|
|
|
|
\
|
|
|
|
/usr/local/X11/lib${kdelibsuff} \
|
|
|
|
/usr/local/X11/lib${tdelibsuff} \
|
|
|
|
/usr/local/X11R6/lib${kdelibsuff} \
|
|
|
|
/usr/local/X11R6/lib${tdelibsuff} \
|
|
|
|
/usr/local/X11R5/lib${kdelibsuff} \
|
|
|
|
/usr/local/X11R5/lib${tdelibsuff} \
|
|
|
|
/usr/local/X11R4/lib${kdelibsuff} \
|
|
|
|
/usr/local/X11R4/lib${tdelibsuff} \
|
|
|
|
\
|
|
|
|
\
|
|
|
|
/usr/local/lib${kdelibsuff}/X11 \
|
|
|
|
/usr/local/lib${tdelibsuff}/X11 \
|
|
|
|
/usr/local/lib${kdelibsuff}/X11R6 \
|
|
|
|
/usr/local/lib${tdelibsuff}/X11R6 \
|
|
|
|
/usr/local/lib${kdelibsuff}/X11R5 \
|
|
|
|
/usr/local/lib${tdelibsuff}/X11R5 \
|
|
|
|
/usr/local/lib${kdelibsuff}/X11R4 \
|
|
|
|
/usr/local/lib${tdelibsuff}/X11R4 \
|
|
|
|
\
|
|
|
|
\
|
|
|
|
/usr/X386/lib${kdelibsuff} \
|
|
|
|
/usr/X386/lib${tdelibsuff} \
|
|
|
|
/usr/x386/lib${kdelibsuff} \
|
|
|
|
/usr/x386/lib${tdelibsuff} \
|
|
|
|
/usr/XFree86/lib${kdelibsuff}/X11 \
|
|
|
|
/usr/XFree86/lib${tdelibsuff}/X11 \
|
|
|
|
\
|
|
|
|
\
|
|
|
|
/usr/lib${kdelibsuff} \
|
|
|
|
/usr/lib${tdelibsuff} \
|
|
|
|
/usr/local/lib${kdelibsuff} \
|
|
|
|
/usr/local/lib${tdelibsuff} \
|
|
|
|
/usr/unsupported/lib${kdelibsuff} \
|
|
|
|
/usr/unsupported/lib${tdelibsuff} \
|
|
|
|
/usr/athena/lib${kdelibsuff} \
|
|
|
|
/usr/athena/lib${tdelibsuff} \
|
|
|
|
/usr/local/x11r5/lib${kdelibsuff} \
|
|
|
|
/usr/local/x11r5/lib${tdelibsuff} \
|
|
|
|
/usr/lpp/Xamples/lib${kdelibsuff} \
|
|
|
|
/usr/lpp/Xamples/lib${tdelibsuff} \
|
|
|
|
/lib/usr/lib${kdelibsuff}/X11 \
|
|
|
|
/lib/usr/lib${tdelibsuff}/X11 \
|
|
|
|
\
|
|
|
|
\
|
|
|
|
/usr/openwin/lib${kdelibsuff} \
|
|
|
|
/usr/openwin/lib${tdelibsuff} \
|
|
|
|
/usr/openwin/share/lib${kdelibsuff} \
|
|
|
|
/usr/openwin/share/lib${tdelibsuff} \
|
|
|
|
; \
|
|
|
|
; \
|
|
|
|
do
|
|
|
|
do
|
|
|
|
dnl Don't even attempt the hair of trying to link an X program!
|
|
|
|
dnl Don't even attempt the hair of trying to link an X program!
|
|
|
|
@ -366,14 +366,14 @@ AC_DEFUN(KDE_1_CHECK_PATHS,
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for KDE libraries installed])
|
|
|
|
AC_MSG_CHECKING([for KDE libraries installed])
|
|
|
|
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
|
|
|
|
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
|
|
|
|
|
|
|
|
|
|
|
|
if AC_TRY_EVAL(ac_link) && test -s conftest; then
|
|
|
|
if AC_TRY_EVAL(ac_link) && test -s conftest; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
else
|
|
|
|
else
|
|
|
|
AC_MSG_ERROR([your system fails at linking a small KDE application!
|
|
|
|
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
|
|
|
|
Check, if your compiler is installed correctly and if you have used the
|
|
|
|
same compiler to compile TQt and kdelibs as you did use now.
|
|
|
|
same compiler to compile TQt and tdelibs as you did use now.
|
|
|
|
For more details about this problem, look at the end of config.log.])
|
|
|
|
For more details about this problem, look at the end of config.log.])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
@ -582,9 +582,9 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
|
|
|
|
if test -x "$KDECONFIG"; then # it can be "compiled"
|
|
|
|
if test -x "$KDECONFIG"; then # it can be "compiled"
|
|
|
|
kde_libs_prefix=`$KDECONFIG --prefix`
|
|
|
|
kde_libs_prefix=`$KDECONFIG --prefix`
|
|
|
|
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
|
|
|
|
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 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
|
|
|
|
fi
|
|
|
|
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
|
|
|
|
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
|
|
|
|
@ -867,7 +867,7 @@ mips-sgi-irix6*)
|
|
|
|
ac_x_includes="."
|
|
|
|
ac_x_includes="."
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test -z "$ac_x_libraries"; then
|
|
|
|
if test -z "$ac_x_libraries"; then
|
|
|
|
ac_x_libraries="/usr/lib${kdelibsuff}"
|
|
|
|
ac_x_libraries="/usr/lib${tdelibsuff}"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
#from now on we use our own again
|
|
|
|
#from now on we use our own again
|
|
|
|
@ -1342,7 +1342,7 @@ qt_includes=""
|
|
|
|
AC_ARG_WITH(qt-dir,
|
|
|
|
AC_ARG_WITH(qt-dir,
|
|
|
|
[ --with-qt-dir=DIR where the root of TQt is installed ],
|
|
|
|
[ --with-qt-dir=DIR where the root of TQt is installed ],
|
|
|
|
[ ac_qt_includes="$withval"/include
|
|
|
|
[ ac_qt_includes="$withval"/include
|
|
|
|
ac_qt_libraries="$withval"/lib${kdelibsuff}
|
|
|
|
ac_qt_libraries="$withval"/lib${tdelibsuff}
|
|
|
|
ac_qt_bindir="$withval"/bin
|
|
|
|
ac_qt_bindir="$withval"/bin
|
|
|
|
])
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
@ -1383,7 +1383,7 @@ ac_qt_includes="$qt_incdir"
|
|
|
|
|
|
|
|
|
|
|
|
qt_libdirs=""
|
|
|
|
qt_libdirs=""
|
|
|
|
for dir in $kde_qt_dirs; do
|
|
|
|
for dir in $kde_qt_dirs; do
|
|
|
|
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
|
|
|
|
qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
|
|
|
|
done
|
|
|
|
done
|
|
|
|
qt_libdirs="$TQTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
|
|
|
|
qt_libdirs="$TQTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
|
|
|
|
if test ! "$ac_qt_libraries" = "NO"; then
|
|
|
|
if test ! "$ac_qt_libraries" = "NO"; then
|
|
|
|
@ -1553,7 +1553,7 @@ rm -f actest.ui actest.cpp
|
|
|
|
if test "$kde_cv_uic_plugins" = yes; then
|
|
|
|
if test "$kde_cv_uic_plugins" = yes; then
|
|
|
|
AC_MSG_RESULT([yes])
|
|
|
|
AC_MSG_RESULT([yes])
|
|
|
|
else
|
|
|
|
else
|
|
|
|
AC_MSG_ERROR([not found - you need to install kdelibs first.])
|
|
|
|
AC_MSG_ERROR([not found - you need to install tdelibs first.])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
])
|
|
|
|
@ -1637,12 +1637,12 @@ if test "${prefix}" != NONE; then
|
|
|
|
if test "${exec_prefix}" != NONE; then
|
|
|
|
if test "${exec_prefix}" != NONE; then
|
|
|
|
kde_libraries=${libdir}
|
|
|
|
kde_libraries=${libdir}
|
|
|
|
ac_kde_libraries=$libdir
|
|
|
|
ac_kde_libraries=$libdir
|
|
|
|
if test "$ac_kde_libraries" = '${exec_prefix}/lib'${kdelibsuff}; then
|
|
|
|
if test "$ac_kde_libraries" = '${exec_prefix}/lib'${tdelibsuff}; then
|
|
|
|
ac_kde_libraries=$exec_prefix/lib${kdelibsuff}
|
|
|
|
ac_kde_libraries=$exec_prefix/lib${tdelibsuff}
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
else
|
|
|
|
kde_libraries=${prefix}/lib${kdelibsuff}
|
|
|
|
kde_libraries=${prefix}/lib${tdelibsuff}
|
|
|
|
ac_kde_libraries=$prefix/lib${kdelibsuff}
|
|
|
|
ac_kde_libraries=$prefix/lib${tdelibsuff}
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
else
|
|
|
|
ac_kde_includes=
|
|
|
|
ac_kde_includes=
|
|
|
|
@ -1656,7 +1656,7 @@ AC_CACHE_VAL(ac_cv_have_kde,
|
|
|
|
|
|
|
|
|
|
|
|
if test "$kde_qtver" = 1; then
|
|
|
|
if test "$kde_qtver" = 1; then
|
|
|
|
kde_check_header="ksock.h"
|
|
|
|
kde_check_header="ksock.h"
|
|
|
|
kde_check_lib="libkdecore.la"
|
|
|
|
kde_check_lib="libtdecore.la"
|
|
|
|
else
|
|
|
|
else
|
|
|
|
kde_check_header="ksharedptr.h"
|
|
|
|
kde_check_header="ksharedptr.h"
|
|
|
|
kde_check_lib="libtdeio.la"
|
|
|
|
kde_check_lib="libtdeio.la"
|
|
|
|
@ -1676,8 +1676,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
|
|
|
|
So, check this please and use another prefix!])
|
|
|
|
So, check this please and use another prefix!])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
|
|
|
|
kde_libdirs="/usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
|
|
|
|
test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${kdelibsuff} $TDEDIR $kde_libdirs"
|
|
|
|
test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
|
|
|
|
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
|
|
|
|
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
|
|
|
|
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
|
|
|
|
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
|
|
|
|
ac_kde_libraries="$kde_libdir"
|
|
|
|
ac_kde_libraries="$kde_libdir"
|
|
|
|
@ -1695,7 +1695,7 @@ fi
|
|
|
|
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
|
|
|
|
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
|
|
|
|
AC_MSG_ERROR([
|
|
|
|
AC_MSG_ERROR([
|
|
|
|
I can't find the designer plugins. These are required and should have been installed
|
|
|
|
I can't find the designer plugins. These are required and should have been installed
|
|
|
|
by kdelibs])
|
|
|
|
by tdelibs])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
if test -n "$kde_widgetdir"; then
|
|
|
|
if test -n "$kde_widgetdir"; then
|
|
|
|
@ -1960,37 +1960,37 @@ AC_DEFUN(KDE_CREATE_LIBS_ALIASES,
|
|
|
|
AC_REQUIRE([K_PATH_X])
|
|
|
|
AC_REQUIRE([K_PATH_X])
|
|
|
|
|
|
|
|
|
|
|
|
if test $kde_qtver = 3; then
|
|
|
|
if test $kde_qtver = 3; then
|
|
|
|
AC_SUBST(LIB_KDECORE, "-lkdecore")
|
|
|
|
AC_SUBST(LIB_TDECORE, "-ltdecore")
|
|
|
|
AC_SUBST(LIB_KDEUI, "-lkdeui")
|
|
|
|
AC_SUBST(LIB_TDEUI, "-ltdeui")
|
|
|
|
AC_SUBST(LIB_KIO, "-ltdeio")
|
|
|
|
AC_SUBST(LIB_TDEIO, "-ltdeio")
|
|
|
|
AC_SUBST(LIB_SMB, "-lsmb")
|
|
|
|
AC_SUBST(LIB_SMB, "-lsmb")
|
|
|
|
AC_SUBST(LIB_KAB, "-lkab")
|
|
|
|
AC_SUBST(LIB_KAB, "-lkab")
|
|
|
|
AC_SUBST(LIB_TDEABC, "-ltdeabc")
|
|
|
|
AC_SUBST(LIB_TDEABC, "-ltdeabc")
|
|
|
|
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
|
|
|
|
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
|
|
|
|
AC_SUBST(LIB_KSPELL, "-ltdespell")
|
|
|
|
AC_SUBST(LIB_TDESPELL, "-ltdespell")
|
|
|
|
AC_SUBST(LIB_KPARTS, "-ltdeparts")
|
|
|
|
AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
|
|
|
|
AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
|
|
|
|
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
|
|
|
|
# these are for backward compatibility
|
|
|
|
# these are for backward compatibility
|
|
|
|
AC_SUBST(LIB_KSYCOCA, "-ltdeio")
|
|
|
|
AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
|
|
|
|
AC_SUBST(LIB_TDEFILE, "-ltdeio")
|
|
|
|
AC_SUBST(LIB_TDEFILE, "-ltdeio")
|
|
|
|
elif test $kde_qtver = 2; then
|
|
|
|
elif test $kde_qtver = 2; then
|
|
|
|
AC_SUBST(LIB_KDECORE, "-lkdecore")
|
|
|
|
AC_SUBST(LIB_TDECORE, "-ltdecore")
|
|
|
|
AC_SUBST(LIB_KDEUI, "-lkdeui")
|
|
|
|
AC_SUBST(LIB_TDEUI, "-ltdeui")
|
|
|
|
AC_SUBST(LIB_KIO, "-ltdeio")
|
|
|
|
AC_SUBST(LIB_TDEIO, "-ltdeio")
|
|
|
|
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
|
|
|
|
AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
|
|
|
|
AC_SUBST(LIB_SMB, "-lsmb")
|
|
|
|
AC_SUBST(LIB_SMB, "-lsmb")
|
|
|
|
AC_SUBST(LIB_TDEFILE, "-ltdefile")
|
|
|
|
AC_SUBST(LIB_TDEFILE, "-ltdefile")
|
|
|
|
AC_SUBST(LIB_KAB, "-lkab")
|
|
|
|
AC_SUBST(LIB_KAB, "-lkab")
|
|
|
|
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
|
|
|
|
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
|
|
|
|
AC_SUBST(LIB_KSPELL, "-ltdespell")
|
|
|
|
AC_SUBST(LIB_TDESPELL, "-ltdespell")
|
|
|
|
AC_SUBST(LIB_KPARTS, "-ltdeparts")
|
|
|
|
AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
|
|
|
|
AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
|
|
|
|
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
|
|
|
|
else
|
|
|
|
else
|
|
|
|
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
|
|
|
|
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
|
|
|
|
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
|
|
|
|
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
|
|
|
|
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
|
|
|
|
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
|
|
|
|
AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
|
|
|
|
AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
|
|
|
|
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
|
|
|
|
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
@ -2055,7 +2055,7 @@ if test "x$kde_cv_func_$1" = xyes; then
|
|
|
|
else
|
|
|
|
else
|
|
|
|
case "$1" in
|
|
|
|
case "$1" in
|
|
|
|
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
|
|
|
|
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
|
|
|
|
kde_cv_proto_$1="yes - in libkdefakes"
|
|
|
|
kde_cv_proto_$1="yes - in libtdefakes"
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
*)
|
|
|
|
kde_cv_proto_$1=unknown
|
|
|
|
kde_cv_proto_$1=unknown
|
|
|
|
@ -2331,7 +2331,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
|
|
|
|
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
|
|
|
|
else
|
|
|
|
else
|
|
|
|
AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
|
|
|
|
AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
@ -3008,26 +3008,26 @@ See http:://objprelink.sourceforge.net for details:
|
|
|
|
|
|
|
|
|
|
|
|
AC_DEFUN(KDE_CHECK_LIB64,
|
|
|
|
AC_DEFUN(KDE_CHECK_LIB64,
|
|
|
|
[
|
|
|
|
[
|
|
|
|
kdelibsuff=none
|
|
|
|
tdelibsuff=none
|
|
|
|
AC_ARG_ENABLE(libsuffix,
|
|
|
|
AC_ARG_ENABLE(libsuffix,
|
|
|
|
AC_HELP_STRING([--enable-libsuffix],
|
|
|
|
AC_HELP_STRING([--enable-libsuffix],
|
|
|
|
[/lib directory suffix (64,32,none[=default])]),
|
|
|
|
[/lib directory suffix (64,32,none[=default])]),
|
|
|
|
kdelibsuff=$enableval)
|
|
|
|
tdelibsuff=$enableval)
|
|
|
|
# TODO: add an auto case that compiles a little C app to check
|
|
|
|
# TODO: add an auto case that compiles a little C app to check
|
|
|
|
# where the glibc is
|
|
|
|
# where the glibc is
|
|
|
|
if test "$kdelibsuff" = "none"; then
|
|
|
|
if test "$tdelibsuff" = "none"; then
|
|
|
|
kdelibsuff=
|
|
|
|
tdelibsuff=
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test -z "$kdelibsuff"; then
|
|
|
|
if test -z "$tdelibsuff"; then
|
|
|
|
AC_MSG_RESULT([not using lib directory suffix])
|
|
|
|
AC_MSG_RESULT([not using lib directory suffix])
|
|
|
|
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
|
|
|
|
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
|
|
|
|
else
|
|
|
|
else
|
|
|
|
if test "$libdir" = '${exec_prefix}/lib'; then
|
|
|
|
if test "$libdir" = '${exec_prefix}/lib'; then
|
|
|
|
libdir="$libdir${kdelibsuff}"
|
|
|
|
libdir="$libdir${tdelibsuff}"
|
|
|
|
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
|
|
|
|
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories)
|
|
|
|
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${tdelibsuff}\""], Suffix for lib directories)
|
|
|
|
AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
|
|
|
|
AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
@ -5199,7 +5199,7 @@ ssl_includes=""
|
|
|
|
AC_ARG_WITH(ssl-dir,
|
|
|
|
AC_ARG_WITH(ssl-dir,
|
|
|
|
[ --with-ssl-dir=DIR where the root of OpenSSL is installed],
|
|
|
|
[ --with-ssl-dir=DIR where the root of OpenSSL is installed],
|
|
|
|
[ ac_ssl_includes="$withval"/include
|
|
|
|
[ ac_ssl_includes="$withval"/include
|
|
|
|
ac_ssl_libraries="$withval"/lib$kdelibsuff
|
|
|
|
ac_ssl_libraries="$withval"/lib$tdelibsuff
|
|
|
|
])
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
want_ssl=yes
|
|
|
|
want_ssl=yes
|
|
|
|
@ -5219,7 +5219,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
|
|
|
|
AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
|
|
|
|
AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
|
|
|
|
ac_ssl_includes="$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
|
|
|
|
if test ! "$ac_ssl_libraries" = "NO"; then
|
|
|
|
ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
|
|
|
|
ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
