Skip to content

Commit

Permalink
Install bash_completion rule and (optionally) UFW firewall profile
Browse files Browse the repository at this point in the history
  • Loading branch information
keithw committed May 23, 2012
1 parent eda4808 commit a7818c6
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 1 deletion.
9 changes: 9 additions & 0 deletions conf/Makefile.am
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,9 @@
nobase_dist_sysconf_DATA =

if INSTALL_UFW
nobase_dist_sysconf_DATA += ufw/applications.d/mosh
endif

if INSTALL_COMPLETION
nobase_dist_sysconf_DATA += bash_completion.d/mosh
endif
1 change: 1 addition & 0 deletions conf/bash_completion.d/mosh
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1 @@
complete -F _known_hosts mosh
4 changes: 4 additions & 0 deletions conf/ufw/applications.d/mosh
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,4 @@
[mosh]
title=Mosh (mobile shell)
description=Mobile shell that supports roaming and intelligent local echo
ports=60000:61000/udp
15 changes: 14 additions & 1 deletion configure.ac
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ AC_ARG_ENABLE([server],
AM_CONDITIONAL([BUILD_SERVER], [test x"$build_server" != xno]) AM_CONDITIONAL([BUILD_SERVER], [test x"$build_server" != xno])


AC_ARG_ENABLE([tests], AC_ARG_ENABLE([tests],
[AS_HELP_STRING([--enable-tests], [Build tests])], [AS_HELP_STRING([--enable-tests], [Build tests @<:@no@:>@])],
[build_tests="$enableval"], [build_tests="$enableval"],
[build_tests="no"]) [build_tests="no"])
AM_CONDITIONAL([BUILD_TESTS], [test x"$build_tests" != xno]) AM_CONDITIONAL([BUILD_TESTS], [test x"$build_tests" != xno])
Expand All @@ -146,6 +146,18 @@ AC_ARG_ENABLE([examples],
[build_examples="no"]) [build_examples="no"])
AM_CONDITIONAL([BUILD_EXAMPLES], [test x"$build_examples" != xno]) AM_CONDITIONAL([BUILD_EXAMPLES], [test x"$build_examples" != xno])


AC_ARG_ENABLE([ufw],
[AS_HELP_STRING([--enable-ufw], [Install firewall profile for ufw (Uncomplicated Firewall) @<:@no@:>@])],
[install_ufw="$enableval"],
[install_ufw="no"])
AM_CONDITIONAL([INSTALL_UFW], [test x"$install_ufw" != xno])

AC_ARG_ENABLE([completion],
[AS_HELP_STRING([--enable-completion], [Install bash_completion rule @<:@yes@:>@])],
[install_completion="$enableval"],
[install_completion="yes"])
AM_CONDITIONAL([INSTALL_COMPLETION], [test x"$install_completion" != xno])

# Checks for libraries. # Checks for libraries.
AC_ARG_WITH([utempter], AC_ARG_WITH([utempter],
[AS_HELP_STRING([--with-utempter], [write utmp entries using libutempter @<:@check@:>@])], [AS_HELP_STRING([--with-utempter], [write utmp entries using libutempter @<:@check@:>@])],
Expand Down Expand Up @@ -286,5 +298,6 @@ AC_CONFIG_FILES([
src/examples/Makefile src/examples/Makefile
src/tests/Makefile src/tests/Makefile
man/Makefile man/Makefile
conf/Makefile
]) ])
AC_OUTPUT AC_OUTPUT
1 change: 1 addition & 0 deletions debian/rules
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=-stackprotector
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- \ dh_auto_configure -- \
--disable-silent-rules \ --disable-silent-rules \
--enable-ufw \
--enable-compile-warnings=error --enable-compile-warnings=error

0 comments on commit a7818c6

Please sign in to comment.