diff options
| -rw-r--r-- | acinclude.m4 | 32 | ||||
| -rw-r--r-- | kdiff3plugin/po/Makefile | 4 |
2 files changed, 4 insertions, 32 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d8a1b16..2027e0c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2872,34 +2872,6 @@ AC_DEFUN([AC_CHECK_BOOL], AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool]) ]) -AC_DEFUN([AC_CHECK_GNU_EXTENSIONS], -[ -AC_MSG_CHECKING(if you need GNU extensions) -AC_CACHE_VAL(ac_cv_gnu_extensions, -[ -cat > conftest.c << EOF -#include <features.h> - -#ifdef __GNU_LIBRARY__ -yes -#endif -EOF - -if (eval "$ac_cpp conftest.c") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_gnu_extensions=yes -else - ac_cv_gnu_extensions=no -fi -]) - -AC_MSG_RESULT($ac_cv_gnu_extensions) -if test "$ac_cv_gnu_extensions" = "yes"; then - AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions]) -fi -]) - AC_DEFUN([KDE_CHECK_COMPILER_FLAG], [ AC_MSG_CHECKING([whether $CXX supports -$1]) @@ -3197,8 +3169,8 @@ AC_DEFUN([AC_CHECK_COMPILERS], CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS" case $host in *-*-linux-gnu) - CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" - CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS" + CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE $CFLAGS" + CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS" KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"]) KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"]) ;; diff --git a/kdiff3plugin/po/Makefile b/kdiff3plugin/po/Makefile index 25fef44..c5579ff 100644 --- a/kdiff3plugin/po/Makefile +++ b/kdiff3plugin/po/Makefile @@ -67,14 +67,14 @@ AUTOMAKE = ${SHELL} /home/eike/devel/debian/kdiff3/kdiff3-0.9.92/admin/missing - AWK = gawk CC = i486-linux-gnu-gcc CCDEPMODE = depmode=gcc3 -CFLAGS = -std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -O2 -Wall -g -O2 -Wformat-security -Wmissing-format-attribute +CFLAGS = -std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -O2 -Wall -g -O2 -Wformat-security -Wmissing-format-attribute CONF_FILES = $(top_srcdir)/./admin/configure.in.min $(top_srcdir)/configure.in.in CPP = i486-linux-gnu-gcc -E CPPFLAGS = -DTQT_THREAD_SUPPORT -D_REENTRANT CXX = i486-linux-gnu-g++ CXXCPP = i486-linux-gnu-g++ -E CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -O2 -Wformat-security -Wmissing-format-attribute -Wno-non-virtual-dtor -fno-exceptions -fno-check-new -fno-common +CXXFLAGS = -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -O2 -Wformat-security -Wmissing-format-attribute -Wno-non-virtual-dtor -fno-exceptions -fno-check-new -fno-common CYGPATH_W = echo DCOPIDL = ${prefix}/bin/dcopidl DCOPIDL2CPP = ${prefix}/bin/dcopidl2cpp |