Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mjtrangoni/xserver autotools #947

Open
wants to merge 131 commits into
base: 3.6.x
Choose a base branch
from

Conversation

uli42
Copy link
Member

@uli42 uli42 commented Oct 17, 2020

Another 'bookmark' PR to keep track of this work. This is slightly newer that mjtrangoni's version from #946

sunweaver and others added 30 commits October 20, 2019 00:23
Backport of this commit:

  author	  Julien Cristau <[email protected]>	2009-10-06 16:11:24 +0200
  committer	  Julien Cristau <[email protected]>	2009-10-06 16:12:45 +0200
  commit	  854269d55cdda8caf425515bfed2855e211a5ada (patch)
  tree		  2f485b4e4fa0147682d945cd9ae32d1a72fe593b
  parent	  3bb020587ce74e0737ec7aceb20041f1e77d3b87 (diff)

  configure: quote argument to m4_pattern_forbid
  Without this, configure spits out
  ../configure: line 12364: ac_fn_c_check_member: command not found
  ../configure: line 12378: ac_fn_c_check_type: command not found

  Also anchor the pattern to make it stricter.

  Signed-off-by: Julien Cristau <[email protected]>
there's no pkgconfig because it's included in nxagent
we do not have the corresponding code anymore
nx-X11:
Fix configure.ac checks for xfont2, pixman-1, and tirpc.

travisCI:
* add xfont-utils
* add libxfont1-dev , Ubuntu 16.04 is missing fontutil.h
* Add ghostscript for /usr/bin/ps2pdf

Signed-off-by: Mario Trangoni <[email protected]>
Signed-off-by: Mario Trangoni <[email protected]>
FONT_PATH_ELEMENT_NAME_CONST=0

We should check if we can change the code to make it work with const enabled..

Signed-off-by: Mario Trangoni <[email protected]>
Signed-off-by: Mario Trangoni <[email protected]>
Signed-off-by: Mario Trangoni <[email protected]>
Fixes this error:

  mieq.c: In function ‘mieqProcessInputEvents’:
  mieq.c:162:11: error: ‘DPMSPowerLevel’ undeclared (first use in this function)
    else if (DPMSPowerLevel != DPMSModeOn)
             ^~~~~~~~~~~~~~

Signed-off-by: Mario Trangoni <[email protected]>
Fixes "ResourceName" is unknown

Signed-off-by: Mario Trangoni <[email protected]>
Fixes

error: ‘struct _Pixmap’ has no member named ‘devPrivates’; did you mean ‘devPrivate’?
Signed-off-by: Mario Trangoni <[email protected]>
Fixes
  utils.c: In function ‘ProcessCommandLine’:
  utils.c:804:3: error: ‘nolock’ undeclared (first use in this function); did you mean ‘clock’?
     nolock = TRUE;
     ^~~~~~

Signed-off-by: Mario Trangoni <[email protected]>
mjtrangoni and others added 27 commits October 20, 2019 00:23
Agent.h:113: warning: "NX_TRANS_SOCKET" redefined
 #define NX_TRANS_SOCKET

In file included from ./nxagent-config.h:31,
                 from Args.c:41:
../../include/dix-config.h:540: note: this is the location of the previous definition
 #define NX_TRANS_SOCKET 1
- warning: function declaration isn’t a prototype
- warning: no previous prototype for
"warning: nested extern declaration of ..."
This way the automake tree for nxagent has the same information as all
the other subtrees.

This is just an intermediate approach as buildit.sh should (and will)
be dropped.
There are handled by configure later in the process
They are neither respected anymore not needed anymore. The only use
case was forcing TIRPC usage but this is now handled in configure.
We are now using the VERSION file directly
This is temporary until we find a better solution.
as they are default on unix systems anyway
Ensure we get the libs order in the nxagent binary correctly: first
libX11, then libNX_X11:

readelf -a nxagent | grep NEEDED | grep X11.so

 0x0000000000000001 (NEEDED)             Shared library: [libX11.so.6]
 0x0000000000000001 (NEEDED)             Shared library: [libNX_X11.so.6]

-lX11 is not really necessary but make the pupose clearer.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants