[Mplayer-cvslog] CVS: main configure,1.909,1.910

[Joey Parrish CVS]

CVS change done by Joey Parrish CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv26844

Modified Files:
	configure 
Log Message:
fixed --enable-gif bug


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.909
retrieving revision 1.910
diff -u -r1.909 -r1.910
--- configure	27 Aug 2004 20:43:04 -0000	1.909
+++ configure	5 Sep 2004 17:46:33 -0000	1.910
@@ -3808,6 +3808,14 @@
 
 
 echocheck "GIF support"
+# This is to appease people who want to force gif support.
+# If it is forced to yes, then we still do checks to determine
+# which gif library to use.
+if test "$_gif" = yes ; then
+  _force_gif=yes
+  _gif=auto
+fi
+
 if test "$_gif" = auto ; then
   _gif=no
 cat > $TMPC << EOF
@@ -3831,6 +3839,20 @@
   fi
 fi
 
+# If no library was found, and the user wants support forced,
+# then we force it on with libgif, as this is the safest
+# assumption IMHO.  (libungif & libregif both create symbolic
+# links to libgif.  We also assume that no x11 support is needed,
+# because if you are forcing this, then you _should_ know what
+# you are doing.  [ Besides, package maintainers should never
+# have compiled x11 deps into libungif in the first place. ] )
+# </rant>
+#   --Joey
+if test "$_force_gif" = yes && test "$_gif" = no ; then
+  _gif=yes
+  _ld_gif="-lgif"
+fi
+
 if test "$_gif" = yes ; then
   _def_gif='#define HAVE_GIF 1'
   _vosrc="$_vosrc vo_gif89a.c"