require bison to compile Wine
Mike McCormack
mike at codeweavers.com
Mon Mar 15 19:53:50 CST 2004
The new msi changes require that we have two parsers, and thus we use
bison's %pure-parser keyword. yacc does not support this, so we can no
longer use yacc.
Mike
ChangeLog:
* require bison to compile Wine
-------------- next part --------------
Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.255
diff -u -r1.255 configure.ac
--- configure.ac 15 Mar 2004 20:26:42 -0000 1.255
+++ configure.ac 16 Mar 2004 01:06:31 -0000
@@ -63,16 +63,15 @@
AC_SUBST(TOOLSDIR,$wine_cv_toolsdir)
AC_PATH_XTRA
-AC_PROG_YACC
AC_PROG_LEX
-dnl **** Just additional warning checks, since AC_PROG just sets 'yacc' even
-dnl **** without one present.
-AC_CHECK_PROGS(XYACC,$YACC bison yacc,none)
-if test "$XYACC" = "none"
+dnl **** Check bison is present
+AC_CHECK_PROGS(YACC,bison,none)
+if test "$YACC" = "none"
then
- AC_MSG_ERROR([no suitable bison/yacc found. Please install the 'bison' package.])
+ AC_MSG_ERROR([no suitable bison found. Please install the 'bison' package.])
fi
+AC_SUBST(YACC)
AC_CHECK_PROGS(XLEX,$LEX flex lex,none)
if test "$XLEX" = "none"
then
Index: README
===================================================================
RCS file: /home/wine/wine/README,v
retrieving revision 1.43
diff -u -r1.43 README
--- README 26 Nov 2003 03:55:02 -0000 1.43
+++ README 16 Mar 2004 01:06:31 -0000
@@ -81,8 +81,7 @@
Of course you also need "make" (most likely GNU make).
- You also need flex version 2.5 or later and yacc.
- Bison will work as a replacement for yacc. If you are
+ You also need flex version 2.5 or later and bison. If you are
using RedHat or Debian, install the flex and bison packages.
Optional support libraries:
Index: documentation/README.de
===================================================================
RCS file: /home/wine/wine/documentation/README.de,v
retrieving revision 1.2
diff -u -r1.2 README.de
--- documentation/README.de 11 Mar 2004 03:50:24 -0000 1.2
+++ documentation/README.de 16 Mar 2004 01:06:31 -0000
@@ -86,9 +86,9 @@
Natürlich benötigen Sie auch "make" (höchstwahrscheinlich GNU make).
- Des Weiteren benötigen Sie flex in der Version 2.5 oder höher und yacc.
- Bison kann als Ersatz für yacc dienen. Wenn Sie RedHat oder Debian
- benutzen, installieren Sie bitte die flex- und bison-Pakete.
+ Des Weiteren benötigen Sie flex in der Version 2.5 oder höher und bison.
+ Wenn Sie RedHat oder Debian benutzen, installieren Sie bitte die flex-
+ und bison-Pakete.
Optionale Support-Libraries:
Wenn Sie CUPS Drucker-Unterstützung haben wollen, installieren Sie bitte
Index: documentation/README.fr
===================================================================
RCS file: /home/wine/wine/documentation/README.fr,v
retrieving revision 1.8
diff -u -r1.8 README.fr
--- documentation/README.fr 26 Nov 2003 03:55:01 -0000 1.8
+++ documentation/README.fr 16 Mar 2004 01:06:31 -0000
@@ -88,9 +88,8 @@
Évidemment, vous aurez besoin de "make" (très probablement GNU make).
-Vous aurez également besoin de flex version 2.5 ou supérieure et yacc.
-Bison fonctionnera en replacement de yacc. Si vous utilisez RedHat ou Debian,
-installez les paquets flex et bison.
+Vous aurez également besoin de flex version 2.5 ou supérieure et bison.
+Si vous utilisez RedHat ou Debian, installez les paquets flex et bison.
Librairies optionnelles :
Si vous voulez un support d'impression à l'aide de CUPS, SVP installez à la
Index: documentation/README.it
===================================================================
RCS file: /home/wine/wine/documentation/README.it,v
retrieving revision 1.5
diff -u -r1.5 README.it
--- documentation/README.it 20 Jan 2004 21:50:21 -0000 1.5
+++ documentation/README.it 16 Mar 2004 01:06:31 -0000
@@ -86,9 +86,8 @@
Chiaramente è necessario anche "make" (più precisamente GNU make).
-E' necessario anche flex versione 2.5 o successiva e yacc.
-Bison può essere utilizzato al posto di yacc. Se stai usando una RedHat o
-Debian, installa i pacchetti Flex e Bison.
+E' necessario anche flex versione 2.5 o successiva e bison.
+Se stai usando una RedHat o Debian, installa i pacchetti Flex e Bison.
Librerie per supporti opzionali:
Index: documentation/README.pt
===================================================================
RCS file: /home/wine/wine/documentation/README.pt,v
retrieving revision 1.3
diff -u -r1.3 README.pt
--- documentation/README.pt 26 Nov 2003 03:55:01 -0000 1.3
+++ documentation/README.pt 16 Mar 2004 01:06:31 -0000
@@ -94,9 +94,8 @@
Claro que tambm precisas fazer "make" (geralmente como o GNU make).
-Tu também necessitas do flex versao 2.5 ou superior e o yacc.
-Bison irá trabalhar como substituição do yacc. Se estiveres a usar
-RedHat ou Debian, instala os pacotes do flex e do bison.
+Tu também necessitas do flex versao 2.5 ou superior e o bison.
+Se estiveres a usar RedHat ou Debian, instala os pacotes do flex e do bison.
Para o processamento automático dos scripts de teste, tu também irás
precisar do libperl "development header support" (pacote libperl-dev em
Index: documentation/README.pt_br
===================================================================
RCS file: /home/wine/wine/documentation/README.pt_br,v
retrieving revision 1.3
diff -u -r1.3 README.pt_br
--- documentation/README.pt_br 26 Nov 2003 03:55:01 -0000 1.3
+++ documentation/README.pt_br 16 Mar 2004 01:06:31 -0000
@@ -82,9 +82,8 @@
Naturalmente que necessita do "make" (comumente o GNU make).
-Tamném precisa do flex versão 2.5 ou posterior e do yacc.
-O Bison funciona como um substituto do yacc. Se estiver usando
-RedHat ou Debian, instale os pacotes do flex e do bison.
+Tamném precisa do flex versão 2.5 ou posterior e do bison.
+Se estiver usando RedHat ou Debian, instale os pacotes do flex e do bison.
Bibliotecas de suporte opcionais:
Se desejar o suporte de impressão do CUPS, por favor instale os pacotes
More information about the wine-patches
mailing list