Require bison to compile Wine.

2004-03-16 03:11:39 +00:00 · 2004-03-16 03:11:39 +00:00 · c068f67051
parent a54e3216c3
commit c068f67051
9 changed files with 73 additions and 117 deletions
--- a/Make.rules.in
+++ b/Make.rules.in
@ -25,7 +25,8 @@ CC        = @CC@
 CFLAGS    = @CFLAGS@
 CPPFLAGS  = @CPPFLAGS@
 LIBS      = @LIBS@
-YACC      = @YACC@
+BISON     = @BISON@
+YACC      = $(BISON) -y
 LEX       = @LEX@
 LEXLIB    = @LEXLIB@
 EXEEXT    = @EXEEXT@
@ -103,7 +104,7 @@ prog_manext     = 1
 api_manext      = 3w
 conf_manext     = 5
 CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
-                  *.flc *.spec.c *.spec.def *.dbg.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core
+                  *.flc *.spec.c *.spec.def *.dbg.c *.tab.c *.tab.h @LEX_OUTPUT_ROOT@.c core

 OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS)

--- a/3
+++ b/3
@ -81,8 +81,7 @@ Build tool requirements:

  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:
--- a/141
+++ b/141
@ -311,7 +311,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WIN16_FILES WIN16_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS YACC LEX LEXLIB LEX_OUTPUT_ROOT XYACC XLEX AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS DB2HTML DB2PDF DB2PS DB2TXT LIBPTHREAD JPEGLIB EGREP GIFLIB XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS ft_devel ft_devel2 FREETYPEINCL ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS CAPI4LINUXLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS WINE_BINARIES MAIN_BINARY LDD ALLOCA LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WIN16_FILES WIN16_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS DB2HTML DB2PDF DB2PS DB2TXT LIBPTHREAD JPEGLIB EGREP GIFLIB XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS ft_devel ft_devel2 FREETYPEINCL ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS CAPI4LINUXLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS WINE_BINARIES MAIN_BINARY LDD ALLOCA LIBOBJS LTLIBOBJS'
 ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES'

 # Initialize some variables set by options.
@ -4500,47 +4500,6 @@ fi

 fi

-for ac_prog in 'bison -y' byacc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_YACC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$YACC"; then
-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_YACC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-YACC=$ac_cv_prog_YACC
-if test -n "$YACC"; then
-  echo "$as_me:$LINENO: result: $YACC" >&5
-echo "${ECHO_T}$YACC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="yacc"
-
 for ac_prog in flex lex
 do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
@ -4813,53 +4772,6 @@ fi

 fi

-for ac_prog in $YACC bison yacc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_XYACC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$XYACC"; then
-  ac_cv_prog_XYACC="$XYACC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_XYACC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-XYACC=$ac_cv_prog_XYACC
-if test -n "$XYACC"; then
-  echo "$as_me:$LINENO: result: $XYACC" >&5
-echo "${ECHO_T}$XYACC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$XYACC" && break
-done
-test -n "$XYACC" || XYACC="none"
-
-if test "$XYACC" = "none"
-then
-  { { echo "$as_me:$LINENO: error: no suitable bison/yacc found. Please install the 'bison' package." >&5
-echo "$as_me: error: no suitable bison/yacc found. Please install the 'bison' package." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 for ac_prog in $LEX flex lex
 do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
@ -4908,6 +4820,54 @@ echo "$as_me: error: no suitable lex found. Please install the 'flex' package."
   { (exit 1); exit 1; }; }
 fi

+for ac_prog in bison
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_BISON+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$BISON"; then
+  ac_cv_prog_BISON="$BISON" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_BISON="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+BISON=$ac_cv_prog_BISON
+if test -n "$BISON"; then
+  echo "$as_me:$LINENO: result: $BISON" >&5
+echo "${ECHO_T}$BISON" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$BISON" && break
+done
+test -n "$BISON" || BISON="none"
+
+if test "$BISON" = "none"
+then
+  { { echo "$as_me:$LINENO: error: no suitable bison found. Please install the 'bison' package." >&5
+echo "$as_me: error: no suitable bison found. Please install the 'bison' package." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 if test -n "$ac_tool_prefix"; then
  for ac_prog in gas as
  do
@ -20960,12 +20920,11 @@ s,@X_CFLAGS@,$X_CFLAGS,;t t
 s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
 s,@X_LIBS@,$X_LIBS,;t t
 s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
-s,@YACC@,$YACC,;t t
 s,@LEX@,$LEX,;t t
 s,@LEXLIB@,$LEXLIB,;t t
 s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
-s,@XYACC@,$XYACC,;t t
 s,@XLEX@,$XLEX,;t t
+s,@BISON@,$BISON,;t t
 s,@AS@,$AS,;t t
 s,@ac_ct_AS@,$ac_ct_AS,;t t
 s,@LD@,$LD,;t t
--- a/configure.ac
+++ b/configure.ac
@ -63,22 +63,23 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
 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 **** Just additional warning checks, since AC_PROG just sets 'lex' even
 dnl **** without one present.
-AC_CHECK_PROGS(XYACC,$YACC bison yacc,none)
-if test "$XYACC" = "none"
-then
-  AC_MSG_ERROR([no suitable bison/yacc found. Please install the 'bison' package.])
-fi
 AC_CHECK_PROGS(XLEX,$LEX flex lex,none)
 if test "$XLEX" = "none"
 then
  AC_MSG_ERROR([no suitable lex found. Please install the 'flex' package.])
 fi

+dnl Check for bison
+AC_CHECK_PROGS(BISON,bison,none)
+if test "$BISON" = "none"
+then
+  AC_MSG_ERROR([no suitable bison found. Please install the 'bison' package.])
+fi
+
 AC_CHECK_TOOLS(AS,[gas as],as)
 AC_CHECK_TOOL(LD,ld,ld)
 AC_CHECK_TOOL(AR,ar,ar)
--- a/documentation/README.de
+++ b/documentation/README.de
@ -86,9 +86,9 @@ Vorausgesetzte Build-Tools:

  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
--- a/documentation/README.fr
+++ b/documentation/README.fr
@ -88,9 +88,8 @@ inconnue.

 É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
--- a/documentation/README.it
+++ b/documentation/README.it
@ -86,9 +86,8 @@ dei file. Pgcc al momento non funziona con Wine. La causa di questo problema

 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:

--- a/documentation/README.pt
+++ b/documentation/README.pt
@ -94,9 +94,8 @@ desconhecida.

 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 
--- a/documentation/README.pt_br
+++ b/documentation/README.pt_br
@ -82,9 +82,8 @@ problema

 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