configure: --with-skylog arg to set default value

diff --git a/Makefile b/Makefile
index 10fe5d2e579d21f86af386c4bda4f799f653fee9..49bf98475888d8ac106062f8be67f8fc8e47c985 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,10 @@ python-install: config.mak sub-all
 
 python-install python-all: python/skytools/installer_config.py
 python/skytools/installer_config.py: python/skytools/installer_config.py.in config.mak
-       sed -e 's!@SQLDIR@!$(SQLDIR)!g' -e 's!@PACKAGE_VERSION@!$(PACKAGE_VERSION)!g' $< > $@
+       sed -e 's!@SQLDIR@!$(SQLDIR)!g' \
+           -e 's!@SKYLOG@!$(SKYLOG)!g' \
+           -e 's!@PACKAGE_VERSION@!$(PACKAGE_VERSION)!g' \
+           $< > $@
 
 realclean: distclean
        $(MAKE) -C doc $@

diff --git a/config.mak.in b/config.mak.in
index f330c703a0220e0e71b29484cbf1a5537c8a92cf..7a98814fc5059589cb7fa1bcdc448dbada038d5e 100644 (file)
--- a/config.mak.in
+++ b/config.mak.in
@@ -36,5 +36,5 @@ LIBS = @LIBS@
 INSTALL = @INSTALL@
 BININSTALL = @BININSTALL@
 
-
+SKYLOG = @SKYLOG@
 

diff --git a/configure.ac b/configure.ac
index 91cc31fe3d9dbd21d7836474ba2bb1062ad2ccaa..a532f1cd8225da253f4f09efc4b15ef33370969b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,21 @@ changequote([, ])dnl
   esac
 fi
 
+dnl Find PostgreSQL pg_config
+SKYLOG=0
+AC_MSG_CHECKING(for skylog default setting)
+AC_ARG_WITH(skylog, [  --with-skylog=0|1  set default value for skylog (default: 0)],
+[ if test "$withval" = "yes"; then
+    SKYLOG="1"
+  elif test "$withval" = "no"; then
+    SKYLOG="0"
+  else
+    SKYLOG="$withval"
+  fi
+  AC_MSG_RESULT([$SKYLOG])])
+AC_MSG_RESULT([$SKYLOG])
+AC_SUBST(SKYLOG)
+
 dnl check for xmlto, but only if asciidoc is found
 if test "$ASCIIDOC" != "no"; then
   AC_CHECK_PROGS(XMLTO, [$XMLTO xmlto])

diff --git a/python/skytools/installer_config.py.in b/python/skytools/installer_config.py.in
index 2c684c1713a62defca4e2ab56ef07b2a9278ea30..cac7277ff6927afc1ca35959895c8dfb97c73341 100644 (file)
--- a/python/skytools/installer_config.py.in
+++ b/python/skytools/installer_config.py.in
@@ -9,3 +9,5 @@ sql_locations = [
 
 package_version = "@PACKAGE_VERSION@"
 
+skylog = @SKYLOG@
+