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@