diff --git a/configure.ac b/configure.ac
index 3709c6ae99dc2df01da1b87ac0800de899d2e3b6..6dab04287fadc8b5a5c05a034fdca52369d03a47 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_PROG_INTLTOOL(0.22)
AC_PROG_INTLTOOL(0.22)
+AC_LANG(C++)
+AC_ISC_POSIX
+AC_PROG_CXX
+AM_PROG_CC_STDC
+AM_PROG_AS
+AC_HEADER_STDC
+
dnl These next few lines are needed only while libcroco is in our source tree.
AC_PROG_CC
AM_PROG_CC_C_O
dnl These next few lines are needed only while libcroco is in our source tree.
AC_PROG_CC
AM_PROG_CC_C_O
+AC_MSG_NOTICE([Testing -Wno-pointer-sign])
if test "$GCC" = "yes"; then
# Enable some warnings from gcc.
if test "$GCC" = "yes"; then
# Enable some warnings from gcc.
+ AC_LANG_PUSH(C)
# -Wno-pointer-sign is probably new in gcc 4.0; certainly it isn't accepted
# by gcc 2.95.
ink_svd_CFLAGS="$CFLAGS"
CFLAGS="-Wno-pointer-sign $CFLAGS"
# -Wno-pointer-sign is probably new in gcc 4.0; certainly it isn't accepted
# by gcc 2.95.
ink_svd_CFLAGS="$CFLAGS"
CFLAGS="-Wno-pointer-sign $CFLAGS"
- AC_COMPILE_IFELSE([int dummy;
-], , CFLAGS="$ink_svd_CFLAGS",)
- CFLAGS="-Wall -W $CFLAGS"
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), AC_MSG_NOTICE([ compiler supports -Wno-pointer-sign]), CFLAGS="$ink_svd_CFLAGS")
+ CFLAGS="-Wall -Wformat-security -W -D_FORTIFY_SOURCE=2 $CFLAGS"
+ AC_LANG_POP
fi
fi
-AC_LANG(C++)
-AC_ISC_POSIX
-AC_PROG_CXX
-AM_PROG_CC_STDC
-AM_PROG_AS
-AC_HEADER_STDC
-
dnl Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
dnl Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Translation domain used])
dnl Add the languages which your application supports here.
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Translation domain used])
dnl Add the languages which your application supports here.
-ALL_LINGUAS="am az be bg ca cs da de dz el en_GB en_CA en_US@piglatin es es_MX et fi fr ga gl hr hu it ja ko lt mk mn nb ne nl nn pa pl pt pt_BR ru rw sk sl sq sr sr@Latn sv th tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am az be bg bn ca cs da de dz el en_AU en_CA en_GB en_US@piglatin eo es_MX es et eu fi fr ga gl he hr hu id it ja km ko lt mk mn nb ne nl nn pa pl pt_BR pt ro ru rw sk sl sq sr@Latn sr sv th tr uk vi zh_CN zh_TW"
AM_GLIB_GNU_GETTEXT
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
AM_GLIB_GNU_GETTEXT
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
AC_MSG_ERROR(You have to install pkg-config to compile inkscape.)
fi
AC_MSG_ERROR(You have to install pkg-config to compile inkscape.)
fi
+dnl Find msgfmt. Without this, po/Makefile fails to set MSGFMT on some platforms.
+AC_PATH_PROG(MSGFMT, msgfmt, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
dnl ******************************
dnl Check for libpng
dnl ******************************
dnl ******************************
dnl Check for libpng
dnl ******************************
AC_MSG_RESULT([$platform_win32])
AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
AC_MSG_RESULT([$platform_win32])
AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+AC_MSG_CHECKING([for Solaris 2.8 platform])
+case "$host" in
+ *-solaris2.8)
+ platform_solaris_2_8=yes
+ CFLAGS="$CFLAGS -DSOLARIS_2_8"
+ CXXFLAGS="$CXXFLAGS -DSOLARIS_2_8"
+ ;;
+ *)
+ platform_solaris_2_8=no
+ ;;
+esac
+AC_MSG_RESULT([$platform_solaris_2_8])
+AM_CONDITIONAL(PLATFORM_SOLARIS_2_8, test "$platform_solaris_2_8" = "yes")
+
dnl ******************************
dnl Xft checking
dnl ******************************
dnl ******************************
dnl Xft checking
dnl ******************************
AC_DEFINE(HAVE_CAIRO_PDF, 1, [Whether the Cairo PDF backend is available])
fi
AC_DEFINE(HAVE_CAIRO_PDF, 1, [Whether the Cairo PDF backend is available])
fi
+PKG_CHECK_MODULES(GTK_UNIX_PRINT, gtk+-unix-print-2.0, gtk_unix_print=yes, gtk_unix_print=no)
+if test "x$gtk_unix_print" = "xyes"; then
+ AC_DEFINE(HAVE_GTK_UNIX_PRINT, 1, [Whether the GTK Unix printing backend is available])
+fi
+
dnl Shouldn't we test for libpng and libz?
INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz"
dnl Shouldn't we test for libpng and libz?
INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz"
# programmer deliberately has an unused parameter (e.g. because it's used
# as a callback or similar function pointer use).
# programmer deliberately has an unused parameter (e.g. because it's used
# as a callback or similar function pointer use).
- CXXFLAGS="-Wall -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch $CXXFLAGS"
+ CXXFLAGS="-Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch -D_FORTIFY_SOURCE=2 $CXXFLAGS"
dnl Test for arch-specific situations.
case "$host_cpu" in
dnl Test for arch-specific situations.
case "$host_cpu" in
src/svg/makefile
src/trace/makefile
src/traits/makefile
src/svg/makefile
src/trace/makefile
src/traits/makefile
+src/ui/cache/makefile
src/ui/dialog/makefile
src/ui/makefile
src/ui/view/makefile
src/ui/dialog/makefile
src/ui/makefile
src/ui/view/makefile
share/clipart/Makefile
share/examples/Makefile
share/extensions/Makefile
share/clipart/Makefile
share/examples/Makefile
share/extensions/Makefile
+share/extensions/Barcode/Makefile
share/fonts/Makefile
share/gradients/Makefile
share/icons/Makefile
share/fonts/Makefile
share/gradients/Makefile
share/icons/Makefile