[Mplayer-cvslog] CVS: main Makefile,1.68,1.69 configure,1.168,1.169

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv5392

Modified Files:
	Makefile configure 
Log Message:
add gui support to config scripts, and fixed some warning.

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- Makefile	24 Sep 2001 20:21:53 -0000	1.68
+++ Makefile	27 Sep 2001 17:40:42 -0000	1.69
@@ -23,6 +23,9 @@
 VO_LIBS = -Llibvo -lvo $(MLIB_LIB) $(X_LIBS)
 
 PARTS = mp3lib libac3 libmpeg2 opendivx libavcodec encore libvo libao2 drivers drivers/syncfb
+ifeq ($(GUI),yes)
+PARTS += Gui
+endif
 
 ifneq ($(W32_LIB),)
 PARTS += loader loader/DirectShow
@@ -74,8 +77,13 @@
 encore/libencore.a:
 	$(MAKE) -C encore
 
+Gui/libgui.a:
+	$(MAKE) -C Gui
 
 MPLAYER_DEP = mplayer.o $(OBJS) $(LOADER_DEP) $(AV_DEP) $(COMMONLIBS) 
+ifeq ($(GUI),yes)
+MPLAYER_DEP += Gui/libgui.a
+endif
 mplayerwithoutlink: $(MPLAYER_DEP)	
 	@for a in $(PARTS); do $(MAKE) -C $$a all ; done
 

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- configure	27 Sep 2001 12:23:54 -0000	1.168
+++ configure	27 Sep 2001 17:40:42 -0000	1.169
@@ -1202,23 +1202,17 @@
         _select='#define HAVE_AUDIO_SELECT'
 	;;
   --enable-gui)
-        cat <<EOF
-
-You've tried to enable GUI support.
-
-GUI code was just imported to CVS, and we didn't finished integration yet!
-It's under heavy development, and it isn't trivial how to compile and run.
-Do NOT flood our mailboxes with GUI-related questions and bugreports now!
-We're busy with development, but we know the problems you want to report.
-
-Please wait until we announce it on mplayer-users list and News on homepage.
-
-EOF
-	exit
+  	_gui=yes
+	;;
+  --enable-new-gui)
+  	_gui=yes
 	;;
   --enable-streaming)
   	_streaming=yes
 	;;
+  --enable-divx4)
+  	_divx4linux=yes
+	;;
   --disable-css)
 	_css=no
 	;;
@@ -1325,15 +1319,9 @@
   --disable-divx4)
   	_divx4linux=no
 	;;
-  --enable-divx4)
-  	_divx4linux=yes
-	;;
   --disable-vorbis)
   	_vorbis=no
 	;;
-  --enable-new-gui)
-  	_gui=yes
-	;;
   --with-win32libdir=*)
         _win32libdir=`echo $ac_option | cut -d '=' -f 2`
 	_win32libdirnotify=no
@@ -2192,6 +2180,7 @@
 GTKLIB=$_gtklib
 GLIBLIB=$_gliblib
 GUI_LIBS = $_gui_lib
+GUI=$_gui
 DEBUG=-DDEBUG
 
 EOF