Merge 1.0.0 changes back to master.

This commit is contained in:
Nick Couchman 2018-06-07 04:35:11 -04:00
commit 30e90b2425
3 changed files with 3 additions and 3 deletions

View File

@ -105,7 +105,7 @@ error() {
## ##
usage() { usage() {
cat >&2 <<END cat >&2 <<END
guacctl 0.9.14, Apache Guacamole terminal session control utility. guacctl 1.0.0, Apache Guacamole terminal session control utility.
Usage: guacctl [OPTION] [FILE or NAME]... Usage: guacctl [OPTION] [FILE or NAME]...
-d, --download download each of the files listed. -d, --download download each of the files listed.

View File

@ -18,7 +18,7 @@
# #
AC_PREREQ([2.61]) AC_PREREQ([2.61])
AC_INIT([guacamole-server], [0.9.14]) AC_INIT([guacamole-server], [1.0.0])
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])

View File

@ -118,7 +118,7 @@ libguac_la_CFLAGS = \
-Werror -Wall -pedantic -I$(srcdir)/guacamole -Werror -Wall -pedantic -I$(srcdir)/guacamole
libguac_la_LDFLAGS = \ libguac_la_LDFLAGS = \
-version-info 15:0:3 \ -version-info 16:0:0 \
-no-undefined \ -no-undefined \
@CAIRO_LIBS@ \ @CAIRO_LIBS@ \
@DL_LIBS@ \ @DL_LIBS@ \