diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2018-09-26 01:33:22 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2018-09-26 01:33:22 +0200 |
commit | c971f4e352fb3ecb01ec43430df8b5648df0eac9 (patch) | |
tree | 73d299d6e064814124588e1aa4e808f6798d460d | |
parent | d57ffc2db9628e44d00d6ee4aa8c58f7f854ce5e (diff) | |
download | libtqt-perl-c971f4e352fb3ecb01ec43430df8b5648df0eac9.tar.gz libtqt-perl-c971f4e352fb3ecb01ec43430df8b5648df0eac9.zip |
qt_includes => tqt_includes conversion
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | acinclude.m4 | 36 | ||||
-rw-r--r-- | aclocal.m4 | 36 | ||||
-rw-r--r-- | configure.in | 4 | ||||
-rw-r--r-- | puic/Makefile.in | 2 | ||||
-rw-r--r-- | smoke/Makefile.in | 2 | ||||
-rw-r--r-- | smoke/tqt/Makefile.in | 2 | ||||
-rw-r--r-- | smoke/tqt/generate.pl.in | 2 | ||||
-rw-r--r-- | smoke/tqt/qtguess.pl.in | 2 |
9 files changed, 44 insertions, 44 deletions
diff --git a/Makefile.in b/Makefile.in index f228cff..05df83b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -184,7 +184,7 @@ mandir = @mandir@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -qt_includes = @qt_includes@ +tqt_includes = @tqt_includes@ qt_libraries = @qt_libraries@ qt_test_threshold = @qt_test_threshold@ sbindir = @sbindir@ diff --git a/acinclude.m4 b/acinclude.m4 index ea0780c..1f77768 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1163,7 +1163,7 @@ ac_cxxflags_safe="$CXXFLAGS" 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"; then LIBS="$LIBQT -lXext -lX11 $LIBSOCKET" @@ -1336,12 +1336,12 @@ AC_MSG_CHECKING([for TQt]) if test "x$kde_use_qt_emb" != "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, [ --with-qt-dir=DIR where the root of TQt is installed ], - [ ac_qt_includes="$withval"/include + [ ac_tqt_includes="$withval"/include ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1349,7 +1349,7 @@ AC_ARG_WITH(qt-dir, AC_ARG_WITH(qt-includes, [ --with-qt-includes=DIR where the TQt includes are. ], [ - ac_qt_includes="$withval" + ac_tqt_includes="$withval" ]) kde_qt_libs_given=no @@ -1368,8 +1368,8 @@ for dir in $kde_qt_dirs; do qt_incdirs="$qt_incdirs $dir/include $dir" done qt_incdirs="$TQTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 $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 @@ -1379,7 +1379,7 @@ else 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 @@ -1426,11 +1426,11 @@ LDFLAGS="$ac_ldflags_safe" 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 @@ -1459,11 +1459,11 @@ if test "$have_qt" != yes; then 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_TQT_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_TQT_MT]) qt_libraries="$ac_qt_libraries" - qt_includes="$ac_qt_includes" + tqt_includes="$ac_tqt_includes" fi if test ! "$kde_qt_libs_given" = "yes"; then @@ -1471,12 +1471,12 @@ KDE_CHECK_TQT_DIRECT(qt_libraries= ,[]) 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 @@ -1664,7 +1664,7 @@ fi if test -z "$1"; then -kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/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) @@ -1747,7 +1747,7 @@ fi 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" @@ -1175,7 +1175,7 @@ ac_cxxflags_safe="$CXXFLAGS" 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"; then LIBS="$LIBQT -lXext -lX11 $LIBSOCKET" @@ -1348,12 +1348,12 @@ AC_MSG_CHECKING([for TQt]) if test "x$kde_use_qt_emb" != "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, [ --with-qt-dir=DIR where the root of TQt is installed ], - [ ac_qt_includes="$withval"/include + [ ac_tqt_includes="$withval"/include ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1361,7 +1361,7 @@ AC_ARG_WITH(qt-dir, AC_ARG_WITH(qt-includes, [ --with-qt-includes=DIR where the TQt includes are. ], [ - ac_qt_includes="$withval" + ac_tqt_includes="$withval" ]) kde_qt_libs_given=no @@ -1380,8 +1380,8 @@ for dir in $kde_qt_dirs; do qt_incdirs="$qt_incdirs $dir/include $dir" done qt_incdirs="$TQTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 $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 @@ -1391,7 +1391,7 @@ else 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 @@ -1438,11 +1438,11 @@ LDFLAGS="$ac_ldflags_safe" 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 @@ -1471,11 +1471,11 @@ if test "$have_qt" != yes; then 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_TQT_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_TQT_MT]) qt_libraries="$ac_qt_libraries" - qt_includes="$ac_qt_includes" + tqt_includes="$ac_tqt_includes" fi if test ! "$kde_qt_libs_given" = "yes"; then @@ -1483,12 +1483,12 @@ KDE_CHECK_TQT_DIRECT(qt_libraries= ,[]) 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 @@ -1676,7 +1676,7 @@ fi if test -z "$1"; then -kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/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) @@ -1759,7 +1759,7 @@ fi 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" diff --git a/configure.in b/configure.in index ecf34bf..0aa33d3 100644 --- a/configure.in +++ b/configure.in @@ -109,7 +109,7 @@ dnl /PQT if test -z "$1"; then -kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/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) @@ -199,7 +199,7 @@ fi 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" diff --git a/puic/Makefile.in b/puic/Makefile.in index 58ca1b9..91dcf50 100644 --- a/puic/Makefile.in +++ b/puic/Makefile.in @@ -184,7 +184,7 @@ mandir = @mandir@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -qt_includes = @qt_includes@ +tqt_includes = @tqt_includes@ qt_libraries = @qt_libraries@ qt_test_threshold = @qt_test_threshold@ sbindir = @sbindir@ diff --git a/smoke/Makefile.in b/smoke/Makefile.in index 029a3cd..a9e18a2 100644 --- a/smoke/Makefile.in +++ b/smoke/Makefile.in @@ -184,7 +184,7 @@ mandir = @mandir@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -qt_includes = @qt_includes@ +tqt_includes = @tqt_includes@ qt_libraries = @qt_libraries@ qt_test_threshold = @qt_test_threshold@ sbindir = @sbindir@ diff --git a/smoke/tqt/Makefile.in b/smoke/tqt/Makefile.in index 6f4d628..f6d7d8f 100644 --- a/smoke/tqt/Makefile.in +++ b/smoke/tqt/Makefile.in @@ -184,7 +184,7 @@ mandir = @mandir@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -qt_includes = @qt_includes@ +tqt_includes = @tqt_includes@ qt_libraries = @qt_libraries@ qt_test_threshold = @qt_test_threshold@ sbindir = @sbindir@ diff --git a/smoke/tqt/generate.pl.in b/smoke/tqt/generate.pl.in index 8dfda1a..2b7ec8a 100644 --- a/smoke/tqt/generate.pl.in +++ b/smoke/tqt/generate.pl.in @@ -92,7 +92,7 @@ if("@KDE_HAVE_GL@" eq "yes") # List TQt headers, and exclude the ones listed above my @headers = (); -$qtinc= '@qt_includes@'; +$qtinc= '@tqt_includes@'; opendir (QT, $qtinc) or die "Couldn't find $qtinc"; foreach $filename (readdir(QT)) { $entry = $qtinc."/".$filename; diff --git a/smoke/tqt/qtguess.pl.in b/smoke/tqt/qtguess.pl.in index 7174567..ef88dee 100644 --- a/smoke/tqt/qtguess.pl.in +++ b/smoke/tqt/qtguess.pl.in @@ -35,7 +35,7 @@ my %qtdefs=(); my %qtundefs=(); my $tmp = gettmpfile(); -my $qtinc = '@qt_includes@'; +my $qtinc = '@tqt_includes@'; my $allinc = '@all_includes@'; my $alllib = '@all_libraries@'; my $qtflags ='@LIB_TQT@'; |