Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/libtqt-perl

8 files changed, 31 insertions, 31 deletions

diff --git a/Makefile.PL b/Makefile.PL
index 87e65b3..8f46637 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -93,10 +93,10 @@ unless ($ENV{'TQTDIR'} or grep /--with-qt-dir/, @ARGV)
 
 unshift(@ARGV, "--with-qt-dir=$res") if $res;
 
-unless ($ENV{'KDEDIR'} or grep /--prefix/, @ARGV)
+unless ($ENV{'TDEDIR'} or grep /--prefix/, @ARGV)
 {
   print "\n!!!!!!!!!!!! WARNING !!!!!!!!!!!!\n".
-        " Your KDEDIR environment variable is not set and you\n".
+        " Your TDEDIR environment variable is not set and you\n".
         "did not use the '--prefix=' commandline option.\n";
   print "KDE-3 isn't required at all. However, if it's installed on your system,\n".
         "it is much better to specify it's location since PerlTQt uses (or build, if\n".
diff --git a/PerlTQt/TQt.pm b/PerlTQt/TQt.pm
index 69bcbca..0b8a5c9 100644
--- a/PerlTQt/TQt.pm
+++ b/PerlTQt/TQt.pm
@@ -884,7 +884,7 @@ XSLoader::load 'TQt', $VERSION;
 # try to avoid KDE's buggy malloc
 # only works for --enable-fast-malloc,
 # not when --enable-fast-malloc=full
-$ENV{'KDE_MALLOC'} = 0;
+$ENV{'TDE_MALLOC'} = 0;
 
 TQt::_internal::init();
 
diff --git a/acinclude.m4 b/acinclude.m4
index 89254cd..e97e70b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -377,13 +377,13 @@ same compiler to compile TQt and kdelibs as you did use now.
 For more details about this problem, look at the end of config.log.])
 fi
 
-if eval `KDEDIR= ./conftest 2>&5`; then
+if eval `TDEDIR= ./conftest 2>&5`; then
   kde_result=done
 else
   kde_result=problems
 fi
 
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
 kde_have_all_paths=yes
 
 KDE_SET_PATHS($kde_result)
@@ -539,11 +539,11 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
     AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
 
         kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-        test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-        if test -n "$KDEDIRS"; then
+        test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
+        if test -n "$TDEDIRS"; then
            kde_save_IFS=$IFS
            IFS=:
-           for dir in $KDEDIRS; do
+           for dir in $TDEDIRS; do
                 kde_default_bindirs="$dir/bin $kde_default_bindirs "
            done
            IFS=$kde_save_IFS
@@ -560,7 +560,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
       
         if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
 		KDE_XSL_STYLESHEET=""
@@ -1665,7 +1665,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"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/tde $KDEDIR $kde_incdirs"
+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)
 ac_kde_includes="$kde_incdir"
@@ -1677,7 +1677,7 @@ So, check this please and use another prefix!])
 fi
 
 kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${kdelibsuff} $TDEDIR $kde_libdirs"
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
 ac_kde_libraries="$kde_libdir"
@@ -3043,7 +3043,7 @@ AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 AM_INIT_AUTOMAKE($1, $2)
 AM_DISABLE_LIBRARIES
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
 AC_CHECK_COMPILERS
 KDE_PROG_LIBTOOL
 AM_KDE_WITH_NLS
@@ -4595,8 +4595,8 @@ AC_DEFUN(KDE_CONF_FILES,
 AC_DEFUN(KDE_SET_PREFIX,
 [
   unset CDPATH
-  dnl make $KDEDIR the default for the installation
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+  dnl make $TDEDIR the default for the installation
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
 
   if test "x$prefix" = "xNONE"; then
     prefix=$ac_default_prefix
diff --git a/aclocal.m4 b/aclocal.m4
index 1c94845..a565814 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -389,13 +389,13 @@ same compiler to compile TQt and kdelibs as you did use now.
 For more details about this problem, look at the end of config.log.])
 fi
 
-if eval `KDEDIR= ./conftest 2>&5`; then
+if eval `TDEDIR= ./conftest 2>&5`; then
   kde_result=done
 else
   kde_result=problems
 fi
 
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
 kde_have_all_paths=yes
 
 KDE_SET_PATHS($kde_result)
@@ -551,11 +551,11 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
     AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
 
         kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-        test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-        if test -n "$KDEDIRS"; then
+        test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
+        if test -n "$TDEDIRS"; then
            kde_save_IFS=$IFS
            IFS=:
-           for dir in $KDEDIRS; do
+           for dir in $TDEDIRS; do
                 kde_default_bindirs="$dir/bin $kde_default_bindirs "
            done
            IFS=$kde_save_IFS
@@ -572,7 +572,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
       
         if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
 		KDE_XSL_STYLESHEET=""
@@ -1677,7 +1677,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"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/tde $KDEDIR $kde_incdirs"
+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)
 ac_kde_includes="$kde_incdir"
@@ -1689,7 +1689,7 @@ So, check this please and use another prefix!])
 fi
 
 kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${kdelibsuff} $TDEDIR $kde_libdirs"
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
 ac_kde_libraries="$kde_libdir"
@@ -3055,7 +3055,7 @@ AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 AM_INIT_AUTOMAKE($1, $2)
 AM_DISABLE_LIBRARIES
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
 AC_CHECK_COMPILERS
 KDE_PROG_LIBTOOL
 AM_KDE_WITH_NLS
@@ -4607,8 +4607,8 @@ AC_DEFUN(KDE_CONF_FILES,
 AC_DEFUN(KDE_SET_PREFIX,
 [
   unset CDPATH
-  dnl make $KDEDIR the default for the installation
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+  dnl make $TDEDIR the default for the installation
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
 
   if test "x$prefix" = "xNONE"; then
     prefix=$ac_default_prefix
diff --git a/configure.in b/configure.in
index 849f783..2375b17 100644
--- a/configure.in
+++ b/configure.in
@@ -62,7 +62,7 @@ KDE_USE_QT(3.0)
 
 dnl ------------------------------------------------------------------------
 dnl Reimplementation of AC_BASE_PATH_KDE avoiding the need for
-dnl a prefix pointing to KDEDIR.
+dnl a prefix pointing to TDEDIR.
 dnl $(KDE_LDFLAGS) will be the kdeliblocation (if any)
 dnl and $(kde_includes) will be the kdehdrlocation (if any)
 dnl ------------------------------------------------------------------------
@@ -110,7 +110,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"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/tde $KDEDIR $kde_incdirs"
+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)
 ac_kde_includes="$kde_incdir"
@@ -123,7 +123,7 @@ dnl /PQT
 fi
 
 kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${kdelibsuff} $TDEDIR $kde_libdirs"
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
 ac_kde_libraries="$kde_libdir"
diff --git a/doc/fr/PerlQt.pod b/doc/fr/PerlQt.pod
index 2e120d4..2dc91fc 100644
--- a/doc/fr/PerlQt.pod
+++ b/doc/fr/PerlQt.pod
@@ -99,7 +99,7 @@ un sous-répertoire.
 Cela installera PerlTQt, Puic et les utilitaires pqtsh et pqtapi.
 
 Le lieu d'installation privilégié de SMOKE et de PUIC est le système de
-fichiers de KDE3. Si KDE3 n'est pas installé (ou que la variable KDEDIR n'est pas
+fichiers de KDE3. Si KDE3 n'est pas installé (ou que la variable TDEDIR n'est pas
 définie), spécifier ce lieu avec l'option C<--prefix> de C<configure>'s. Ainsi :
 
  perl Makefile.PL --prefix=/usr
diff --git a/doc/fr/index.html b/doc/fr/index.html
index 451f6bd..0db306c 100644
--- a/doc/fr/index.html
+++ b/doc/fr/index.html
@@ -152,7 +152,7 @@ un sous-répertoire.</p>
  make install</pre>
 <p>Cela installera PerlTQt, Puic et les utilitaires pqtsh et pqtapi.</p>
 <p>Le lieu d'installation privilégié de SMOKE et de PUIC est le système de
-fichiers de KDE3. Si KDE3 n'est pas installé (ou que la variable KDEDIR n'est pas
+fichiers de KDE3. Si KDE3 n'est pas installé (ou que la variable TDEDIR n'est pas
 définie), spécifier ce lieu avec l'option <code>--prefix</code> de <code>configure</code>'s. Ainsi :</p>
 <pre>
  perl Makefile.PL --prefix=/usr</pre>
diff --git a/smoke/qt/generate.pl.in b/smoke/qt/generate.pl.in
index d002af8..8dfda1a 100644
--- a/smoke/qt/generate.pl.in
+++ b/smoke/qt/generate.pl.in
@@ -64,7 +64,7 @@ my %excludes = (
     'ntqwindowsxpstyle.h' => 1 # play on the safe side 
 );
 
-# Some systems have a TQTDIR = KDEDIR = PREFIX
+# Some systems have a TQTDIR = TDEDIR = PREFIX
 # We need a complete list
 
 my %includes;