build nxproxy using autoreconf #473

sunweaver · 2017-06-30T12:16:04Z

This is the first of finally 5 PRs that bring autoreconf build flow into the different parts of nx-libs.

Ionic · 2017-07-06T23:33:56Z

m4/nx-macros.m4

+	]
+)
+
+[xorg_testset_save_]PREFIX[FLAGS]="$PREFIX[FLAGS]"


xorg_[...] instead of nx_[...] here and all the way down.

xorg_[...] instead of nx_[...] here and all the way down.

Yeah, got that.

Ionic · 2017-07-06T23:37:30Z

m4/nx-macros.m4

+
+		PREFIX[FLAGS]="$PREFIX[FLAGS] ]flag["
+
+# Some hackery here since AC_CACHE_VAL can't handle a non-literal varname


Upstream uses dnl instead of # here - the basic difference being that a line preceded by dnl is discarded completely (i.e., won't show up in the generated output), while #-style comments will be included verbatim in the generated output with the shell later on ignoring that line.

Upstream uses dnl instead of # here...

Thanks for the explanation. I wasn't aware of that. I have adapted the nx-macros.m4 file now appropriately, I hope. Having some "#" comments and some dnl comments.

Ionic · 2017-07-06T23:50:04Z

m4/nx-macros.m4

+AC_SUBST([BASE_]PREFIX[FLAGS])
+]) # NX_COMPILER_FLAGS
+
+# Check to see if we're running under Cygwin32.


Probably better to keep these comments as dnl, too.

Probably better to keep these comments as dnl, too.

Done

Ionic · 2017-07-07T00:02:17Z

nxproxy/configure.ac

+m4_define([nxproxy_version], m4_esyscmd([tr -d '\n' < VERSION]))
+
+# Initialize Autoconf
+AC_PREREQ(2.60)


We're raising the autoconf requirement from 2.13 to 2.60 here. Might be totally okay, but might also cause trouble on older distros (like The QVD or @uli42 use.)

> SUSE 11.2 (which is the oldest target distro to build on) has autoconf 2.63. So leaving this.

Ionic · 2017-07-07T00:08:32Z

nxproxy/configure.in

-CXXFLAGS="$CXXFLAGS -DVERSION=\\\"${VERSION}\\\""
-CPPFLAGS="$CPPFLAGS -DVERSION=\\\"${VERSION}\\\""
-
-dnl Check whether --with-symbols or --without-symbols was


We're losing the --with-symbols flag and functionality here. Debian builds by default make use of that.

We're losing the --with-symbols flag and functionality here. Debian builds by default make use of that.

Good catch. And still... If you look at the current build logs, we have "-g" twice in the options string. One stemming from --with-symbols, the other being added by debhelper. So we can drop this one here.

We're losing the --with-symbols...

Removed --with-symbols from CONFIGURE variable in debian/rules now.

Ionic · 2017-07-07T00:19:48Z

nxproxy/man/Makefile.am

@@ -0,0 +1,9 @@
+NULL =
+
+man_MANS =						\


Changing that to dist_man_MANS should better reflect what you are trying to do - and the EXTRA_DIST definition can be also dropped when using dist_man_MANS.

Ionic · 2017-07-07T00:35:23Z

nxproxy/src/Makefile.am

+    -L$(top_srcdir)/../nxcomp/ -lXcomp			\
+    $(NULL)
+
+AM_CFLAGS =						\


AM_CPPFLAGS should be more appropriate.

Ionic · 2017-07-07T00:56:59Z

m4/nx-macros.m4

@@ -0,0 +1,314 @@
+# nx-macros.m4.  Generated from xorg-macros.m4.in xorgversion.m4 by configure.


Do we really have to duplicate X.Org code? Can't we depend upon and use util-macros directly for the few functions that we need? I understand that doing that might be more difficult (for now - at some point we'll have to use util-macros within the X.Org code base anyway) and that copying makes the NX components more independent.

Do we really have to duplicate X.Org code? Can't we depend upon and use util-macros directly for the few functions that we need? I understand that doing that might be more difficult (for now - at some point we'll have to use util-macros within the X.Org code base anyway) and that copying makes the NX components more independent.

Of course, we can use util-marcos directly. Or rather, we could. However, that let's our builds fail on all older platforms where our customers and friends may need nx-libs to build.

sunweaver · 2017-07-10T10:11:59Z

@Ionic: next iteration for #473.

sunweaver · 2017-07-10T10:12:26Z

@Ionic: most of the commits will be flattened into one at the end (except the --with-symbols drop from debian/rules).

Update: Flattened into two commits (the nx-macros.m4 file and changes to nxproxy/). So three commits for this PR with the change to debian/rules.

…configure.in files.

This also solves the last remnant of overlinking as described in GH issue ArcticaProject#133. Fixes ArcticaProject#133.

…ready gets added by debhelper.

Attributes GH PR #473: #473 Fixes: #133

sunweaver requested a review from Ionic June 30, 2017 12:16

sunweaver added enhancement code cleanup labels Jun 30, 2017

sunweaver added this to the 3.6.1.0 milestone Jun 30, 2017

sunweaver force-pushed the pr/nxproxy-autoreconf branch 2 times, most recently from 3df3541 to 4d09a56 Compare June 30, 2017 12:42

This was referenced Jun 30, 2017

build nxcompshad using autoreconf #474

Merged

nx(comp(,shad),proxy) autoconf/automake #446

Closed

Ionic requested changes Jul 7, 2017

View reviewed changes

sunweaver force-pushed the pr/nxproxy-autoreconf branch from 4d09a56 to c9b1e15 Compare July 10, 2017 10:11

sunweaver force-pushed the pr/nxproxy-autoreconf branch from 35731a0 to 06d86a9 Compare July 12, 2017 11:11

Ionic approved these changes Jul 12, 2017

View reviewed changes

sunweaver added 3 commits July 12, 2017 23:25

m4/nx-macros.m4: Add autotools macros derived from X.org and nxcomp* …

322e39b

…configure.in files.

nxproxy: Switch to autoreconf.

41ea54b

This also solves the last remnant of overlinking as described in GH issue ArcticaProject#133. Fixes ArcticaProject#133.

debian/rules: Drop redundant --with-symbols configure option, '-g' al…

397d3ac

…ready gets added by debhelper.

sunweaver force-pushed the pr/nxproxy-autoreconf branch from 06d86a9 to 397d3ac Compare July 12, 2017 21:27

Ionic merged commit 397d3ac into ArcticaProject:3.6.x Jul 12, 2017

Ionic added a commit that referenced this pull request Jul 12, 2017

Merge branch 'sunweaver-pr/nxproxy-autoreconf' into 3.6.x

06bf2a4

Attributes GH PR #473: #473 Fixes: #133

sunweaver mentioned this pull request Dec 14, 2017

Remove install-sh and mkinstalldirs #261

Closed


		PREFIX[FLAGS]="$PREFIX[FLAGS] ]flag["

		# Some hackery here since AC_CACHE_VAL can't handle a non-literal varname

		@@ -0,0 +1,314 @@
		# nx-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.

		@@ -0,0 +1,9 @@
		NULL =

		man_MANS = \

build nxproxy using autoreconf #473

build nxproxy using autoreconf #473

Uh oh!

Conversation

sunweaver commented Jun 30, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sunweaver Jul 10, 2017 • edited by Ionic Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sunweaver commented Jul 10, 2017

Uh oh!

sunweaver commented Jul 10, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

sunweaver Jul 10, 2017 •

edited by Ionic

Loading

sunweaver commented Jul 10, 2017 •

edited

Loading