[netrek-cvs] client/cow configure.in,1.18,1.19

[James Cameron]

Update of /cvsroot/netrek/client/cow
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28931

Modified Files:
	configure.in 
Log Message:
enable XPM in build again

Index: configure.in
===================================================================
RCS file: /cvsroot/netrek/client/cow/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- configure.in	27 Jan 2006 09:57:27 -0000	1.18
+++ configure.in	22 May 2006 13:14:02 -0000	1.19
@@ -199,32 +199,21 @@
 AC_SUBST(NOX11)
 AC_SUBST(NOWIN32)
 
-if test "$code" = cow; then
- if test "$stable" = nope; then
-  SAVELIBS="$LIBS"
-  LIBS="$LIBS $XLIBSWDIR $XLIBSWLIB"
-  SAVEINCS="$INCS"
-  INCS="$INCS $XINCLUDES"
-  AC_CHECK_LIB(Xpm, main, [AC_DEFINE(HAVE_XPM) XPMLIBS="-lXpm"])
-  AC_CHECK_HEADERS(X11/xpm.h)
-  LIBS="$SAVELIBS"
-  INCS="$SAVEINCS"
- fi
-fi
+SAVELIBS="$LIBS"
+LIBS="$LIBS $XLIBSWDIR $XLIBSWLIB"
+SAVEINCS="$INCS"
+INCS="$INCS $XINCLUDES"
+AC_CHECK_LIB(Xpm, main, [AC_DEFINE(HAVE_XPM) XPMLIBS="-lXpm"])
+AC_CHECK_HEADERS(X11/xpm.h)
+LIBS="$SAVELIBS"
+INCS="$SAVEINCS"
 
 # Fix link order for Xpm
 XLIBSW="$XLIBSWDIR $XPMLIBS $XLIBSWLIB"
 
-if test "$code" = server; then
-  AC_SUBST(XINCLUDES)
-  AC_SUBST(XLIBSW)
-  true		# dummy line
-else
-  INCS="$INCS $XINCLUDES"
-  AC_SUBST(INCS)
-  LIBS="$LIBS $XLIBSW"
-fi
-
+INCS="$INCS $XINCLUDES"
+AC_SUBST(INCS)
+LIBS="$LIBS $XLIBSW"
 
 #--------------------------------------------------------------------
 #	Check for gmp and mp