[PATCH] gui/configure.ac

[Kazunobu Kuriyama]

Hi,

Today, I updated GNUstep from the CVS source and found -gui compile
without linking against the ungif library even if there had installed
the library.

Since the ungif library refers to some symbols defined in the X11
library, we need some flags such as -I/usr/X11R6/include and
-L/usr/X11R6/lib -lX11 when building -gui with ungif.

However, configure.ac is not written to accomplish it. As a result,
it cannot detect the existence of ungif correctly, and thus the
resulting -gui won't support ungif images.

Hopefully, the attached patch rectifies this.

(Or is the linking disabled for any reason? If so, forget this,
please.)

- Kazunobu Kuriyama

Index: configure.ac
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/gui/configure.ac,v
retrieving revision 1.16
diff -u -r1.16 configure.ac
--- configure.ac        8 Jan 2004 18:43:49 -0000       1.16
+++ configure.ac        5 Feb 2004 08:11:18 -0000
@@ -191,7 +191,23 @@
   fi
 fi
 
+
+# Since the ungif library refers to some symbols defined in the X11 library,
+# we need to modify some flags here so that the references can be resolved.
+orig_CPPFLAGS="${CPPFLAGS}"
+orig_LDFLAGS="${LDFLAGS}"
+CPPFLAGS="${orig_CPPFLAGS} -I/usr/X11R6/include"
+LDFLAGS="${orig_LDFLAGS} -L/usr/X11R6/lib -lX11"
+
 AC_CHECK_LIB(ungif, DGifOpen)
+
+if test "$ac_cv_lib_ungif_DGifOpen" = yes; then
+  ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS $CPPFLAGS"
+  ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS $LDFLAGS"
+else
+  CPPFLAGS="${orig_CPPFLAGS}"
+  LDFLAGS="${orig_LDFLAGS}"
+fi
 
 
 #--------------------------------------------------------------------