TDE
/
tde-common-admin
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-common-admin
0
0
Fork 0
Code Issues Releases Wiki Activity

Update header checks

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 00b66ad7a1
commit 03276f8119
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File

48
acinclude.m4.in
Unescape View File

@ -1,6 +1,6 @@
## -*- autoconf -*- ## -*- autoconf -*-
dnl This file is part of the KDE libraries/packages dnl This file is part of the TDE libraries/packages
dnl Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu) dnl Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu)
dnl (C) 1997,98,99 Stephan Kulow (coolo@kde.org) dnl (C) 1997,98,99 Stephan Kulow (coolo@kde.org)
@ -413,13 +413,13 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH" KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi fi
AC_MSG_CHECKING([for KDE libraries installed]) AC_MSG_CHECKING([for TDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
AC_MSG_ERROR([your system fails at linking a small KDE application! AC_MSG_ERROR([your system fails at linking a small TDE application!
Check, if your compiler is installed correctly and if you have used the Check, if your compiler is installed correctly and if you have used the
same compiler to compile Qt and tdelibs as you did use now. same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log.]) For more details about this problem, look at the end of config.log.])
@ -549,7 +549,7 @@ else
AC_MSG_RESULT([compiling]) AC_MSG_RESULT([compiling])
KDE_1_CHECK_PATHS KDE_1_CHECK_PATHS
else else
AC_MSG_ERROR([path checking not yet supported for KDE 2]) AC_MSG_ERROR([path checking not yet supported for TDE 2])
fi fi
fi fi
@ -575,7 +575,7 @@ AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS],
AC_DEFUN([KDE_MISSING_PROG_ERROR], AC_DEFUN([KDE_MISSING_PROG_ERROR],
[ [
AC_MSG_ERROR([The important program $1 was not found! AC_MSG_ERROR([The important program $1 was not found!
Please check whether you installed KDE correctly. Please check whether you installed TDE correctly.
]) ])
]) ])
@ -637,7 +637,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
trinity3ornewer= trinity3ornewer=
fi fi
if test "$KDECONFIG" != "compiled"; then if test "$KDECONFIG" != "compiled"; then
if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then if test `$KDECONFIG --version | grep TDE | sed 's/TDE: \(...\).*/\1/'` = 3.2; then
trinity3ornewer= trinity3ornewer=
fi fi
fi fi
@ -691,7 +691,7 @@ AC_DEFUN([AC_CREATE_KFSSTND],
[ [
AC_REQUIRE([AC_CHECK_RPATH]) AC_REQUIRE([AC_CHECK_RPATH])
AC_MSG_CHECKING([for KDE paths]) AC_MSG_CHECKING([for TDE paths])
kde_result="" kde_result=""
kde_cached_paths=yes kde_cached_paths=yes
AC_CACHE_VAL(kde_cv_all_paths, AC_CACHE_VAL(kde_cv_all_paths,
@ -718,7 +718,7 @@ if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then
kde_result="$kde_result (cache overridden)" kde_result="$kde_result (cache overridden)"
fi fi
if test "$kde_have_all_paths" = "no"; then if test "$kde_have_all_paths" = "no"; then
AC_MSG_ERROR([configure could not run a little KDE program to test the environment. AC_MSG_ERROR([configure could not run a little TDE program to test the environment.
Since it had compiled and linked before, it must be a strange problem on your system. Since it had compiled and linked before, it must be a strange problem on your system.
Look at config.log for details. If you are not able to fix this, look at Look at config.log for details. If you are not able to fix this, look at
http://www.kde.org/faq/installation.html or any www.kde.org mirror. http://www.kde.org/faq/installation.html or any www.kde.org mirror.
@ -752,7 +752,7 @@ dnl X Desktop Group standards
AC_SUBST(xdg_appsdir) AC_SUBST(xdg_appsdir)
AC_SUBST(xdg_menudir) AC_SUBST(xdg_menudir)
AC_SUBST(xdg_directorydir) AC_SUBST(xdg_directorydir)
dnl for KDE 2 dnl for TDE 2
AC_SUBST(kde_templatesdir) AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_servicetypesdir)
@ -763,7 +763,7 @@ AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_minidir="$kde_icondir/mini" kde_minidir="$kde_icondir/mini"
else else
# for KDE 1 - this breaks KDE2 apps using minidir, but # for TDE 1 - this breaks KDE2 apps using minidir, but
# that's the plan ;-/ # that's the plan ;-/
kde_minidir="/dev/null" kde_minidir="/dev/null"
fi fi
@ -2050,7 +2050,7 @@ AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetd
if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
in the prefix, you've chosen, are no KDE libraries installed. This will fail. in the prefix, you've chosen, are no TDE libraries installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi fi
@ -2200,7 +2200,7 @@ AC_MSG_RESULT($kde_use_extra_libs)
AC_DEFUN([KDE_1_CHECK_PATH_HEADERS], AC_DEFUN([KDE_1_CHECK_PATH_HEADERS],
[ [
AC_MSG_CHECKING([for KDE headers installed]) AC_MSG_CHECKING([for TDE headers installed])
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
@ -2244,8 +2244,8 @@ EOF
if AC_TRY_EVAL(ac_compile); then if AC_TRY_EVAL(ac_compile); then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
AC_MSG_ERROR([your system is not able to compile a small KDE application! AC_MSG_ERROR([your system is not able to compile a small TDE application!
Check, if you installed the KDE header files correctly. Check, if you installed the TDE header files correctly.
For more details about this problem, look at the end of config.log.]) For more details about this problem, look at the end of config.log.])
fi fi
CPPFLAGS=$ac_save_CPPFLAGS CPPFLAGS=$ac_save_CPPFLAGS
@ -2698,7 +2698,7 @@ AC_DEFUN([AC_CHECK_STRLCPY],
#include <string.h> #include <string.h>
], ],
[ char buf[20]; [ char buf[20];
strlcpy(buf, "KDE function test", sizeof(buf)); strlcpy(buf, "TDE function test", sizeof(buf));
], ],
[unsigned long strlcpy(char*, const char*, unsigned long)], [unsigned long strlcpy(char*, const char*, unsigned long)],
[STRLCPY]) [STRLCPY])
@ -2711,7 +2711,7 @@ AC_DEFUN([AC_CHECK_STRLCAT],
], ],
[ char buf[20]; [ char buf[20];
buf[0]='\0'; buf[0]='\0';
strlcat(buf, "KDE function test", sizeof(buf)); strlcat(buf, "TDE function test", sizeof(buf));
], ],
[unsigned long strlcat(char*, const char*, unsigned long)], [unsigned long strlcat(char*, const char*, unsigned long)],
[STRLCAT]) [STRLCAT])
@ -3592,7 +3592,7 @@ AC_DEFUN([AC_CHECK_COMPILERS],
esac esac
KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"]) KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"]) KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
dnl ### FIXME: revert for KDE 4 dnl ### FIXME: revert for TDE 4
KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"]) KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"])
fi fi
fi fi
@ -5412,7 +5412,7 @@ AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAX
AC_DEFUN([KDE_CHECK_HEADER], AC_DEFUN([KDE_CHECK_HEADER],
[ [
kde_safe_cppflags=$CPPFLAGS kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/kde -I/usr/include/tqt" CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt"
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_CHECK_HEADER([$1], [$2], [$3], [$4]) AC_CHECK_HEADER([$1], [$2], [$3], [$4])
@ -5425,7 +5425,7 @@ AC_DEFUN([KDE_CHECK_HEADERS],
AH_CHECK_HEADERS([$1]) AH_CHECK_HEADERS([$1])
AC_LANG_SAVE AC_LANG_SAVE
kde_safe_cppflags=$CPPFLAGS kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/kde -I/usr/include/tqt" CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt"
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_CHECK_HEADERS([$1], [$2], [$3], [$4]) AC_CHECK_HEADERS([$1], [$2], [$3], [$4])
CPPFLAGS=$kde_safe_cppflags CPPFLAGS=$kde_safe_cppflags
@ -5573,7 +5573,7 @@ pushdef([AC_PROG_INSTALL],
dnl *autoconf 2.13 is dumb, and thinks it can use INSTALL_PROGRAM as dnl *autoconf 2.13 is dumb, and thinks it can use INSTALL_PROGRAM as
dnl INSTALL_SCRIPT, which breaks with automake <= 1.4 dnl INSTALL_SCRIPT, which breaks with automake <= 1.4
dnl *autoconf >2.13 (since 10.Apr 1999) has not that failure dnl *autoconf >2.13 (since 10.Apr 1999) has not that failure
dnl *sometimes KDE does not use the install-@DIR@PROGRAM targets from dnl *sometimes TDE does not use the install-@DIR@PROGRAM targets from
dnl automake (due to broken Makefile.am or whatever) to install programs, dnl automake (due to broken Makefile.am or whatever) to install programs,
dnl and so does not see the -s flag in automake > 1.4 dnl and so does not see the -s flag in automake > 1.4
dnl to clean up that mess we: dnl to clean up that mess we:
@ -5903,7 +5903,7 @@ kde_cv_java_bindir=$kde_java_bindir
]) ])
dnl this is a redefinition of autoconf 2.5x's AC_FOREACH. dnl this is a redefinition of autoconf 2.5x's AC_FOREACH.
dnl When the argument list becomes big, as in KDE for AC_OUTPUT in dnl When the argument list becomes big, as in TDE for AC_OUTPUT in
dnl big packages, m4_foreach is dog-slow. So use our own version of dnl big packages, m4_foreach is dog-slow. So use our own version of
dnl it. (matz@kde.org) dnl it. (matz@kde.org)
m4_define([mm_foreach], m4_define([mm_foreach],
@ -6419,7 +6419,7 @@ fi
]) ])
dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in) dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in)
dnl which allows to search for libs that get installed into the KDE prefix. dnl which allows to search for libs that get installed into the TDE prefix.
dnl dnl
dnl Syntax: KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not) dnl Syntax: KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not)
dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
@ -6584,7 +6584,7 @@ dnl AM_KDE_MIN_VERSION(MIN-VERSION-MAJOR, MIN-VERSION-MINOR, MIN-VERSION-MICRO)
dnl dnl
AC_DEFUN([AM_KDE_MIN_VERSION], AC_DEFUN([AM_KDE_MIN_VERSION],
[ [
AC_MSG_CHECKING([if minimum KDE version is available]) AC_MSG_CHECKING([if minimum TDE version is available])
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
save_CXXFLAGS=$CXXFLAGS save_CXXFLAGS=$CXXFLAGS
@ -6592,7 +6592,7 @@ AC_DEFUN([AM_KDE_MIN_VERSION],
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include "kdecompat.h" #include "kdecompat.h"
#if !( KDE_IS_VERSION( $1, $2, $3 ) ) #if !( KDE_IS_VERSION( $1, $2, $3 ) )
#error KDE version does not meet KMyMoney minimum requirement #error TDE version does not meet KMyMoney minimum requirement
#endif #endif
], [], AC_MSG_RESULT(yes), AC_MSG_ERROR(no) ], [], AC_MSG_RESULT(yes), AC_MSG_ERROR(no)
) )

Write Preview
Loading…
Cancel
Save