summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMenTaLguY <mental@rydia.net>2006-07-25 02:35:16 +0000
committermental <mental@users.sourceforge.net>2006-07-25 02:35:16 +0000
commite2f77c079f2ca6f4093d394947f9b0c8b1d3f80f (patch)
tree5686ba23ce77733c410eb66902c2f1e4a675b400
parentadded Rune and Riku (diff)
downloadinkscape-e2f77c079f2ca6f4093d394947f9b0c8b1d3f80f.tar.gz
inkscape-e2f77c079f2ca6f4093d394947f9b0c8b1d3f80f.zip
further work on LSB build configuration
(bzr r1471)
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac9
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c9c33f96..dfc812452 100644
--- 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 c99363b88..61cc95397 100644
--- 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)