[Freeciv-Dev] possible client link order fix

[David Pfitzner <dwp@xxxxxxxxxxxxxx>]

On Tue, 26 Jan 1999, Dee Jay Randall <randal@xxxxxxxxxxxxx> wrote:
[IRIX]
>
>   Ok. It's the library order. In 1.7.2, this does not work:
>     -lSM -lICE -lXaw -lXpm -lXmu -lXt -lXext -lX11 -lnls
>
> and this does:
>     -lXaw -lSM -lICE -lXpm -lXmu -lXt -lXext -lX11 -lnls
>
>   Just move the -lXaw in front of both -lSM and -lICE.
>
>   I tried some different orders of Xaw, SM, and ICE to no avail. I
> probably didn't try all the orders though.

On Thu, 28 Jan 1999, Mitch Davis <mjd@xxxxxxxxxx> wrote:

> My understanding is that -lXaw should always be first, and
> I believe -lSM and -lICE should be just before -lX11.

On Wed, 27 Jan 1999, Todd Goodman <tsg1@xxxxxxxxxxxxx> worte:
[Cygwin]
> This is similar to a problem I was having (except my Xt depended on
> ICE and SM so they had to follow Xt on the link line).

On my system, the Makefile generated by Imake produces
the link order: -lXpm -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11
                                                                                
So... based on the above, hopefully the attached patch will 
fix things (without breaking things); on my system (although 
it doesn't matter because I have gcc ld) it links the client
with:
  -L/usr/X11R6/lib -lXaw -lXpm -lXmu -lXt  -lSM -lICE -lXext -lX11

(Run autoconf and re-configure after applying this.)

-- David

diff -u -r --exclude-from exclude_auto freeciv-cvs/configure.in 
freeciv-mod/configure.in
--- freeciv-cvs/configure.in    Sun Feb 14 10:09:05 1999
+++ freeciv-mod/configure.in    Fri Feb 19 21:09:51 1999
@@ -135,12 +135,18 @@
             X_LIBS="$X_LIBS -R $xpm_libdir"
         fi
     fi
+    fc_save_X_LIBS="$X_LIBS"
     X_LIBS="$X_LIBS $X_PRE_LIBS"
 
     dnl Checks for X libs:
     FC_CHECK_X_LIB(X11, XOpenDisplay, , 
         AC_MSG_ERROR(Need X11; perhaps try/adjust --x-libraries))
     FC_CHECK_X_LIB(Xext, XShapeCombineMask)
+
+    dnl Insert X_PRE_LIBS (eg -lSM -lICE) into X_EXTRA_LIBS here:
+    X_EXTRA_LIBS="$X_PRE_LIBS $X_EXTRA_LIBS"
+    X_LIBS="$fc_save_X_LIBS"
+
     FC_CHECK_X_LIB(Xt, main)
     FC_CHECK_X_LIB(Xmu, main)
     FC_CHECK_X_LIB(Xpm, XpmReadFileToPixmap, ,