[ksystemlog][master] 6b4f93f3

acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4

index 4a1701d..7c95da9 100644

--- a/acinclude.m4

+++ b/acinclude.m4

@@ -1553,19 +1553,19 @@

 KDE_CHECK_QT_JPEG

 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then

-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'

+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'

 else

-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'

+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'

fi

-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"

+test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"

 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do

   if test -e "$a"; then

-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"

+     LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"

      break

fi

 done

-AC_SUBST(LIB_QT)

+AC_SUBST(LIB_TQT)

 AC_SUBST(LIB_QPE)

 AC_SUBST(kde_qtver)

@@ -2036,7 +2036,7 @@

    AC_SUBST(LIB_TDEPARTS, "-ltdeparts")

    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")

 else

-   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)")

    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")

    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")

    AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")

@@ -4898,8 +4898,8 @@

   AC_MSG_CHECKING([for Qtopia])

-  LIB_QTOPIA="-lqpe"

-  AC_SUBST(LIB_QTOPIA)

+  LIB_TQTOPIA="-lqpe"

+  AC_SUBST(LIB_TQTOPIA)

   kde_qtopia_dirs="$QPEDIR /opt/Qtopia"

@@ -4946,7 +4946,7 @@

   CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"

   LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"

-  LIBS="$LIBS $LIB_QTOPIA $LIBQT"

+  LIBS="$LIBS $LIB_TQTOPIA $LIBQT"

   cat > conftest.$ac_ext <<EOF

 #include "confdefs.h"

aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4

index 11e77d7..c8f54a4 100644

--- a/aclocal.m4

+++ b/aclocal.m4

@@ -1565,19 +1565,19 @@

 KDE_CHECK_QT_JPEG

 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then

-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'

+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'

 else

-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'

+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'

fi

-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"

+test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"

 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do

   if test -e "$a"; then

-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"

+     LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"

      break

fi

 done

-AC_SUBST(LIB_QT)

+AC_SUBST(LIB_TQT)

 AC_SUBST(LIB_QPE)

 AC_SUBST(kde_qtver)

@@ -2048,7 +2048,7 @@

    AC_SUBST(LIB_TDEPARTS, "-ltdeparts")

    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")

 else

-   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)")

    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")

    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")

    AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")

@@ -4910,8 +4910,8 @@

   AC_MSG_CHECKING([for Qtopia])

-  LIB_QTOPIA="-lqpe"

-  AC_SUBST(LIB_QTOPIA)

+  LIB_TQTOPIA="-lqpe"

+  AC_SUBST(LIB_TQTOPIA)

   kde_qtopia_dirs="$QPEDIR /opt/Qtopia"

@@ -4958,7 +4958,7 @@

   CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"

   LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"

-  LIBS="$LIBS $LIB_QTOPIA $LIBQT"

+  LIBS="$LIBS $LIB_TQTOPIA $LIBQT"

   cat > conftest.$ac_ext <<EOF

 #include "confdefs.h"

ksystemlog/po/Makefile

diff --git a/ksystemlog/po/Makefile b/ksystemlog/po/Makefile

index 079ce0b..c8256e7 100644

--- a/ksystemlog/po/Makefile

+++ b/ksystemlog/po/Makefile

@@ -131,7 +131,7 @@

 LIB_TDEUTILS = -ltdeutils

 LIB_POLL =

 LIB_QPE =

-LIB_QT = -lqt-mt  $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread

+LIB_TQT = -lqt-mt  $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread

 LIB_SMB = -lsmb

 LIB_X11 = -lX11 $(LIBSOCKET)

 LIB_XEXT = -lXext

ksystemlog/src/Makefile.am

diff --git a/ksystemlog/src/Makefile.am b/ksystemlog/src/Makefile.am

index ca8b625..487943b 100644

--- a/ksystemlog/src/Makefile.am

+++ b/ksystemlog/src/Makefile.am

@@ -14,7 +14,7 @@

 	-I$(top_srcdir)/ksystemlog/src/system  -I$(top_srcdir)/ksystemlog/src/xorg $(all_includes)

 # the library search path.

-ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeutils

+ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeutils

 # the libraries to link against.

 ksystemlog_LDADD = \

6b4f93f3	2018-09-17 09:20:34	Michele Calgaro
LIB_QT -> LIB_TQT conversion to align to updated admin module Signed-off-by: Michele Calgaro <michele.calgaro@...>
M acinclude.m4 M aclocal.m4 M ksystemlog/po/Makefile M ksystemlog/src/Makefile.am
acinclude.m4 diff --git a/acinclude.m4 b/acinclude.m4 index 4a1701d..7c95da9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1553,19 +1553,19 @@ KDE_CHECK_QT_JPEG if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' +LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' else -LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' +LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' fi -test -z "$KDE_MT_LIBS" \|\| LIB_QT="$LIB_QT $KDE_MT_LIBS" +test -z "$KDE_MT_LIBS" \|\| LIB_TQT="$LIB_TQT $KDE_MT_LIBS" for a in $qt_libdir/lib`echo ${kde_int_qt} \| sed 's,^-l,,'`_incremental.; do if test -e "$a"; then - LIB_QT="$LIB_QT ${kde_int_qt}_incremental" + LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental" break fi done -AC_SUBST(LIB_QT) +AC_SUBST(LIB_TQT) AC_SUBST(LIB_QPE) AC_SUBST(kde_qtver) @@ -2036,7 +2036,7 @@ AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") @@ -4898,8 +4898,8 @@ AC_MSG_CHECKING([for Qtopia]) - LIB_QTOPIA="-lqpe" - AC_SUBST(LIB_QTOPIA) + LIB_TQTOPIA="-lqpe" + AC_SUBST(LIB_TQTOPIA) kde_qtopia_dirs="$QPEDIR /opt/Qtopia" @@ -4946,7 +4946,7 @@ CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" - LIBS="$LIBS $LIB_QTOPIA $LIBQT" + LIBS="$LIBS $LIB_TQTOPIA $LIBQT" cat > conftest.$ac_ext <<EOF #include "confdefs.h" aclocal.m4 diff --git a/aclocal.m4 b/aclocal.m4 index 11e77d7..c8f54a4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1565,19 +1565,19 @@ KDE_CHECK_QT_JPEG if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' +LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' else -LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' +LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' fi -test -z "$KDE_MT_LIBS" \|\| LIB_QT="$LIB_QT $KDE_MT_LIBS" +test -z "$KDE_MT_LIBS" \|\| LIB_TQT="$LIB_TQT $KDE_MT_LIBS" for a in $qt_libdir/lib`echo ${kde_int_qt} \| sed 's,^-l,,'`_incremental.; do if test -e "$a"; then - LIB_QT="$LIB_QT ${kde_int_qt}_incremental" + LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental" break fi done -AC_SUBST(LIB_QT) +AC_SUBST(LIB_TQT) AC_SUBST(LIB_QPE) AC_SUBST(kde_qtver) @@ -2048,7 +2048,7 @@ AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") @@ -4910,8 +4910,8 @@ AC_MSG_CHECKING([for Qtopia]) - LIB_QTOPIA="-lqpe" - AC_SUBST(LIB_QTOPIA) + LIB_TQTOPIA="-lqpe" + AC_SUBST(LIB_TQTOPIA) kde_qtopia_dirs="$QPEDIR /opt/Qtopia" @@ -4958,7 +4958,7 @@ CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" - LIBS="$LIBS $LIB_QTOPIA $LIBQT" + LIBS="$LIBS $LIB_TQTOPIA $LIBQT" cat > conftest.$ac_ext <<EOF #include "confdefs.h" ksystemlog/po/Makefile diff --git a/ksystemlog/po/Makefile b/ksystemlog/po/Makefile index 079ce0b..c8256e7 100644 --- a/ksystemlog/po/Makefile +++ b/ksystemlog/po/Makefile @@ -131,7 +131,7 @@ LIB_TDEUTILS = -ltdeutils LIB_POLL = LIB_QPE = -LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread +LIB_TQT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread LIB_SMB = -lsmb LIB_X11 = -lX11 $(LIBSOCKET) LIB_XEXT = -lXext ksystemlog/src/Makefile.am diff --git a/ksystemlog/src/Makefile.am b/ksystemlog/src/Makefile.am index ca8b625..487943b 100644 --- a/ksystemlog/src/Makefile.am +++ b/ksystemlog/src/Makefile.am @@ -14,7 +14,7 @@ -I$(top_srcdir)/ksystemlog/src/system -I$(top_srcdir)/ksystemlog/src/xorg $(all_includes) # the library search path. -ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeutils +ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeutils # the libraries to link against. ksystemlog_LDADD = \

Branch: master

acinclude.m4

aclocal.m4

ksystemlog/po/Makefile

ksystemlog/src/Makefile.am