Resolve merge conflict.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

diff --cc src/swig/configure
index eecf01bd4196db60152817dae07d93eb4c3a8f66,42bb2feb5cedce4c77febeecb7420a4405b28926..c3ecd2444d9e0f2d21e4d4f0d86fc8732aa7a370
--- 1/src/swig/configure
--- 2/src/swig/configure
+++ b/src/swig/configure
@@@ -5,9 -5,8 +5,8 @@@ the
        cat << EOF
  SWIG options:
  
-   --enable-swig           - Build the high level language bindings.
 -  --swig-languages=[all | [java | perl | php | python | ruby | tcl]*]
 +  --swig-languages=[all | [java | lua | perl | php | python | ruby | tcl]*]
-                           - Languages to build (default: all)
+                           - High level language bindings (default: none)
  
  EOF
  
@@@ -23,7 -19,11 +19,11 @@@ els
        for i in "$@"
        do
                case $i in
-                       --swig-languages=* ) echo SUBDIRS = ${i#--swig-languages=} > config.mak ;;
+                       --swig-languages=* ) languages=${i#--swig-languages=}
+                               which swig > /dev/null 2>&1
+                               [ $? != 0 ] && echo "Please install swig" && exit 1
 -                              [ $languages = "all" ] && languages="java perl php python ruby tcl"
++                              [ $languages = "all" ] && languages="java lua perl php python ruby tcl"
+                               echo SUBDIRS = ${i#--swig-languages=} > config.mak ;;
                esac
        done
  fi