From e54111cf6f23355b6c9bbb1d955c4c5ca6e01a26 Mon Sep 17 00:00:00 2001 From: "Darryl L. Miles" Date: Wed, 16 Oct 2024 10:23:21 +0100 Subject: [PATCH] configure.in: X11 detection and option order The -L option needs to be placed before the -l it needs to affect. This maybe important on MacOSX where a nonstandard/optional package provides X11 support so the locations are not in system locations. --- scripts/configure.in | 4 +++- scripts/defs.mak.in | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/configure.in b/scripts/configure.in index 704c6080..78a028c5 100644 --- a/scripts/configure.in +++ b/scripts/configure.in @@ -1809,8 +1809,10 @@ AC_SUBST(gr_srcs) AC_SUBST(gr_hsrcs) AC_SUBST(gr_hprog) -AC_SUBST(X_LIBS) AC_SUBST(X_CFLAGS) +AC_SUBST(X_EXTRA_LIBS) +AC_SUBST(X_LIBS) +AC_SUBST(X_PRE_LIBS) AC_SUBST(CPPFLAGS) AC_SUBST(CFLAGS) AC_SUBST(DEPEND_FLAG) diff --git a/scripts/defs.mak.in b/scripts/defs.mak.in index 3cbb6499..db236ac9 100755 --- a/scripts/defs.mak.in +++ b/scripts/defs.mak.in @@ -94,7 +94,7 @@ EXEEXT = @EXEEXT@ GR_CFLAGS = @X_CFLAGS@ @gr_cflags@ GR_DFLAGS = @gr_dflags@ -DNDEBUG -GR_LIBS = @gr_libs@ @X_LIBS@ +GR_LIBS = @X_LIBS@ @X_PRE_LIBS@ @gr_libs@ @X_EXTRA_LIBS@ GR_SRCS = @gr_srcs@ GR_HELPER_SRCS = @gr_hsrcs@ GR_HELPER_PROG = @gr_hprog@