xgps configure.in patch for wraster

[Jeff Teunissen]

Seems a recent change to configure.in broke wraster support (causing
font_cacher to fail the link with undefined reference to RLoadImage, because
the X check is erasing GRAPHIC_xxx). Attached is a patch to fix this (I fixed
it here by moving the X check to be done first).

-- 
| Jeff Teunissen - Pres., Dusk To Dawn Computing - deek at dusknet.dhs.org
| GPG: 1024D/9840105A   7102 808A 7733 C2F3 097B  161B 9222 DAB8 9840 105A
| Core developer, The QuakeForge Project        http://www.quakeforge.net/
| Specializing in Debian GNU/Linux           http://dusknet.dhs.org/~deek/

Index: configure.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/xgps/configure.in,v
retrieving revision 1.5
diff -u -r1.5 configure.in
--- configure.in        2001/03/01 03:44:31     1.5
+++ configure.in        2001/03/03 06:22:03
@@ -32,64 +32,15 @@
 AC_PATH_X
 
 #--------------------------------------------------------------------
-# Look for WindowMaker's wraster library
-#--------------------------------------------------------------------
-SYSTEM_DEFS=
-AC_ARG_WITH(wraster, 
-           [  --with-wraster=PREFIX wraster directory prefix])
-if test "x$with_wraster" = "x"; then
- wprefix=""
-else
- wprefix=${with_wraster}/
-fi
-
-GRAPHIC_LIBS=`${wprefix}get-wraster-flags --libs`
-GRAPHIC_CFLAGS=`${wprefix}get-wraster-flags --cflags`
-GRAPHIC_LFLAGS=`${wprefix}get-wraster-flags --ldflags`
-
-AC_DEFUN(AC_CHECK_WRASTER,
-[dnl
-AC_MSG_CHECKING(for current libwraster support)
-AC_CACHE_VAL(gs_cv_have_wraster,
-[wraster_check_save_header=${CPPFLAGS}
-wraster_check_save_libs=${LIBS}
-CPPFLAGS="$1 $2 ${CPPFLAGS}"
-LIBS="$3 $LIBS"
-
-# Check for RFillImage which is only in version 2.0 or libwraster
-AC_CHECK_LIB(wraster, RFillImage, gs_cv_have_wraster=yes, 
gs_cv_have_wraster=no)
-if test "$gs_cv_have_wraster" = yes; then
-  AC_CHECK_HEADERS(wraster.h, gs_cv_have_wraster=yes, gs_cv_have_wraster=no)
-fi
-CPPFLAGS="${wraster_check_save_header}"
-LIBS="${wraster_check_save_libs}"
-])
-AC_MSG_RESULT($gs_cv_have_wraster)
-])
-
-AC_CHECK_WRASTER(${GRAPHIC_CFLAGS}, ${GRAPHIC_LFLAGS}, ${GRAPHIC_LIBS})
-if test $gs_cv_have_wraster = yes; then
-  SYSTEM_DEFS="-DHAVE_WRASTER_H $SYSTEM_DEFS"
-else
-  GRAPHIC_LIBS=
-  GRAPHIC_CFLAGS=
-  GRAPHIC_LFLAGS=
-fi
-
-AC_SUBST(GRAPHIC_LIBS)
-AC_SUBST(GRAPHIC_CFLAGS)
-AC_SUBST(GRAPHIC_LFLAGS)
-AC_SUBST(SYSTEM_DEFS)
-
-#--------------------------------------------------------------------
 # Find for X windows
 #--------------------------------------------------------------------
 # If the user specifically set x_include/x_libs, then assume we're
 # using a special X system and discard any previous GRAPHIC_flags
 set_x_paths=no
-if test $gs_cv_have_wraster = no -o $x_includes != NONE; then
+if test $x_includes != NONE; then
   set_x_paths=yes
 fi
+
 AC_PATH_XTRA
 
 if test $set_x_paths = yes; then
@@ -113,6 +64,11 @@
 fi
 AC_SUBST(X_PRE_LIBS)
 
+if test "$ac_x_includes" != ""; then
+  CPPFLAGS="$CPPFLAGS -I$ac_x_includes"
+fi
+AC_CHECK_HEADER(X11/extensions/XShm.h, AC_DEFINE(XSHM))
+
 #--------------------------------------------------------------------
 # Find for JPEG
 #--------------------------------------------------------------------
@@ -230,11 +186,55 @@
   AC_CHECK_TIFFLIB(${with_tiff_library}, ${with_tiff_include})
 fi
 
+#--------------------------------------------------------------------
+# Look for WindowMaker's wraster library
+#--------------------------------------------------------------------
+SYSTEM_DEFS=
+AC_ARG_WITH(wraster, 
+           [  --with-wraster=PREFIX wraster directory prefix])
+if test "x$with_wraster" = "x"; then
+ wprefix=""
+else
+ wprefix=${with_wraster}/
+fi
 
-if test "$ac_x_includes" != ""; then
-  CPPFLAGS="$CPPFLAGS -I$ac_x_includes"
+GRAPHIC_LIBS=`${wprefix}get-wraster-flags --libs`
+GRAPHIC_CFLAGS=`${wprefix}get-wraster-flags --cflags`
+GRAPHIC_LFLAGS=`${wprefix}get-wraster-flags --ldflags`
+
+AC_DEFUN(AC_CHECK_WRASTER,
+[dnl
+AC_MSG_CHECKING(for current libwraster support)
+AC_CACHE_VAL(gs_cv_have_wraster,
+[wraster_check_save_header=${CPPFLAGS}
+wraster_check_save_libs=${LIBS}
+CPPFLAGS="$1 $2 ${CPPFLAGS}"
+LIBS="$3 $LIBS"
+
+# Check for RFillImage which is only in version 2.0 or libwraster
+AC_CHECK_LIB(wraster, RFillImage, gs_cv_have_wraster=yes, 
gs_cv_have_wraster=no)
+if test "$gs_cv_have_wraster" = yes; then
+  AC_CHECK_HEADERS(wraster.h, gs_cv_have_wraster=yes, gs_cv_have_wraster=no)
 fi
-AC_CHECK_HEADER(X11/extensions/XShm.h, AC_DEFINE(XSHM))
+CPPFLAGS="${wraster_check_save_header}"
+LIBS="${wraster_check_save_libs}"
+])
+AC_MSG_RESULT($gs_cv_have_wraster)
+])
+
+AC_CHECK_WRASTER(${GRAPHIC_CFLAGS}, ${GRAPHIC_LFLAGS}, ${GRAPHIC_LIBS})
+if test $gs_cv_have_wraster = yes; then
+  SYSTEM_DEFS="-DHAVE_WRASTER_H $SYSTEM_DEFS"
+else
+  GRAPHIC_LIBS=
+  GRAPHIC_CFLAGS=
+  GRAPHIC_LFLAGS=
+fi
+
+AC_SUBST(GRAPHIC_LIBS)
+AC_SUBST(GRAPHIC_CFLAGS)
+AC_SUBST(GRAPHIC_LFLAGS)
+AC_SUBST(SYSTEM_DEFS)
 
 AC_OUTPUT(config.h xgps.make)