unlibtoolize the build process (yay!) -- we haven't actually used libtool for ages

[inkscape.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ad213e3f2694fd675b4ede54301069bd89754a29..37dddfff880c49ffd2299ceeddec3f544d2c446d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,14 @@ AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR(src/main.cpp)
 AM_INIT_AUTOMAKE
 
+AC_ARG_ENABLE([lsb], AS_HELP_STRING([--enable-lsb], [LSB-compatible build configuration]), [
+  prefix=/opt/inkscape
+  PATH="/opt/lsb/bin:$PATH"
+  CC=lsbcc
+  CXX=lsbc++
+  export CC CXX
+])
+
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_INTLTOOL(0.22)
@@ -40,9 +48,7 @@ AC_HEADER_STDC
 dnl Honor aclocal flags
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
-dnl RANLIB is outdated now
-dnl AC_PROG_RANLIB
-AM_PROG_LIBTOOL
+AC_PROG_RANLIB
 
 dnl Verify our GCC version
 if test "x$GXX" = "xyes"; then
@@ -74,7 +80,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 ca cs da de el en_GB es es_MX et eu fr ga gl hu it ja ko lt mk nb nl nn pa pl pt pt_BR ru sk sl sr sr@Latn sv tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am az be ca cs da de el en_GB es es_MX et eu fr fi ga gl hu it ja ko lt mk nb nl nn pa pl pt pt_BR ru sk sl sr sr@Latn sv tr uk vi zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -507,9 +513,9 @@ 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
-    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  sigc++-2.0 >= 2.0.12  $ink_spell_pkg  gthread-2.0 >= 2.0)
+    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  sigc++-2.0 >= 2.0.12  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2)
 else
-    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  sigc++-2.0 >= 2.0.11  $ink_spell_pkg  gthread-2.0 >= 2.0)
+    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  sigc++-2.0 >= 2.0.11  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2)
 fi
 
 dnl Shouldn't we test for libpng and libz?
@@ -671,19 +677,6 @@ if test "$GXX" = "yes"; then
   esac
 fi
 
-dnl ******************************
-dnl   Plugin Support
-dnl ******************************
-dnl
-dnl UPDATE: This is unconditional now (Lauris)
-dnl
-dnl AC_ARG_WITH(modules, AC_HELP_STRING([--with-modules], [Compile with plugin support (experimental)]), [mod=$withval], [mod=yes])
-dnl
-dnl AM_CONDITIONAL(USE_MODULES, test "x$mod" = "xyes")
-dnl if test "x$mod" = "xyes"; then
-dnl    AC_DEFINE(WITH_MODULES, 1, [Use experimental module support])
-dnl fi
-
 AC_DEFINE(WITH_MODULES, 1, [Use experimental module support])
 
 dnl ******************************
@@ -795,7 +788,6 @@ src/dom/makefile
 src/extension/implementation/makefile
 src/extension/internal/makefile
 src/extension/makefile
-src/extension/plugin/makefile
 src/extension/script/makefile
 src/helper/makefile
 src/inkjar/makefile