[libkdcraw][master] 8d964d7a,91eb8ebb

acinclude.m4

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

index feda45b..82b7b3d 100644

--- a/acinclude.m4

+++ b/acinclude.m4

@@ -1258,7 +1258,7 @@

 ac_ldflags_safe="$LDFLAGS"

 ac_libs_safe="$LIBS"

-CXXFLAGS="$CXXFLAGS -I$qt_includes"

+CXXFLAGS="$CXXFLAGS -I$tqt_includes"

 LDFLAGS="$LDFLAGS $X_LDFLAGS"

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

 LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"

@@ -1420,12 +1420,12 @@

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

 LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"

fi

-ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO

+ac_tqt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO

 qt_libraries=""

-qt_includes=""

+tqt_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_tqt_includes="$withval"/include

        ac_qt_libraries="$withval"/lib${tdelibsuff}

        ac_qt_bindir="$withval"/bin

])

@@ -1433,7 +1433,7 @@

 AC_ARG_WITH(qt-includes,

     AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),

-       ac_qt_includes="$withval"

+       ac_tqt_includes="$withval"

])

 kde_qt_libs_given=no

@@ -1460,8 +1460,8 @@

fi

fi

 qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"

-if test ! "$ac_qt_includes" = "NO"; then

-   qt_incdirs="$ac_qt_includes $qt_incdirs"

+if test ! "$ac_tqt_includes" = "NO"; then

+   qt_incdirs="$ac_tqt_includes $qt_incdirs"

fi

 if test "$kde_qtver" != "1"; then

@@ -1471,7 +1471,7 @@

fi

 AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)

-ac_qt_includes="$qt_incdir"

+ac_tqt_includes="$qt_incdir"

 qt_libdirs=""

 for dir in $kde_qt_dirs; do

@@ -1532,11 +1532,11 @@

 LIBS="$ac_libs_safe"

 AC_LANG_RESTORE

-if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then

+if test "$ac_tqt_includes" = NO || test "$ac_qt_libraries" = NO; then

   ac_cv_have_qt="have_qt=no"

   ac_qt_notfound=""

   missing_qt_mt=""

-  if test "$ac_qt_includes" = NO; then

+  if test "$ac_tqt_includes" = NO; then

     if test "$ac_qt_libraries" = NO; then

       ac_qt_notfound="(headers and libraries)";

     else

@@ -1565,11 +1565,11 @@

   AC_MSG_RESULT([$have_qt]);

 else

   ac_cv_have_qt="have_qt=yes \

-    ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"

-  AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT])

+    ac_tqt_includes=$ac_tqt_includes ac_qt_libraries=$ac_qt_libraries"

+  AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_tqt_includes $USING_QT_MT])

   qt_libraries="$ac_qt_libraries"

-  qt_includes="$ac_qt_includes"

+  tqt_includes="$ac_tqt_includes"

fi

 if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then

@@ -1577,12 +1577,12 @@

fi

 AC_SUBST(qt_libraries)

-AC_SUBST(qt_includes)

+AC_SUBST(tqt_includes)

-if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then

+if test "$tqt_includes" = "$x_includes" || test -z "$tqt_includes"; then

  TQT_INCLUDES=""

 else

- TQT_INCLUDES="-I$qt_includes"

+ TQT_INCLUDES="-I$tqt_includes"

  all_includes="$TQT_INCLUDES $all_includes"

fi

@@ -1817,7 +1817,7 @@

 if test -z "$1"; then

-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"

+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/kde/include $x_includes $tqt_includes"

 test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"

 kde_incdirs="$ac_kde_includes $kde_incdirs"

 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)

@@ -1900,7 +1900,7 @@

 AC_SUBST(kde_libraries)

 AC_SUBST(kde_includes)

-if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes"  || test "$kde_includes" = "/usr/include"; then

+if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$tqt_includes"  || test "$kde_includes" = "/usr/include"; then

  KDE_INCLUDES=""

 else

  KDE_INCLUDES="-I$kde_includes"

8d964d7a	2018-09-25 18:14:49	Slávek Banko
QT_INCLUDES => TQT_INCLUDES conversion Signed-off-by: Slávek Banko <slavek.banko@...>
M acinclude.m4
acinclude.m4 diff --git a/acinclude.m4 b/acinclude.m4 index 6311687..feda45b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1304,7 +1304,7 @@ dnl ------------------------------------------------------------------------ dnl Try to find the Qt headers and libraries. dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed) -dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed) +dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed) dnl ------------------------------------------------------------------------ dnl AC_DEFUN([AC_PATH_TQT_1_3], @@ -1580,10 +1580,10 @@ AC_SUBST(qt_includes) if test "$qt_includes" = "$x_includes" \|\| test -z "$qt_includes"; then - QT_INCLUDES="" + TQT_INCLUDES="" else - QT_INCLUDES="-I$qt_includes" - all_includes="$QT_INCLUDES $all_includes" + TQT_INCLUDES="-I$qt_includes" + all_includes="$TQT_INCLUDES $all_includes" fi if test "$qt_libraries" = "$x_libraries" \|\| test -z "$qt_libraries"; then @@ -1594,7 +1594,7 @@ fi test -z "$KDE_MT_LDFLAGS" \|\| all_libraries="$all_libraries $KDE_MT_LDFLAGS" -AC_SUBST(QT_INCLUDES) +AC_SUBST(TQT_INCLUDES) AC_SUBST(QT_LDFLAGS) AC_PATH_TQT_MOC_UIC
91eb8ebb	2018-09-25 18:33:18	Slávek Banko
qt_includes => tqt_includes conversion Signed-off-by: Slávek Banko <slavek.banko@...>
M acinclude.m4
acinclude.m4 diff --git a/acinclude.m4 b/acinclude.m4 index feda45b..82b7b3d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1258,7 +1258,7 @@ ac_ldflags_safe="$LDFLAGS" ac_libs_safe="$LIBS" -CXXFLAGS="$CXXFLAGS -I$qt_includes" +CXXFLAGS="$CXXFLAGS -I$tqt_includes" LDFLAGS="$LDFLAGS $X_LDFLAGS" if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then LIBS="$LIBQT -lXext -lX11 $LIBSOCKET" @@ -1420,12 +1420,12 @@ if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" fi -ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO +ac_tqt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO qt_libraries="" -qt_includes="" +tqt_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_tqt_includes="$withval"/include ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1433,7 +1433,7 @@ AC_ARG_WITH(qt-includes, AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]), [ - ac_qt_includes="$withval" + ac_tqt_includes="$withval" ]) kde_qt_libs_given=no @@ -1460,8 +1460,8 @@ fi fi qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" -if test ! "$ac_qt_includes" = "NO"; then - qt_incdirs="$ac_qt_includes $qt_incdirs" +if test ! "$ac_tqt_includes" = "NO"; then + qt_incdirs="$ac_tqt_includes $qt_incdirs" fi if test "$kde_qtver" != "1"; then @@ -1471,7 +1471,7 @@ fi AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) -ac_qt_includes="$qt_incdir" +ac_tqt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do @@ -1532,11 +1532,11 @@ LIBS="$ac_libs_safe" AC_LANG_RESTORE -if test "$ac_qt_includes" = NO \|\| test "$ac_qt_libraries" = NO; then +if test "$ac_tqt_includes" = NO \|\| test "$ac_qt_libraries" = NO; then ac_cv_have_qt="have_qt=no" ac_qt_notfound="" missing_qt_mt="" - if test "$ac_qt_includes" = NO; then + if test "$ac_tqt_includes" = NO; then if test "$ac_qt_libraries" = NO; then ac_qt_notfound="(headers and libraries)"; else @@ -1565,11 +1565,11 @@ AC_MSG_RESULT([$have_qt]); else ac_cv_have_qt="have_qt=yes \ - ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries" - AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT]) + ac_tqt_includes=$ac_tqt_includes ac_qt_libraries=$ac_qt_libraries" + AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_tqt_includes $USING_QT_MT]) qt_libraries="$ac_qt_libraries" - qt_includes="$ac_qt_includes" + tqt_includes="$ac_tqt_includes" fi if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then @@ -1577,12 +1577,12 @@ fi AC_SUBST(qt_libraries) -AC_SUBST(qt_includes) +AC_SUBST(tqt_includes) -if test "$qt_includes" = "$x_includes" \|\| test -z "$qt_includes"; then +if test "$tqt_includes" = "$x_includes" \|\| test -z "$tqt_includes"; then TQT_INCLUDES="" else - TQT_INCLUDES="-I$qt_includes" + TQT_INCLUDES="-I$tqt_includes" all_includes="$TQT_INCLUDES $all_includes" fi @@ -1817,7 +1817,7 @@ if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/kde/include $x_includes $tqt_includes" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) @@ -1900,7 +1900,7 @@ AC_SUBST(kde_libraries) AC_SUBST(kde_includes) -if test "$kde_includes" = "$x_includes" \|\| test "$kde_includes" = "$qt_includes" \|\| test "$kde_includes" = "/usr/include"; then +if test "$kde_includes" = "$x_includes" \|\| test "$kde_includes" = "$tqt_includes" \|\| test "$kde_includes" = "/usr/include"; then KDE_INCLUDES="" else KDE_INCLUDES="-I$kde_includes"

Branch: master

acinclude.m4

acinclude.m4