@ -371,7 +371,7 @@ 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 -lk decore $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 -lt decore $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)
@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir)
AC_SUBST(kde_moduledir)
AC_SUBST(k deinitdir, '$(kde_moduledir)')
AC_SUBST(t deinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir)
AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir)
AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then
if test "$kde_qtver" = 1; then
@ -2079,12 +2079,12 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then
if test $kde_qtver = 3; then
case $host in
case $host in
*cygwin*) lib_kded="-lk deinit_kded" ;;
*cygwin*) lib_kded="-lt deinit_kded" ;;
*) lib_kded="" ;;
*) lib_kded="" ;;
esac
esac
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDECORE, "-lk decore")
AC_SUBST(LIB_KDECORE, "-lt decore")
AC_SUBST(LIB_KDEUI, "-lk deui")
AC_SUBST(LIB_KDEUI, "-lt deui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_SMB, "-lsmb")
@ -2093,9 +2093,9 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KDEPRINT, "-lk deprint")
AC_SUBST(LIB_KDEPRINT, "-lt deprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
AC_SUBST(LIB_KUTILS, "-lkutils")
AC_SUBST(LIB_KDEPIM, "-lk depim")
AC_SUBST(LIB_KDEPIM, "-lt depim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@ -2104,8 +2104,8 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
elif test $kde_qtver = 2; then
elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lk decore")
AC_SUBST(LIB_KDECORE, "-lt decore")
AC_SUBST(LIB_KDEUI, "-lk deui")
AC_SUBST(LIB_KDEUI, "-lt deui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_SMB, "-lsmb")
@ -2114,10 +2114,10 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KDEPRINT, "-lk deprint")
AC_SUBST(LIB_KDEPRINT, "-lt deprint")
else
else
AC_SUBST(LIB_KDECORE, "-lk decore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDECORE, "-lt decore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lk deui $(LIB_KDECORE)")
AC_SUBST(LIB_KDEUI, "-lt deui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
@ -2501,7 +2501,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 k desupport package)
AC_MSG_ERROR(You need giflib30. Please install the t desupport package)
fi
fi
])
])