Merge branch 'sunweaver-pr/nxdialog-autotools' into 3.6.x

Makefile

@@ -170,6 +170,9 @@ build-full: build-env
 	# build nxproxy fifth
 	cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
 
+	# "build" nxdialog last
+	cd nxdialog && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
+
 build:
 	if ! test -d nx-X11; then \
 	    ${MAKE} build-lite; \
@@ -247,6 +250,9 @@ install-full:
 
 	$(MAKE) -C nx-X11/lib install
 
+	# install the nxdialog executable and its man page
+	$(MAKE) -C nxdialog install
+
 uninstall:
 	$(MAKE) uninstall-lite
 	[ ! -d nx-X11 ] || $(MAKE) uninstall-full
@@ -269,3 +275,5 @@ uninstall-full:
 
 	$(RM_DIR_REC) $(DESTDIR)$(NXLIBDIR)
 	$(RM_DIR_REC) $(DESTDIR)$(INCLUDEDIR)/nx
+
+	test -f nxdialog/Makefile && ${MAKE} -C nxdialog "$@"

nxdialog/Makefile.am

+NULL =
+
+SUBDIRS = bin man
+
+ACLOCAL_AMFLAGS = -I m4
+
+MAINTAINERCLEANFILES =			\
+    $(srcdir)/autom4te.cache/*		\
+    $(srcdir)/build-aux/*		\
+    $(srcdir)/Makefile.in		\
+    $(srcdir)/man/Makefile.in		\
+    $(srcdir)/src/Makefile.in		\
+    $(srcdir)/aclocal.m4		\
+    $(srcdir)/config.h.in		\
+    $(srcdir)/config.h.in~		\
+    $(srcdir)/config.guess		\
+    $(srcdir)/config.sub		\
+    $(srcdir)/configure			\
+    $(NULL)
+
+DISTCLEANFILES=$(MAINTAINERCLEANFILES)

nxdialog/README.md

+# NX Dialog Helper Tool
+
+The ``nxdialog`` script can be executed with Python 2.6.x (or higher) and
+Python 3.4.x (or higher) alike.
+
+## Runtime Dependencies
+
+Required Python modules:
+
+  * argparse
+  * gi
+
+Required GIR namespaces:
+
+  * Gtk
+  * Gdk
+  * GdkX11
+
+See the man page for more details.
+
+## License
+
+The ``nxdialog`` script and related files have been licensed under GPLv2+.

nxdialog/VERSION

+../VERSION
\ No newline at end of file

nxdialog/bin/Makefile.am

+NULL =
+
+dist_bin_SCRIPTS = nxdialog

nxdialog/configure.ac

+dnl ***************************************************************************
+dnl *** configure.ac for nxdialog                                           ***
+dnl ***************************************************************************
+
+m4_define([nxdialog_version], m4_esyscmd([tr -d '\n' < VERSION]))
+
+# Initialize Autoconf
+AC_PREREQ(2.60)
+
+AC_INIT([NX Dialog], [nxdialog_version], [https://github.com/ArcticaProject/nx-libs/issues])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_PREFIX_DEFAULT([/usr/local])
+
+AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2])
+
+AC_CONFIG_FILES([
+Makefile
+bin/Makefile
+man/Makefile
+])
+
+AC_OUTPUT

nxdialog/man/Makefile.am

+NULL =
+
+dist_man_MANS =						\
+    nxdialog.1						\
+    $(NULL)

nxdialog/man/nxdialog.1

+'\" -*- coding: utf-8 -*-
+.if \n(.g .ds T< \\FC
+.if \n(.g .ds T> \\F[\n[.fam]]
+.de URL
+\\$2 \(la\\$1\(ra\\$3
+..
+.if \n(.g .mso www.tmac
+.TH nxdialog 1 "Jan 2019" "Version 3.5.99.18" "NX Dialog"
+.SH NAME
+nxdialog \- NX Dialog Helper
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+\fBnxdialog\fR \fI[-h] [--dialog DIALOG_TYPE] [--message TEXT]
+         [--caption CAPTION] [--display DISPLAY] [--parent AGENTPID]
+         [--window WINDOW] [--class DLGCLASS] [--local]
+         [--allowmultiple]\fR
+
+.SH DESCRIPTION
+\fBnxdialog\fR is a GUI helper that can be used with nxagent to provide
+user interaction on certain events inside nxagent. It adds graphical
+widgets (menus, dialog boxes, etc.) to nxagent that allow a smarter user
+interaction with the agent.
+.PP
+\fBnxagent\fR is not using \fBnxdialog\fR by default, set the
+\fI$NX_CLIENT\fR environment variable to make the \fBnxdialog\fR path known to
+\fBnxagent\fR.
+.PP
+If you want to disable \fBnxdialog\fR usage in \fBnxagent\fR, then make
+sure that the \fI$NX_CLIENT\fR environment variable is unset.
+.PP
+.SH COMMAND LINE OPTIONS
+.TP 8
+.B \-h, \-\-help
+Show this help message and exit.
+.TP 8
+.B --dialog DIALOG_TYPE
+Type of dialog to show, one of "yesno", "ok", "error", "panic", "quit", "pulldown", "yesnosuspend".
+.TP 8
+.B --message \fITEXT\fR
+Message text to display in the dialog.
+.TP 8
+.B --caption CAPTION
+Window title of the dialog.
+.TP 8
+.B --display DISPLAY
+X11 display where the dialog should be shown (default: \fI$DISPLAY\fR).
+.TP 8
+.B --parent AGENTPID
+PID of the nxagent. The agent PID can be 0 for testing \fBnxdialog\fR.
+.TP 8
+.B --window WINDOW
+X11 id of window where to embed the pulldown dialog type.
+.TP 8
+.B --class DLGCLASS
+Class of the message (info, warning, error) default: info) [currently unimplemented].
+.TP 8
+.B --local
+Specify that proxy mode is used [currently unimplemented].
+.TP 8
+.B --allowmultiple
+Allow launching more than one dialog with the same message [currently unimplemented].
+
+.SH AUTHOR
+The \fBnxdialog\fR application has been derived from Google's
+NeatX client application by Ulrich Sibiller <uli42@gmx.de>.
+.PP
+This manual has been written by Mike Gabriel
+<mike.gabriel@das\-netzwerkteam.de> for the X2Go Project
+(https://wiki.x2go.org) and the Arctica Project
+(https://arctica-project.org).