-AC_OUTPUT([Makefile src/Makefile cipher/Makefile
-cipher/blowfish/Makefile doc/Makefile intl/Makefile lib/Makefile
-m4/Makefile po/Makefile.in redhat/Makefile debian/Makefile])
+AC_CACHE_SAVE
+
+dnl These are defined in files in m4/
+tinc_TUNTAP
+tinc_OPENSSL
+tinc_ZLIB
+
+dnl Check if support for jumbograms is requested
+AC_ARG_ENABLE(jumbograms,
+ [ --enable-jumbograms enable support for jumbograms (packets up to 9000 bytes)],
+ [ AC_DEFINE(ENABLE_JUMBOGRAMS) ]
+)
+
+dnl Check if checkpoint tracing has to be enabled
+AC_ARG_ENABLE(tracing,
+ [ --enable-tracing enable checkpoint tracing (debugging only)],
+ [ AC_DEFINE(ENABLE_TRACING) ]
+)
+
+AC_SUBST(INCLUDES)
+
+AC_OUTPUT(Makefile
+src/Makefile
+doc/Makefile
+doc/es/Makefile
+intl/Makefile
+lib/Makefile
+m4/Makefile
+po/Makefile.in
+)