Rename include subdirectory to tde

pull/1/head
Timothy Pearson 13 years ago
parent c7cbe88696
commit 5837a0310e

@ -1793,8 +1793,8 @@ fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="$kde_libs_prefix/include /opt/trinity/include/kde /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="$kde_libs_prefix/include /opt/trinity/include/tde /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"
test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/kde $TDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir" ac_kde_includes="$kde_incdir"
@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
kde_cxxflags_safe="$CXXFLAGS" kde_cxxflags_safe="$CXXFLAGS"
LIBS="-lkde-qt-addon $LIBQT $LIBS" LIBS="-lkde-qt-addon $LIBQT $LIBS"
CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([ AC_TRY_LINK([

@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
It was created by configure, which was It was created by configure, which was
generated by GNU Autoconf 2.61. Invocation command line was generated by GNU Autoconf 2.61. Invocation command line was
$ ./configure --host=x86_64-linux-gnu --build=x86_64-linux-gnu --disable-debug --prefix=/usr --sysconfdir=/etc --includedir=/usr/include/kde --infodir=/usr/share/info --mandir=/usr/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde $ ./configure --host=x86_64-linux-gnu --build=x86_64-linux-gnu --disable-debug --prefix=/usr --sysconfdir=/etc --includedir=/usr/include/tde --infodir=/usr/share/info --mandir=/usr/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
## --------- ## ## --------- ##
## Platform. ## ## Platform. ##
@ -293,7 +293,7 @@ include_ARTS_FALSE=''
include_ARTS_TRUE='' include_ARTS_TRUE=''
include_x11_FALSE='' include_x11_FALSE=''
include_x11_TRUE='' include_x11_TRUE=''
includedir='/usr/include/kde' includedir='/usr/include/tde'
infodir='/usr/share/info' infodir='/usr/share/info'
install_sh='' install_sh=''
kde_appsdir='' kde_appsdir=''

@ -3,7 +3,7 @@
export kde_confdir="/etc/trinity" export kde_confdir="/etc/trinity"
export kde_prefix="/usr" export kde_prefix="/usr"
export kde_bindir="$kde_prefix/bin" export kde_bindir="$kde_prefix/bin"
export kde_includedir="$kde_prefix/include/kde" export kde_includedir="$kde_prefix/include/tde"
export kde_libdir="$kde_prefix/lib" export kde_libdir="$kde_prefix/lib"
export kde_cgidir="$kde_prefix/lib/cgi-bin" export kde_cgidir="$kde_prefix/lib/cgi-bin"
export kde_moduledir="$kde_prefix/lib/trinity" export kde_moduledir="$kde_prefix/lib/trinity"

@ -118,7 +118,7 @@ KCONFIG_COMPILER = /usr/bin/kconfig_compiler
KDECONFIG = /usr/bin/kde-config KDECONFIG = /usr/bin/kde-config
KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir) KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
KDE_EXTRA_RPATH = KDE_EXTRA_RPATH =
KDE_INCLUDES = -I/usr/include/kde KDE_INCLUDES = -I/usr/include/tde
KDE_LDFLAGS = -L/usr/lib KDE_LDFLAGS = -L/usr/lib
KDE_MT_LDFLAGS = KDE_MT_LDFLAGS =
KDE_MT_LIBS = -lpthread KDE_MT_LIBS = -lpthread
@ -227,7 +227,7 @@ X_RPATH =
ac_ct_CC = gcc ac_ct_CC = gcc
ac_ct_CXX = g++ ac_ct_CXX = g++
ac_ct_F77 = ac_ct_F77 =
all_includes = -I/usr/include/kde -I/usr/include/qt3 -I. all_includes = -I/usr/include/tde -I/usr/include/qt3 -I.
all_libraries = all_libraries =
am__fastdepCC_FALSE = # am__fastdepCC_FALSE = #
am__fastdepCC_TRUE = am__fastdepCC_TRUE =
@ -268,7 +268,7 @@ kde_confdir = /etc/trinity
kde_datadir = /usr/share/apps kde_datadir = /usr/share/apps
kde_htmldir = /usr/share/doc/kde/HTML kde_htmldir = /usr/share/doc/kde/HTML
kde_icondir = /usr/share/icons kde_icondir = /usr/share/icons
kde_includes = /usr/include/kde kde_includes = /usr/include/tde
kde_kcfgdir = ${datadir}/config.kcfg kde_kcfgdir = ${datadir}/config.kcfg
kde_libraries = /usr/lib kde_libraries = /usr/lib
kde_libs_htmldir = /usr/share/doc/kde/HTML kde_libs_htmldir = /usr/share/doc/kde/HTML

@ -102,7 +102,7 @@ KCONFIG_COMPILER = /usr/bin/kconfig_compiler
KDECONFIG = /usr/bin/kde-config KDECONFIG = /usr/bin/kde-config
KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir) KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
KDE_EXTRA_RPATH = KDE_EXTRA_RPATH =
KDE_INCLUDES = -I/usr/include/kde KDE_INCLUDES = -I/usr/include/tde
KDE_LDFLAGS = -L/usr/lib KDE_LDFLAGS = -L/usr/lib
KDE_MT_LDFLAGS = KDE_MT_LDFLAGS =
KDE_MT_LIBS = -lpthread KDE_MT_LIBS = -lpthread
@ -211,7 +211,7 @@ X_RPATH =
ac_ct_CC = gcc ac_ct_CC = gcc
ac_ct_CXX = g++ ac_ct_CXX = g++
ac_ct_F77 = ac_ct_F77 =
all_includes = -I/usr/include/kde -I/usr/include/qt3 -I. all_includes = -I/usr/include/tde -I/usr/include/qt3 -I.
all_libraries = all_libraries =
am__fastdepCC_FALSE = # am__fastdepCC_FALSE = #
am__fastdepCC_TRUE = am__fastdepCC_TRUE =
@ -252,7 +252,7 @@ kde_confdir = /etc/trinity
kde_datadir = /usr/share/apps kde_datadir = /usr/share/apps
kde_htmldir = /usr/share/doc/kde/HTML kde_htmldir = /usr/share/doc/kde/HTML
kde_icondir = /usr/share/icons kde_icondir = /usr/share/icons
kde_includes = /usr/include/kde kde_includes = /usr/include/tde
kde_kcfgdir = ${datadir}/config.kcfg kde_kcfgdir = ${datadir}/config.kcfg
kde_libraries = /usr/lib kde_libraries = /usr/lib
kde_libs_htmldir = /usr/share/doc/kde/HTML kde_libs_htmldir = /usr/share/doc/kde/HTML

@ -3,7 +3,7 @@
export kde_confdir="/etc/kde" export kde_confdir="/etc/kde"
export kde_prefix="/usr" export kde_prefix="/usr"
export kde_bindir="$kde_prefix/bin" export kde_bindir="$kde_prefix/bin"
export kde_includedir="$kde_prefix/include/kde" export kde_includedir="$kde_prefix/include/tde"
export kde_libdir="$kde_prefix/lib" export kde_libdir="$kde_prefix/lib"
export kde_cgidir="$kde_prefix/lib/cgi-bin" export kde_cgidir="$kde_prefix/lib/cgi-bin"
export kde_moduledir="$kde_prefix/lib/trinity" export kde_moduledir="$kde_prefix/lib/trinity"

@ -156,7 +156,7 @@ KCONFIG_COMPILER = /usr/bin/kconfig_compiler
KDECONFIG = /usr/bin/kde-config KDECONFIG = /usr/bin/kde-config
KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir) KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
KDE_EXTRA_RPATH = KDE_EXTRA_RPATH =
KDE_INCLUDES = -I/usr/include/kde KDE_INCLUDES = -I/usr/include/tde
KDE_LDFLAGS = -L/usr/lib KDE_LDFLAGS = -L/usr/lib
KDE_MT_LDFLAGS = KDE_MT_LDFLAGS =
KDE_MT_LIBS = -lpthread KDE_MT_LIBS = -lpthread
@ -264,7 +264,7 @@ X_RPATH =
ac_ct_CC = ac_ct_CC =
ac_ct_CXX = ac_ct_CXX =
ac_ct_F77 = ac_ct_F77 =
all_includes = -I/usr/include/kde -I/usr/share/qt3/include -I. all_includes = -I/usr/include/tde -I/usr/share/qt3/include -I.
all_libraries = -L/usr/share/qt3/lib all_libraries = -L/usr/share/qt3/lib
am__fastdepCC_FALSE = # am__fastdepCC_FALSE = #
am__fastdepCC_TRUE = am__fastdepCC_TRUE =
@ -296,7 +296,7 @@ include_ARTS_FALSE = #
include_ARTS_TRUE = include_ARTS_TRUE =
include_x11_FALSE = # include_x11_FALSE = #
include_x11_TRUE = include_x11_TRUE =
includedir = /usr/include/kde includedir = /usr/include/tde
infodir = /usr/share/info infodir = /usr/share/info
install_sh = /home/agi/debian/kmyfirewall/kmyfirewall-1.1.1/admin/install-sh install_sh = /home/agi/debian/kmyfirewall/kmyfirewall-1.1.1/admin/install-sh
kde_appsdir = ${datadir}/applnk kde_appsdir = ${datadir}/applnk
@ -305,7 +305,7 @@ kde_confdir = /etc/trinity
kde_datadir = ${datadir}/apps kde_datadir = ${datadir}/apps
kde_htmldir = /usr/share/doc/kde/HTML kde_htmldir = /usr/share/doc/kde/HTML
kde_icondir = ${datadir}/icons kde_icondir = ${datadir}/icons
kde_includes = /usr/include/kde kde_includes = /usr/include/tde
kde_kcfgdir = ${datadir}/config.kcfg kde_kcfgdir = ${datadir}/config.kcfg
kde_libraries = /usr/lib kde_libraries = /usr/lib
kde_libs_htmldir = /usr/share/doc/kde/HTML kde_libs_htmldir = /usr/share/doc/kde/HTML

Loading…
Cancel
Save