--- a/.hgtags Fri Nov 29 20:11:06 2013 +0000
+++ b/.hgtags Wed Dec 11 22:31:48 2013 +0000
@@ -48,3 +48,5 @@
6ef79af0c4455851ae45fa4da1033ba2cccada88 0.9.0
6bc4077bc1f96ff83795fcc423ff270a28156d1c 0.9.1
49e3c49eb0d8f33e94e2bf37e5421deacac5f499 0.9.2
+49e3c49eb0d8f33e94e2bf37e5421deacac5f499 0.9.2
+56b1f151f4a31fcc7dbde49e064a288715077ece 0.9.2
--- a/Makefile Fri Nov 29 20:11:06 2013 +0000
+++ b/Makefile Wed Dec 11 22:31:48 2013 +0000
@@ -17,7 +17,9 @@
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)
--- a/configure Fri Nov 29 20:11:06 2013 +0000
+++ b/configure Wed Dec 11 22:31:48 2013 +0000
@@ -17,6 +17,7 @@
CXX=g++
LD=gcc
RUNWITH=lua
+EXCERTS=yes
CFLAGS="-fPIC -Wall"
LDFLAGS="-shared"
@@ -64,6 +65,7 @@
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
}
@@ -177,6 +179,9 @@
--runwith=*)
RUNWITH="$value"
;;
+ --no-example-certs)
+ EXCERTS=
+ ;;
*)
echo "Error: Unknown flag: $1"
exit 1
@@ -348,6 +353,7 @@
CXX=$CXX
LD=$LD
RUNWITH=$RUNWITH
+EXCERTS=$EXCERTS
EOF