projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 9ad581c950d7542486b6eda25c838b34bc858a16..1705745d794c01f7192ab42625a68736cc09e1b8 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-184,6
+184,12
@@
else
HAVE_GOOGLE_KEY="no"
fi
HAVE_GOOGLE_KEY="no"
fi
+AC_ARG_ENABLE(faketime, AS_HELP_STRING([--enable-faketime],
+ [Use faketime program to ensure pdf files are reproducible (default=no)]),
+ [FAKETIME=$enableval], [FAKETIME=no])
+
+AM_CONDITIONAL(FAKETIME, [test x$FAKETIME = xyes])
+
AC_SUBST(GOOGLEKEY)
AC_PROG_CC
AC_SUBST(GOOGLEKEY)
AC_PROG_CC
@@
-519,6
+525,7
@@
AC_OUTPUT([
Makefile
src/Makedefs
src/chaoskey-v1.0/org.altusmetrum.ChaosKey.metainfo.xml
Makefile
src/Makedefs
src/chaoskey-v1.0/org.altusmetrum.ChaosKey.metainfo.xml
+doc/Makefile
altoslib/Makefile
altoslib/AltosVersion.java
icon/Makefile
altoslib/Makefile
altoslib/AltosVersion.java
icon/Makefile
@@
-564,6
+571,9
@@
ao-tools/ao-usbtrng/Makefile
ao-tools/ao-chaosread/Makefile
ao-tools/ao-makebin/Makefile
ao-utils/Makefile
ao-tools/ao-chaosread/Makefile
ao-tools/ao-makebin/Makefile
ao-utils/Makefile
+map-server/Makefile
+map-server/altos-mapd/Makefile
+map-server/altos-map/Makefile
src/Version
])
src/Version
])