Small setup patches

[Peter Kuemmel]

Hello,

here are two small patches for the setup process.

1. workaround for the linking problem (disabling 310 extension):

replace in /src/qt.pro
VERSION		= 3.1.0
with
!win32-msvc:VERSION	= 3.1.0
win32-msvc:VERSION	=



2. on the fly compiling of configure.bat:

Index: configure.bat
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/Attic/configure.bat,v
retrieving revision 1.1.2.5
diff -u -b -B -r1.1.2.5 configure.bat
--- configure.bat	30 Jun 2004 07:38:20 -0000	1.1.2.5
+++ configure.bat	4 Jul 2004 00:33:01 -0000
@@ -1,10 +1,12 @@
  :: does not work yet
  ::cd configure_exe
  ::nmake -f Makefile.link_includes
-::nmake -f Makefile.configure
-::cd ..
  bin\link_includes %*

+cd configure_exe
+nmake -f Makefile.configure
+cd ..
+
  :: error in Makefile ??
  mkdir qmake\tmp

Index: configure_exe/Makefile.configure
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/configure_exe/Attic/Makefile.configure,v
retrieving revision 1.1.2.2
diff -u -b -B -r1.1.2.2 Makefile.configure
--- configure_exe/Makefile.configure	29 Jun 2004 14:56:19 -0000	1.1.2.2
+++ configure_exe/Makefile.configure	4 Jul 2004 00:33:01 -0000
@@ -16,13 +16,13 @@
  CXXFLAGS	=	-nologo -Zm200 -O1  -DUNICODE -DQT_NO_TEXTCODEC 
-DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL 
-DQT_NO_COMPRESS -DHAVE_QCONFIG_CPP
  LEXFLAGS	=
  YACCFLAGS	=-d
-INCPATH	=	 -I"." -I"..\include" -I"..\include\private" 
-I"C:\cygwin_1_3\home\Habacker\src\extern\cvs.kde-cygwin.sf.net\qt3.1-win32-msvc\configure_exe" 
-I"C:\cygwin_1_3\home\Habacker\src\extern\cvs.kde-cygwin.sf.net\qt3.1-win32-msvc\mkspecs\win32-msvc"
+INCPATH	=	 -I"." -I"..\include" -I"..\include\private" 
-I"..\configure_exe" -I"..\mkspecs\win32-msvc"
  LINK	=	link
  LFLAGS	=	/NOLOGO delayimp.lib /DELAYLOAD:comdlg32.dll 
/DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll 
/DELAYLOAD:winspool.dll /SUBSYSTEM:console /incremental:no
  LIBS	=	 "ole32.lib" "uuid.lib"
-MOC		= 
C:\cygwin_1_3\home\Habacker\src\extern\cvs.kde-cygwin.sf.net\qt3.1-win32-msvc\bin\moc.exe
-UIC		= 
C:\cygwin_1_3\home\Habacker\src\extern\cvs.kde-cygwin.sf.net\qt3.1-win32-msvc\bin\uic.exe 
-L 
C:\cygwin_1_3\home\Habacker\src\extern\cvs.kde-cygwin.sf.net\qt3.1-win32-msvc\plugins
-QMAKE		= 
C:\cygwin_1_3\home\Habacker\src\extern\cvs.kde-cygwin.sf.net\qt3.1-win32-msvc\bin\qmake.exe
+MOC		=	..\bin\moc.exe
+UIC		=	..\bin\uic.exe -L ..\plugins
+QMAKE		=	..\bin\qmake.exe
  IDC		=	$(QTDIR)\bin\idc.exe
  IDL		=	midl
  ZIP		=	zip -r -9
@@ -211,7 +211,7 @@

  ####### Build rules

-all: Makefile $(TARGET)
+all: "..\bin\configure.exe" $(TARGET)

  $(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC)
  	$(LINK) $(LFLAGS) /OUT:$(TARGET) @<<
@@ -222,13 +222,13 @@
  mocables: $(SRCMOC)
  uicables: $(UICIMPLS) $(UICDECLS)

-Makefile: configure.pro ..\.qmake.cache 
C:\cygwin_1_3\home\Habacker\src\extern\cvs.kde-cygwin.sf.net\qt3.1-win32-msvc\mkspecs\win32-msvc\qmake.conf 

+Makefile: configure.pro ..\.qmake.cache ..\mkspecs\win32-msvc\qmake.conf
  	$(QMAKE) -spec win32-msvc -o Makefile configure.pro
  qmake:
  	@$(QMAKE) -spec win32-msvc -o Makefile configure.pro

  dist:
-	$(ZIP) configure.zip $(SOURCES) $(HEADERS) $(DIST) $(FORMS) 
C:/cygwin_1_3/home/Habacker/src/extern/cvs.kde-cygwin.sf.net/qt3.1-win32-msvc/configure_exe/configure.pro 

+	$(ZIP) configure.zip $(SOURCES) $(HEADERS) $(DIST) $(FORMS) 
../configure_exe/configure.pro

  uiclean:
  mocclean: