Bernhard Fischer:

- new configure option --enable-static-programs

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1101 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/configure.ac b/program/configure.ac
index dc197e1f9c05484d87d3d3f5587992b597d13036..fab77f5d49a700fed7bc0de821d909e3055809e2 100644 (file)
--- a/program/configure.ac
+++ b/program/configure.ac
@@ -305,9 +305,17 @@ AC_ARG_ENABLE([direct-io],
 [enable_direct_io=yes],
 [])
 
- AC_ARG_ENABLE(pthread,[  --disable-pthread       disable multithread support],
+AC_ARG_ENABLE(pthread,[  --disable-pthread       disable multithread support],
 [],[enable_pthread=yes])
 
+AC_ARG_ENABLE(static-programs,
+     [  --enable-static-programs  Build static programs],
+     [case "${enableval}" in
+       yes) staticprogs=yes ;;
+       no)  staticprogs=no ;;
+       *) AC_MSG_ERROR(bad value ${enableval} for --enable-static-programs) ;;
+     esac],[staticprogs=no])
+AM_CONDITIONAL(STATIC_PROGRAMS,[test "x$staticprogs" = "xyes"])
 
 
 CONFIGURE_PART(Audit Compilation Environment)
@@ -853,6 +861,7 @@ echo "Config is DONE!"
 echo
 echo "          With MMAP IO: $enable_mmap"
 echo "          Use O_DIRECT: $enable_direct_io"
+echo "       Static programs: $staticprogs"
 echo "          Perl Modules: $COMP_PERL"
 echo "           Perl Binary: $PERL"
 echo "          Perl Version: $PERL_VERSION"

diff --git a/program/src/Makefile.am b/program/src/Makefile.am
index 6fd4364ce32a0e87a6232fd4d9fa9ddaf5cca3d9..56ffbb2a6acb889faa94238e1fef36e83708d378 100644 (file)
--- a/program/src/Makefile.am
+++ b/program/src/Makefile.am
@@ -7,6 +7,10 @@
 fontsdir =  $(datadir)/rrdtool/fonts
 fonts_DATA = DejaVuSansMono-Roman.ttf
 
+if STATIC_PROGRAMS
+AM_LDFLAGS = -all-static
+endif
+
 #INCLUDES = $(FREETYPE_INCLUDES) $(ART_INCLUDES) \
 #           $(PNG_INCLUDES) $(ZLIB_INCLUDES)
 RRD_DEFAULT_FONT=@RRD_DEFAULT_FONT@