freecraft-nonint.patch

   1 --- freecraft-030226/setup.orig Fri Feb 28 23:46:25 2003
   2 +++ freecraft-030226/setup      Fri Feb 28 23:53:31 2003
   3 @@ -459,7 +459,12 @@
   4    fi
   5    echo
   6    echo -n "Please enter selection: (s) "
   7 -  read $N VIDSEL
   8 +  if [ -n "$WITH_VIDEO" ]; then
   9 +         VIDSEL="$WITH_VIDEO"
  10 +         echo $VIDSEL
  11 +  else
  12 +         read $N VIDSEL
  13 +  fi
  14    echo
  15  fi
  16
  17 @@ -551,7 +556,12 @@
  18
  19  echo
  20  echo -n "Do you want to compile with sound? (y) "
  21 -read $N ANSWER
  22 +if [ -n "$WITH_SOUND" ]; then
  23 +       ANSWER="$WITH_SOUND"
  24 +       echo $ANSWER
  25 +else
  26 +       read $N ANSWER
  27 +fi
  28  echo
  29  case $ANSWER in
  30    [nN])
  31 @@ -572,7 +582,12 @@
  32         else
  33           echo
  34           echo -n "Do you want use arts daemon sound output? (n) "
  35 -         read $N ANSWERA
  36 +         if [ -n "$WITH_SOUND_ARTS" ]; then
  37 +                 ANSWER="$WITH_SOUND_ARTS"
  38 +                 echo $ANSWER
  39 +         else
  40 +                 read $N ANSWERA
  41 +         fi
  42           echo
  43           case $ANSWERA in
  44             [yY])
  45 @@ -595,7 +610,12 @@
  46             echo
  47             echo "Assuming you have a thread-safe X11 (libc6 or glibc),"
  48             echo -n "do you want to compile with threaded sound? (n) "
  49 -           read $N ANSWER2
  50 +           if [ -n "$WITH_THREADEDSOUND" ]; then
  51 +                   ANSWER2="$WITH_THREADEDSOUND"
  52 +                   echo $ANSWER2
  53 +           else
  54 +                   read $N ANSWER2
  55 +           fi
  56             echo
  57             case $ANSWER2 in
  58               [yY])
  59 @@ -618,7 +638,12 @@
  60         LIBCHECK="-lFLAC -lm"; check_for_libs
  61         if test "$?" = 0 ; then
  62         echo -n "Would you like FLAC support? (n) "
  63 -       read $N ANSWER
  64 +       if [ -n "$WITH_FLAC" ]; then
  65 +                ANSWER="$WITH_FLAC"
  66 +                echo $ANSWER
  67 +       else
  68 +               read $N ANSWER
  69 +       fi
  70         echo
  71         case $ANSWER in
  72             [yY])
  73 @@ -638,7 +663,12 @@
  74         LIBCHECK="-lvorbisfile -lvorbis -logg"; check_for_libs
  75         if test "$?" = 0 ; then
  76         echo -n "Would you like OGG support? (n) "
  77 -       read $N ANSWER
  78 +       if [ -n "$WITH_OGG" ]; then
  79 +               ANSWER="$WITH_OGG"
  80 +               echo $ANSWER
  81 +       else
  82 +               read $N ANSWER
  83 +       fi
  84         echo
  85         case $ANSWER in
  86             [yY])
  87 @@ -671,7 +701,12 @@
  88         LIBCHECK="-lmad"; check_for_libs
  89         if test "$?" = 0 ; then
  90         echo -n "Would you like MAD MP3 support? (n) "
  91 -       read $N ANSWER
  92 +       if [ -n "$WITH_MAD" ]; then
  93 +               ANSWER="$WITH_MAD"
  94 +               echo $ANSWER
  95 +       else
  96 +               read $N ANSWER
  97 +       fi
  98         echo
  99         case $ANSWER in
 100             [yY])
 101 @@ -693,7 +728,12 @@
 102         echo -n "or [S]DL "
 103         fi
 104         echo -n "CD Audio support? (n) "
 105 -       read $N CDMode
 106 +       if [ -n "$WITH_CDA" ]; then
 107 +               CDMode="$WITH_CDA"
 108 +               echo $CDMode
 109 +       else
 110 +               read $N CDMode
 111 +       fi
 112         echo
 113         case $CDMode in
 114             [sS])
 115 @@ -777,7 +817,12 @@
 116  fi
 117  echo
 118  echo -n "Please enter selection ($COMPDEF): "
 119 -read $N COMPOPT
 120 +if [ -n "$WITH_COMP" ]; then
 121 +       COMPOPT="$WITH_COMP"
 122 +       echo $COMPOPT
 123 +else
 124 +       read $N COMPOPT
 125 +fi
 126  echo
 127
 128  if test "$COMPOPT x" = " x" ; then COMPOPT=$COMPDEF; fi
 129 @@ -827,7 +872,12 @@
 130      echo "optimization support, which may cause Freecraft to run much slower."
 131      echo
 132      echo -n "Would you like debug support? (n): "
 133 -    read $N DEBUGASK
 134 +    if [ -n $WITH_DEBUG ]; then
 135 +           DEBUGASK=$WITH_DEBUG
 136 +           echo $WITH_DEBUG
 137 +    else
 138 +       read $N DEBUGASK
 139 +    fi
 140      case $DEBUGASK in
 141         [yY])
 142             echo
 143 @@ -848,7 +898,7 @@
 144  CCMINOR=`echo $CCVERS | cut -d. -f 2`
 145  CCREALLYMINOR=`echo $CCVERS | cut -d. -f 3`
 146
 147 -if [ $CCMAJOR -gt 3 -o $CCMAJOR -eq 3 -a $CCMINOR -ge 2 ] ; then
 148 +if false; then
 149  if [ "$DEBUG" != 1 ] ; then
 150      echo
 151      echo "OPTIMIZATION OPTIONS"
 152 @@ -1156,7 +1206,12 @@
 153  echo "Done generating $RULESFILE."
 154  echo
 155  echo -n "Would you like to compile it now? (y) "
 156 -read $N ANSWER
 157 +if [ -n "$WITH_COMPILE" ]; then
 158 +       ANSWER="$WITH_COMPILE"
 159 +       echo $ANSWER
 160 +else
 161 +       read $N ANSWER
 162 +fi
 163  echo
 164
 165  case $ANSWER in