full correction for rest of test builds

[inkscape.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e4bed1609968a5b319ac89c3899360089b879b1c..c8b283a323e95066cc8b376affa126095e1df958 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -363,7 +363,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 +375,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 +406,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 +494,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,15 +510,13 @@ 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
@@ -751,9 +751,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=
@@ -860,11 +857,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}
 "