Rename include subdirectory to tde

pull/1/head
Timothy Pearson 13 years ago
parent c1f9d6e426
commit 87049e71e1

@ -1738,8 +1738,8 @@ fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="/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="/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"
@ -1975,7 +1975,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([

6
aclocal.m4 vendored

@ -1750,8 +1750,8 @@ fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="/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="/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"
@ -1987,7 +1987,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([

@ -88,7 +88,7 @@ KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
KCONFIG_COMPILER = /usr/bin/kconfig_compiler KCONFIG_COMPILER = /usr/bin/kconfig_compiler
KDECONFIG = /usr/bin/kde-config KDECONFIG = /usr/bin/kde-config
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
@ -187,7 +187,7 @@ ac_ct_CXX = g++
ac_ct_F77 = ac_ct_F77 =
ac_ct_RANLIB = ranlib ac_ct_RANLIB = ranlib
ac_ct_STRIP = strip ac_ct_STRIP = strip
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/lib -L/usr/share/qt3/lib all_libraries = -L/usr/lib -L/usr/share/qt3/lib
am__fastdepCC_FALSE = # am__fastdepCC_FALSE = #
am__fastdepCC_TRUE = am__fastdepCC_TRUE =
@ -220,7 +220,7 @@ kde_confdir = ${datadir}/config
kde_datadir = ${datadir}/apps kde_datadir = ${datadir}/apps
kde_htmldir = ${datadir}/doc/HTML kde_htmldir = ${datadir}/doc/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

@ -85,7 +85,7 @@ KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
KCONFIG_COMPILER = /usr/bin/kconfig_compiler KCONFIG_COMPILER = /usr/bin/kconfig_compiler
KDECONFIG = /usr/bin/kde-config KDECONFIG = /usr/bin/kde-config
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
@ -184,7 +184,7 @@ ac_ct_CXX = g++
ac_ct_F77 = ac_ct_F77 =
ac_ct_RANLIB = ranlib ac_ct_RANLIB = ranlib
ac_ct_STRIP = strip ac_ct_STRIP = strip
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/lib -L/usr/share/qt3/lib all_libraries = -L/usr/lib -L/usr/share/qt3/lib
am__fastdepCC_FALSE = # am__fastdepCC_FALSE = #
am__fastdepCC_TRUE = am__fastdepCC_TRUE =
@ -217,7 +217,7 @@ kde_confdir = ${datadir}/config
kde_datadir = ${datadir}/apps kde_datadir = ${datadir}/apps
kde_htmldir = ${datadir}/doc/HTML kde_htmldir = ${datadir}/doc/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

@ -85,7 +85,7 @@ KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
KCONFIG_COMPILER = /usr/bin/kconfig_compiler KCONFIG_COMPILER = /usr/bin/kconfig_compiler
KDECONFIG = /usr/bin/kde-config KDECONFIG = /usr/bin/kde-config
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
@ -184,7 +184,7 @@ ac_ct_CXX = g++
ac_ct_F77 = ac_ct_F77 =
ac_ct_RANLIB = ranlib ac_ct_RANLIB = ranlib
ac_ct_STRIP = strip ac_ct_STRIP = strip
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/lib -L/usr/share/qt3/lib all_libraries = -L/usr/lib -L/usr/share/qt3/lib
am__fastdepCC_FALSE = # am__fastdepCC_FALSE = #
am__fastdepCC_TRUE = am__fastdepCC_TRUE =
@ -217,7 +217,7 @@ kde_confdir = ${datadir}/config
kde_datadir = ${datadir}/apps kde_datadir = ${datadir}/apps
kde_htmldir = ${datadir}/doc/HTML kde_htmldir = ${datadir}/doc/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