further work on LSB build configuration

diff --git a/ChangeLog b/ChangeLog
index 7c9c33f969acf885fcdf3696f98e3fe7fa352d60..dfc8124524810593ee9882d0b913f6f90760747d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-24  MenTaLguY  <mental@rydia.net>
+
+    * configure.ac: further work on LSB build configuration
+
 2006-07-23  John Bintz  <jcoswell@coswellproductions.org>
 
   * src/verbs.cpp, src/event-context.cpp, src/node-context.cpp:

diff --git a/configure.ac b/configure.ac
index c99363b88dde44de894b97d9b8ea56b872fe3e35..61cc95397c22f53e01e98047dcafd7d5390548a5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,14 @@ AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR(src/main.cpp)
 AM_INIT_AUTOMAKE
 
-AC_ARG_ENABLE([lsb], AS_HELP_STRING([--enable-lsb], [LSB-comaptible build configuration]), [
+AC_ARG_ENABLE([lsb], AS_HELP_STRING([--enable-lsb], [LSB-compatible build configuration]), [
   prefix=/opt/inkscape
-  # FIXME: need to force static linking of libraries not in LSB whitelist
+  PATH="/opt/lsb/bin:$PATH"
+  AC_CHECK_PROG(LSBCC, lsbcc, [], AC_MSG_ERROR([lsbcc not found; do you have the LSB SDK installed?]))
+  AC_CHECK_PROG(LSBCXX, lsbc++, [], AC_MSG_ERROR([lsbc++ not found; do you have the LSB SDK installed?]))
+  CC=lsbcc
+  CXX=lsbc++
+  export CC CXX
 ])
 
 AM_CONFIG_HEADER(config.h)