Makefile, configure: Add option for disabling generation of example certificates

diff --git a/Makefile b/Makefile
index f61fda17b5ef2c45354f6092cc365497d83950f8..c5390599064405960c303b55f095f2c51fa02b41 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,9 @@ INSTALLEDDATA = $(DATADIR)
 
 all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version
        $(MAKE) -C util-src install
-       $(MAKE) -C certs localhost.crt example.com.crt
+ifeq ($(EXCERTS),yes)
+       $(MAKE) -C certs localhost.crt example.com.crt || true
+endif
 
 install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so
        install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)

diff --git a/configure b/configure
index ecf77a866b5af14f52f6b7e93868c02a68447eb9..822b046e154a46d8fdee2c2b1dc7e502af21fe0a 100755 (executable)
--- a/configure
+++ b/configure
@@ -17,6 +17,7 @@ CC=gcc
 CXX=g++
 LD=gcc
 RUNWITH=lua
+EXCERTS=yes
 
 CFLAGS="-fPIC -Wall"
 LDFLAGS="-shared"
@@ -64,6 +65,7 @@ Configure Prosody prior to building.
                             Default is $LD
 --require-config            Will cause Prosody to refuse to run when
                             it fails to find a configuration file
+--no-example-certs          Disables generation of example certificates.
 EOF
 }
 
@@ -178,6 +180,9 @@ do
    --runwith=*)
       RUNWITH="$value"
       ;;
+    --no-example-certs)
+      EXCERTS=
+      ;;
    *)
       echo "Error: Unknown flag: $1"
       exit 1
@@ -349,6 +354,7 @@ CC=$CC
 CXX=$CXX
 LD=$LD
 RUNWITH=$RUNWITH
+EXCERTS=$EXCERTS
 
 EOF