X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=121b251f3e75e83f94e58849f51341105dfa2a1c;hb=caa537aad8330d63ee007884befe3568bd42b8d2;hp=e4bed1609968a5b319ac89c3899360089b879b1c;hpb=9f235f719e9a8eb4c55945200e30998d6354f151;p=inkscape.git

diff --git a/configure.ac b/configure.ac
index e4bed1609..121b251f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(inkscape, 0.44+devel)
+AC_INIT(inkscape, 0.45+devel)
 dnl N.B. After 0.40, please change to `0.40+cvs' instead of `0.41cvs'.
 dnl Rationale: (i) placate simple version comparison software such as
 dnl `dpkg --compare-versions'.  (ii) We don't always know what the next
@@ -23,6 +23,13 @@ AM_CONFIG_HEADER(config.h)
 
 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
@@ -38,13 +45,6 @@ if test "$GCC" = "yes"; then
   CFLAGS="-Wall -W $CFLAGS"
 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"
 
@@ -54,7 +54,9 @@ dnl Verify our GCC version
 if test "x$GXX" = "xyes"; then
 	AC_MSG_CHECKING([GNU compiler version])
 
-	cc_version=["`$CXX $CXXFLAGS -v 2>&1 </dev/null |grep 'gcc version' |\
+	# Don't pass CXXFLAGS to the following CXX command as some 
+	# of them can't be specified along with '-v'.
+	cc_version=["`$CXX -v 2>&1 </dev/null |grep 'gcc version' |\
 		sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"]
 
 	AC_MSG_RESULT([$cc_version])
@@ -80,7 +82,7 @@ GETTEXT_PACKAGE="AC_PACKAGE_NAME"
 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 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)
@@ -205,6 +207,20 @@ esac
 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 ******************************
@@ -363,7 +379,7 @@ if test "x$with_perl" = "xyes"; then
     if test "$?" -gt "0"; then
         with_perl="no"
     else
-        checkPERL_LDFLAGS=`perl -MExtUtils::Embed -e ldopts 2>/dev/null`
+        checkPERL_LIBS=`perl -MExtUtils::Embed -e ldopts 2>/dev/null`
         if test "$?" -gt "0"; then
             with_perl="no"
         else
@@ -375,22 +391,22 @@ AC_MSG_RESULT([$with_perl])
 if test "x$with_perl" = "xyes"; then
     # Test that we actually have the perl libraries installed
     oldCFLAGS="$CFLAGS"
-    oldLDFLAGS="$LDFLAGS"
+    oldLIBS="$LIBS"
     CFLAGS="$CFLAGS $checkPERL_CFLAGS"
-    LDFLAGS="$LDFLAGS $checkPERL_LDFLAGS"
+    LIBS="$LIBS $checkPERL_LIBS"
     AC_CHECK_FUNC([perl_parse],[
 	PERL_CFLAGS="$checkPERL_CFLAGS"
-	PERL_LDFLAGS="$checkPERL_LDFLAGS"
+	PERL_LIBS="$checkPERL_LIBS"
         AC_DEFINE(WITH_PERL, 1, [use Perl for embedded scripting])
         ],[
 	with_perl="no"
 	])
     CFLAGS="$oldCFLAGS"
-    LDFLAGS="$oldLDFLAGS"
+    LIBS="$oldLIBS"
 fi
 AM_CONDITIONAL(WITH_PERL, test "x$with_perl" = "xyes")
 AC_SUBST(PERL_CFLAGS)
-AC_SUBST(PERL_LDFLAGS)
+AC_SUBST(PERL_LIBS)
 
 dnl ******************************
 dnl Python checking
@@ -406,7 +422,7 @@ if test "x$with_python" = "xyes"; then
     if test "$?" -gt "0"; then
         with_python="no"
     else
-        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
+        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
         if test "$?" -gt "0"; then
             with_python="no"
         else
@@ -494,6 +510,8 @@ if test "x$with_inkboard" = "xyes"; then
 		if test "x$with_inkboard_ssl" = "xyes"; then
 			dnl OpenSSL found; enable SSL support in Pedro
 			INKBOARD_CFLAGS="$INKBOARD_CFLAGS -DHAVE_SSL"
+			RELAYTOOL([ssl], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes])
+			RELAYTOOL([crypto], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes])
 			AC_DEFINE(WITH_INKBOARD_SSL,1,[Build in SSL support for Inkboard])
 		fi
 else
@@ -508,21 +526,24 @@ dnl ******************************
 dnl   Unconditional dependencies
 dnl ******************************
 
-dnl *** NOTE: when we move to gtk 2.6 or later, we can remove the 
-dnl ********* the override for g_ascii_strtod below...
 dnl sigc++-2.0 >= 2.0.12: using "visit_each" not available in 2.0.10
 if test $cc_vers_major -gt 3; then
   min_sigc_version=2.0.12
 else
   min_sigc_version=2.0.11
 fi
-PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4  glibmm-2.4  gtkmm-2.4  gtk+-2.0 >= 2.4.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2)
+PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4  glibmm-2.4  gtkmm-2.4  gtk+-2.0 >= 2.8.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2)
 
 PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, cairo_pdf=yes, cairo_pdf=no)
 if test "x$cairo_pdf" = "xyes"; then
   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"
 
@@ -751,9 +772,6 @@ fi
 
 AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
 
-dnl Override the default g_ascii_strtod
-AC_DEFINE(g_ascii_strtod, fixed_g_ascii_strtod, [Pre-1.107 gstrfuncs.c version of g_ascii_strtod is broken])
-
 dnl Figure out where the datadir actually is
 dnl http://autoconf-archive.cryp.to/ac_define_dir.html
 prefix_NONE=
@@ -810,6 +828,7 @@ src/removeoverlap/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
@@ -860,11 +879,13 @@ Configuration:
         LDFLAGS:                  ${LDFLAGS}
 
         Use Xft font database:    ${xft_ok}
-	Use gnome-vfs:            ${gnome_vfs}
+        Use gnome-vfs:            ${gnome_vfs}
         Use openoffice files:     ${ij}
         Use MMX optimizations:    ${use_mmx_asm}
         Use relocation support:   ${enable_binreloc}
-	Enable LittleCms:         ${enable_lcms}
-	Enable Inkboard:	  ${with_inkboard}
-	Enable SSL in Inkboard:   ${with_inkboard_ssl}
+        Internal Python:          ${with_python}
+        Internal Perl:            ${with_perl}
+        Enable LittleCms:         ${enable_lcms}
+        Enable Inkboard:          ${with_inkboard}
+        Enable SSL in Inkboard:   ${with_inkboard_ssl}
 "