diff --git a/acinclude.m4 b/acinclude.m4 index 9e7ea5b..6b73b7d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1105,7 +1105,7 @@ AC_DEFUN([AC_SS_CHECK_ARTS], ss_save_LIBS="$LIBS" CPPFLAGS="-I$SS_X_INCDIR -I$SS_QT3_INCDIR -I$SS_KDE_INCDIR $CPPFLAGS $X_CFLAGS" CXXFLAGS="-O2 -Wall $CXXFLAGS" - LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -lkdecore -l$SS_QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR" + LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -ltdecore -l$SS_QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR" if test "$SS_LINK_TO_LIBDL" = "yes"; then LIBS="$LIBS -ldl"; fi @@ -2293,7 +2293,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_QT3_AND_KDE], if test -n "$SS_X_LIBLINK"; then LIBS="$LIBS $SS_X_LIBLINK" fi - LIBS="-L$SS_KDE_LIBDIR -L$SS_QT3_LIBDIR -lkdecore -l$SS_QTLIB_NAME $LIBS -Wl,-rpath $SS_KDE_LIBDIR" + LIBS="-L$SS_KDE_LIBDIR -L$SS_QT3_LIBDIR -ltdecore -l$SS_QTLIB_NAME $LIBS -Wl,-rpath $SS_KDE_LIBDIR" if test "$SS_LINK_TO_LIBDL" = "yes"; then LIBS="$LIBS -ldl"; fi @@ -2513,7 +2513,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG], SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR" SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR" SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR" - SS_LIBLINK="-lkdecore -lkdeui -lkparts $SS_LIBLINK" + SS_LIBLINK="-ltdecore -ltdeui -lkparts $SS_LIBLINK" AC_DEFINE([COMPILE_KDE_SUPPORT], 1, [define if you want to compile the KDE 3.x support]) SS_BUILD_FLAGS="k$SS_BUILD_FLAGS" fi diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index fb80fd7..720dec7 100644 --- a/admin/acinclude.m4.in +++ b/admin/acinclude.m4.in @@ -1105,7 +1105,7 @@ AC_DEFUN([AC_SS_CHECK_ARTS], ss_save_LIBS="$LIBS" CPPFLAGS="-I$SS_X_INCDIR -I$SS_QT3_INCDIR -I$SS_KDE_INCDIR $CPPFLAGS $X_CFLAGS" CXXFLAGS="-O2 -Wall $CXXFLAGS" - LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -lkdecore -l$SS_QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR" + LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -ltdecore -l$SS_QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR" if test "$SS_LINK_TO_LIBDL" = "yes"; then LIBS="$LIBS -ldl"; fi @@ -2293,7 +2293,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_QT3_AND_KDE], if test -n "$SS_X_LIBLINK"; then LIBS="$LIBS $SS_X_LIBLINK" fi - LIBS="-L$SS_KDE_LIBDIR -L$SS_QT3_LIBDIR -lkdecore -l$SS_QTLIB_NAME $LIBS -Wl,-rpath $SS_KDE_LIBDIR" + LIBS="-L$SS_KDE_LIBDIR -L$SS_QT3_LIBDIR -ltdecore -l$SS_QTLIB_NAME $LIBS -Wl,-rpath $SS_KDE_LIBDIR" if test "$SS_LINK_TO_LIBDL" = "yes"; then LIBS="$LIBS -ldl"; fi @@ -2513,7 +2513,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG], SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR" SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR" SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR" - SS_LIBLINK="-lkdecore -lkdeui -lkparts $SS_LIBLINK" + SS_LIBLINK="-ltdecore -ltdeui -lkparts $SS_LIBLINK" AC_DEFINE([COMPILE_KDE_SUPPORT], 1, [define if you want to compile the KDE 3.x support]) SS_BUILD_FLAGS="k$SS_BUILD_FLAGS" fi