]> granicus.if.org Git - graphviz/commitdiff
fixes for ruby change from ruby-1.9.pc to ruby.pc
authorJohn Ellson <ellson@research.att.com>
Wed, 23 Jan 2013 19:26:34 +0000 (14:26 -0500)
committerJohn Ellson <ellson@research.att.com>
Wed, 23 Jan 2013 19:26:34 +0000 (14:26 -0500)
configure.ac

index 409cf6f862eddd8af631fa133fbc8bb5d1479935..279fc809a8eb71e0bba284f551d344c4a30ea64a 100644 (file)
@@ -182,8 +182,8 @@ AC_SUBST([EXTRA_SMYRNA_LDFLAGS])
 AC_DEFINE_UNQUOTED(DEFAULT_FONTPATH,"$DEFAULT_FONTPATH",[Path to TrueType fonts.])
 AC_DEFINE_UNQUOTED(PATHSEPARATOR,"$PATHSEPARATOR",[Path separator character.])
 AC_DEFINE_UNQUOTED(NO_POSTSCRIPT_ALIAS,$NO_POSTSCRIPT_ALIAS,[Postscript fontnames.])
-AM_CONDITIONAL(WITH_WIN32, [test "x$UWIN" = "xyes" -o "x$CYGWIN" = "xyes" -o "x$MINGW32" = "xyes"])
-AM_CONDITIONAL(WITH_DARWIN9, [test "x$DARWIN9" = "xyes"])
+AM_CONDITIONAL(WITH_WIN32, [test "x$UWIN" == "xyes" -o "x$CYGWIN" == "xyes" -o "x$MINGW32" == "xyes"])
+AM_CONDITIONAL(WITH_DARWIN9, [test "x$DARWIN9" == "xyes"])
 
 DEFAULT_DPI=96
 AC_DEFINE_UNQUOTED(DEFAULT_DPI,$DEFAULT_DPI,Default DPI.)
@@ -205,7 +205,7 @@ if ! `cmp -s $srcdir/ast_common.h.in ast_common.h`; then
 fi
 
 AC_PREFIX_DEFAULT([/usr/local])
-if test "x${prefix}" = "xNONE"; then
+if test "x${prefix}" == "xNONE"; then
        prefix=${ac_default_prefix}
        AC_SUBST([prefix])
 fi
@@ -226,14 +226,14 @@ dnl -----------------------------------
 
 AC_ARG_ENABLE(static,
         [AS_HELP_STRING([--enable-static],[build static executable])])
-if test "x$enable_static" = "xyes"; then
+if test "x$enable_static" == "xyes"; then
        AC_ENABLE_STATIC
         use_static="Yes"
 else
        AC_DISABLE_STATIC
         use_static="No (disabled by default)"
 fi
-AM_CONDITIONAL(ENABLE_STATIC, [test "x$enable_static" = "xyes"])
+AM_CONDITIONAL(ENABLE_STATIC, [test "x$enable_static" == "xyes"])
 
 AC_ARG_ENABLE(shared,
         [AS_HELP_STRING([--enable-shared],[build shared executable])])
@@ -250,7 +250,7 @@ else
         use_shared="No (disabled)"
        AC_DISABLE_SHARED
 fi
-AM_CONDITIONAL(ENABLE_SHARED, [test "x$enable_shared" = "xyes"])
+AM_CONDITIONAL(ENABLE_SHARED, [test "x$enable_shared" == "xyes"])
 
 dnl -----------------------------------
 dnl checks for various programs
@@ -278,9 +278,9 @@ AC_ARG_WITH(tclsh,
   [AS_HELP_STRING([--with-tclsh=PROG],[use a specific tclsh])],
   TCLSH=$withval,)
 
-if test "x$TCLSH" = "x"; then
+if test "x$TCLSH" == "x"; then
   AC_PATH_PROGS(TCLSH,[tclsh8.6 tclsh8.5 tclsh8.4 tclsh8.3 tclsh])
-#  if test "x$TCLSH" = "x"; then
+#  if test "x$TCLSH" == "x"; then
 #    AC_MSG_ERROR([Unable to find a tclsh. Tclsh is a required program for building graphviz, independent of wether tcl-based graphviz products are built])
 #    use_tcl="No (tclsh unavailable)"
 #  fi
@@ -366,8 +366,8 @@ if `echo ${CFLAGS} | $EGREP ffast-math >/dev/null`; then
     AC_DEFINE_UNQUOTED(NO_FPERR,1,[Define if no fpu error exception handling is required.])
 fi
 
-AM_CONDITIONAL(RC_IS_RC, [test "x$RC" = "xrc"])
-AM_CONDITIONAL(RC_IS_WINDRES, [test "x$RC" = "xwindres"])
+AM_CONDITIONAL(RC_IS_RC, [test "x$RC" == "xrc"])
+AM_CONDITIONAL(RC_IS_WINDRES, [test "x$RC" == "xwindres"])
 
 dnl -----------------------------------
 dnl Check for various typedefs and provide substitutes if they do not exist.
@@ -409,7 +409,7 @@ changequote([,]),[
     #endif
     ], ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no)])
 AC_MSG_RESULT($ac_cv_type_socklen_t)
-if test $ac_cv_type_socklen_t = no; then
+if test $ac_cv_type_socklen_t == no; then
     AC_DEFINE(socklen_t, unsigned, [Define to unsigned if socklet_t is missing])
 fi
 
@@ -421,7 +421,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
     #include <stdbool.h>
     #endif
     ]], [[
-    bool foo = true, bar = false;
+    bool foo==true, bar=false;
     ]])],[
 AC_MSG_RESULT(yes)
 AC_DEFINE(HAVE_BOOL, 1,[Define to 1 if compiler supports bool])
@@ -503,7 +503,7 @@ if test "x$enable_ltdl" != "xno"; then
     LDFLAGS="$save_LDFLAGS"
     CFLAGS="$save_CFLAGS"
   else
-    if test "x$DARWIN9" = "xyes"; then
+    if test "x$DARWIN9" == "xyes"; then
       LIBLTDL_LDFLAGS="-Wl,-unexported_symbol,_lt_*"
     fi
   fi
@@ -539,7 +539,7 @@ dnl ElectricFence support for debugging
 AC_ARG_WITH(efence,
    [AS_HELP_STRING([--with-efence=no],[use efence for debugging memory use])],
    [],[with_efence=no])
-if test "x$with_efence" = "xyes"; then
+if test "x$with_efence" == "xyes"; then
        LIBS="$LIBS -lefence"
 fi
 
@@ -547,7 +547,7 @@ dnl -----------------------------------
 dnl Checks for X header files.
 
 AC_PATH_XTRA
-if test "x$no_x" = "xyes"; then
+if test "x$no_x" == "xyes"; then
   use_xlib="No (disabled or unavailable)"
   AC_MSG_WARN([X11 not available.])
   X_SUBDIRS=""
@@ -557,8 +557,8 @@ else
 #  PKG_CHECK_MODULES(X11, [x11])
   PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no")
 fi
-AM_CONDITIONAL(WITH_X, [test "x$use_xlib" = "xYes"])
-AM_CONDITIONAL(WITH_XRENDER, [test "x$,HAVE_XRENDER" = "xyes"])
+AM_CONDITIONAL(WITH_X, [test "x$use_xlib" == "xYes"])
+AM_CONDITIONAL(WITH_XRENDER, [test "x$,HAVE_XRENDER" == "xyes"])
 
 dnl -----------------------------------
 dnl check for SWIG - needed for script-language bindings
@@ -571,7 +571,7 @@ if test "x$enable_swig" != "xyes"; then
   use_swig="No (disabled)"
 else
   AC_CHECK_PROG(SWIG,swig,swig)
-  if test "x$SWIG" = "x"; then
+  if test "x$SWIG" == "x"; then
     use_swig="No (swig not available)"
   else
     SWIG_VERSION=`$SWIG -version 2>&1 | $EGREP Version | cut -d ' ' -f 3`
@@ -586,7 +586,7 @@ else
         fi
       fi
     fi
-    if test "x$SWIG" = "x"; then
+    if test "x$SWIG" == "x"; then
       AC_MSG_WARN([The version of swig is too old.])
       use_swig="No (swig too old)"
     else
@@ -609,11 +609,11 @@ else
   if test "x$use_swig" != "xYes"; then
     use_sharp="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-csharp *- Generate'` = 0; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-csharp *- Generate'` == 0; then
       use_sharp="No (swig does not support -csharp option)"
     else
       AC_CHECK_PROG(MCS,mcs,mcs)
-      if test "x$MCS" = "x"; then
+      if test "x$MCS" == "x"; then
         use_sharp="No (mcs not available)"
       else
         use_sharp="Yes"
@@ -625,7 +625,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_SHARP, [test "x$use_sharp" = "xYes"])
+AM_CONDITIONAL(WITH_SHARP, [test "x$use_sharp" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GO
@@ -640,11 +640,11 @@ else
   if test "x$use_swig" != "xYes"; then
     use_go="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-go* *- Generate'` = 0 ; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-go* *- Generate'` == 0 ; then
       use_go="No (swig does not support -go option)"
     else
       AC_CHECK_PROG(GO,6g,8g)
-      if test "x$GO" = "x"; then
+      if test "x$GO" == "x"; then
         use_go="No (GO compiler not available)"
       else
         GO_INCLUDES=
@@ -669,7 +669,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_GO, [test "x$use_go" = "xYes"])
+AM_CONDITIONAL(WITH_GO, [test "x$use_go" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GUILE
@@ -684,11 +684,11 @@ else
   if test "x$use_swig" != "xYes"; then
     use_guile="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-guile *- Generate'` = 0; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-guile *- Generate'` == 0; then
       use_guile="No (swig does not support -guile option)"
     else
       AC_CHECK_PROG(GUILE,guile,guile)
-      if test "x$GUILE" = "x"; then
+      if test "x$GUILE" == "x"; then
         use_guile="No (guile not available)"
       else
         [GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`]
@@ -703,7 +703,7 @@ else
             fi
           fi
         fi
-        if test "x$GUILE" = "x"; then
+        if test "x$GUILE" == "x"; then
          use_guile="No (guile is too old)"
         else
           GUILE_INCLUDES=
@@ -733,7 +733,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_GUILE, [test "x$use_guile" = "xYes"])
+AM_CONDITIONAL(WITH_GUILE, [test "x$use_guile" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for IO   (disbled until supported by swig)
@@ -748,11 +748,11 @@ else
   if test "x$use_swig" != "xYes"; then
     use_io="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-io *- Generate'` = 0; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-io *- Generate'` == 0; then
       use_io="No (swig does not support -io option)"
     else
       AC_CHECK_PROG(IO,io,io)
-      if test "x$IO" = "x"; then
+      if test "x$IO" == "x"; then
         use_io="No (io not available)"
       else
         use_io="Yes"
@@ -764,7 +764,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_IO, [test "x$use_io" = "xYes"])
+AM_CONDITIONAL(WITH_IO, [test "x$use_io" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for JAVA
@@ -779,11 +779,11 @@ else
   if test "x$use_swig" != "xYes"; then
     use_java="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-java *- Generate'` = 0; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-java *- Generate'` == 0; then
       use_java="No (swig does not support -java option)"
     else
       AC_CHECK_PROG(JAVA,java,java)
-      if test "x$JAVA" = "x"; then
+      if test "x$JAVA" == "x"; then
         use_java="No (java not available)"
       else
         for try_java_include in \
@@ -823,7 +823,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_JAVA, [test "x$use_java" = "xYes"])
+AM_CONDITIONAL(WITH_JAVA, [test "x$use_java" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for LUA
@@ -838,11 +838,11 @@ else
   if test "x$use_swig" != "xYes"; then
     use_lua="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-lua *- Generate'` = 0; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-lua *- Generate'` == 0; then
       use_lua="No (swig does not support -lua option)"
     else
       AC_CHECK_PROG(LUA,lua,lua)
-      if test "x$LUA" = "x"; then
+      if test "x$LUA" == "x"; then
         use_lua="No (lua not available)"
       else
         ac_save_CPPFLAGS="$CPPFLAGS"
@@ -863,7 +863,7 @@ else
            LDFLAGS="$LDFLAGS -L$lua_lib"
         fi
     
-        if test "x$LUA_INCLUDES" = "x" -a "x$LUA_LIBS" = "x" ; then
+        if test "x$LUA_INCLUDES" == "x" -a "x$LUA_LIBS" == "x" ; then
             PKGCONFIG=""
             AC_CHECK_PROGS(PKGCONFIG, pkg-config)
             if test "x$PKGCONFIG" != "x"; then
@@ -871,14 +871,14 @@ else
                echo
                for l in "$lua_suffix" "" "51" "5.1" "50" "5.0" ; do
                    pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null`
-                   if test "x$?" = "x0" ; then
+                   if test "x$?" == "x0" ; then
                        LUA_VERSION=`$PKGCONFIG --modversion lua$l`
                         LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
                         LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
                        LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKGCONFIG --variable=V lua`"
     
                        pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
-                       if test  "x$?" = "x0"; then
+                       if test  "x$?" == "x0"; then
                           LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lualib$l`
                           LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lualib$l`
                        fi
@@ -888,7 +888,7 @@ else
             fi
         fi
     
-        if test "x$LUA_INCLUDES" = "x" -o "x$LUA_LIBS" = "x" ; then
+        if test "x$LUA_INCLUDES" == "x" -o "x$LUA_LIBS" == "x" ; then
             LUACONFIG=""
             AC_CHECK_PROGS(LUACONFIG, lua-config lua-config51 lua-config5.1 lua-config50 lua-config5.0)
             if test "x$LUACONFIG" != "x" ; then
@@ -901,17 +901,17 @@ else
             fi
         fi
     
-        if test "x$LUA_INCLUDES" = "x" -o "x$LUA_LIBS" = "x" ; then
+        if test "x$LUA_INCLUDES" == "x" -o "x$LUA_LIBS" == "x" ; then
             AC_MSG_CHECKING(for Lua headers and libraries)
            echo
             AC_CHECK_HEADER(lua.h,ac_found_lua_header="yes",ac_found_lua_header="no")
             AC_CHECK_HEADER(lualib.h,ac_found_liblua_header="yes",ac_found_liblua_header="no")
-            if test "x$ac_found_lua_header" = "xyes" -a "x$ac_found_liblua_header" = "xyes"; then
+            if test "x$ac_found_lua_header" == "xyes" -a "x$ac_found_liblua_header" == "xyes"; then
                 LUA_INCLUDES="$CFLAGS"
             fi
             for l in "$lua_suffix" "" "51" "5.1" "50" "5.0" ; do
                 AC_CHECK_LIB(lua$l,lua_call,ac_found_lua_lib="yes",ac_found_lua_lib="no")
-                if test "x$ac_found_lua_lib" = "xyes" ; then
+                if test "x$ac_found_lua_lib" == "xyes" ; then
                    LUA_VERSION=">=5.1.0"
     
                    LUA_LIBS="$LDFLAGS -llua$l -lm"
@@ -924,7 +924,7 @@ else
                    fi
     
                    AC_CHECK_LIB(lualib$l,luaL_openlib,ac_found_liblua_lib="yes",ac_found_liblua_lib="no")
-                   if test "x$ac_found_liblua_lib" = "xyes" ; then
+                   if test "x$ac_found_liblua_lib" == "xyes" ; then
                       LUA_VERSION="5.0.x"
     
                       LUA_LIBS="$LUA_LFLAGS -llualib$l"
@@ -963,7 +963,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_LUA, [test "x$use_lua" = "xYes"])
+AM_CONDITIONAL(WITH_LUA, [test "x$use_lua" == "xYes"])
 
 
 dnl -----------------------------------
@@ -979,11 +979,11 @@ else
   if test "x$use_swig" != "xYes"; then
     use_ocaml="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-ocaml *- Generate'` = 0; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-ocaml *- Generate'` == 0; then
       use_ocaml="No (swig does not support -ocaml option)"
     else
       AC_CHECK_PROG(OCAML,ocaml,ocaml)
-      if test "x$OCAML" = "x"; then
+      if test "x$OCAML" == "x"; then
         use_ocaml="No (ocaml not available)"
       else
         AC_CHECK_PROG(OCAML_OPT,ocamlopt,ocamlopt)
@@ -1004,7 +1004,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_OCAML, [test "x$use_ocaml" = "xYes"])
+AM_CONDITIONAL(WITH_OCAML, [test "x$use_ocaml" == "xYes"])
 AM_CONDITIONAL(WITH_OCAMLOPT, [test "x$OCAML_OPT" != "x"])
 
 dnl -----------------------------------
@@ -1020,11 +1020,11 @@ else
   if test "x$use_swig" != "xYes"; then
     use_perl="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-perl *- Generate'` = 0; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-perl *- Generate'` == 0; then
       use_perl="No (swig does not support -perl option)"
     else
       AC_CHECK_PROG(PERL,perl,perl)
-      if test "x$PERL" = "x"; then
+      if test "x$PERL" == "x"; then
         use_perl="No (perl not available)"
       else
         if test $PERL -e 'exit !($] <= 5.004)' > /dev/null 2>&1 ; then
@@ -1059,7 +1059,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_PERL, [test "x$use_perl" = "xYes"])
+AM_CONDITIONAL(WITH_PERL, [test "x$use_perl" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for PHP
@@ -1074,11 +1074,11 @@ else
   if test "x$use_swig" != "xYes"; then
     use_php="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-php5* *- Generate'` = 0 ; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-php5* *- Generate'` == 0 ; then
       use_php="No (swig does not support -php or -php5 option)"
     else
       AC_CHECK_PROGS(PHP,php5 php)
-      if test "x$PHP" = "x"; then
+      if test "x$PHP" == "x"; then
         use_php="No (php not available)"
       else
         if test -d /usr/include/php5; then
@@ -1107,7 +1107,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_PHP, [test "x$use_php" = "xYes"])
+AM_CONDITIONAL(WITH_PHP, [test "x$use_php" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for PYTHON
@@ -1122,15 +1122,15 @@ else
   if test "x$use_swig" != "xYes"; then
     use_python="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` = 0; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` == 0; then
       use_python="No (swig does not support -python option)"
     else
       AC_CHECK_PROG(PYTHON,python,python)
-      if test "x$PYTHON" = "x"; then
+      if test "x$PYTHON" == "x"; then
         use_python="No (python not available)"
       else
         PYTHON_VERSION=`$PYTHON -V 2>&1 | $EGREP Python | cut -d ' ' -f 2`
-        if test "x$PYTHON_VERSION" = "x"; then
+        if test "x$PYTHON_VERSION" == "x"; then
           PYTHON=
         else
           PYTHON_VERSION_MAJOR=`echo $PYTHON_VERSION | cut -d '.' -f 1`
@@ -1147,7 +1147,7 @@ else
           fi
         fi
       fi
-      if test "x$PYTHON" = "x"; then
+      if test "x$PYTHON" == "x"; then
        use_python="No (python is too old)"
       else
         PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
@@ -1171,7 +1171,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_PYTHON, [test "x$use_python" = "xYes"])
+AM_CONDITIONAL(WITH_PYTHON, [test "x$use_python" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for PYTHON23
@@ -1186,15 +1186,15 @@ else
   if test "x$use_swig" != "xYes"; then
     use_python23="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` = 0; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` == 0; then
       use_python23="No (swig does not support -python option)"
     else
       AC_CHECK_PROG(PYTHON23,python2.3,python2.3)
-      if test "x$PYTHON23" = "x"; then
+      if test "x$PYTHON23" == "x"; then
         use_python23="No (python23 not available)"
       else
         PYTHON23_VERSION=`$PYTHON23 -V 2>&1 | $EGREP Python | cut -d ' ' -f 2`
-        if test "x$PYTHON23_VERSION" = "x"; then
+        if test "x$PYTHON23_VERSION" == "x"; then
           PYTHON23=
         else
           PYTHON23_VERSION_MAJOR=`echo $PYTHON23_VERSION | cut -d '.' -f 1`
@@ -1211,7 +1211,7 @@ else
           fi
         fi
       fi
-      if test "x$PYTHON23" = "x"; then
+      if test "x$PYTHON23" == "x"; then
        use_python23="No (python2.3 is too old)"
       else
         PYTHON23_PREFIX=`$PYTHON23 -c "import sys; print sys.prefix"`
@@ -1235,7 +1235,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_PYTHON23, [test "x$use_python23" = "xYes"])
+AM_CONDITIONAL(WITH_PYTHON23, [test "x$use_python23" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for PYTHON24
@@ -1250,15 +1250,15 @@ else
   if test "x$use_swig" != "xYes"; then
     use_python24="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` = 0; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` == 0; then
       use_python24="No (swig does not support -python option)"
     else
       AC_CHECK_PROG(PYTHON24,python2.4,python2.4)
-      if test "x$PYTHON24" = "x"; then
+      if test "x$PYTHON24" == "x"; then
         use_python24="No (python24 not available)"
       else
         PYTHON24_VERSION=`$PYTHON24 -V 2>&1 | $EGREP Python | cut -d ' ' -f 2`
-        if test "x$PYTHON24_VERSION" = "x"; then
+        if test "x$PYTHON24_VERSION" == "x"; then
           PYTHON24=
         else
           PYTHON24_VERSION_MAJOR=`echo $PYTHON24_VERSION | cut -d '.' -f 1`
@@ -1275,7 +1275,7 @@ else
           fi
         fi
       fi
-      if test "x$PYTHON24" = "x"; then
+      if test "x$PYTHON24" == "x"; then
        use_python24="No (python2.4 is too old)"
       else
         PYTHON24_PREFIX=`$PYTHON24 -c "import sys; print sys.prefix"`
@@ -1299,7 +1299,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_PYTHON24, [test "x$use_python24" = "xYes"])
+AM_CONDITIONAL(WITH_PYTHON24, [test "x$use_python24" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for PYTHON25
@@ -1314,15 +1314,15 @@ else
   if test "x$use_swig" != "xYes"; then
     use_python25="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` = 0; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` == 0; then
       use_python25="No (swig does not support -python option)"
     else
       AC_CHECK_PROG(PYTHON25,python2.5,python2.5)
-      if test "x$PYTHON25" = "x"; then
+      if test "x$PYTHON25" == "x"; then
         use_python25="No (python25 not available)"
       else
         PYTHON25_VERSION=`$PYTHON25 -V 2>&1 | $EGREP Python | cut -d ' ' -f 2`
-        if test "x$PYTHON25_VERSION" = "x"; then
+        if test "x$PYTHON25_VERSION" == "x"; then
           PYTHON25=
         else
           PYTHON25_VERSION_MAJOR=`echo $PYTHON25_VERSION | cut -d '.' -f 1`
@@ -1339,7 +1339,7 @@ else
           fi
         fi
       fi
-      if test "x$PYTHON25" = "x"; then
+      if test "x$PYTHON25" == "x"; then
        use_python25="No (python2.5 is too old)"
       else
         PYTHON25_PREFIX=`$PYTHON25 -c "import sys; print sys.prefix"`
@@ -1363,7 +1363,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_PYTHON25, [test "x$use_python25" = "xYes"])
+AM_CONDITIONAL(WITH_PYTHON25, [test "x$use_python25" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for PYTHON26
@@ -1378,15 +1378,15 @@ else
   if test "x$use_swig" != "xYes"; then
     use_python26="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` = 0; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` == 0; then
       use_python26="No (swig does not support -python option)"
     else
       AC_CHECK_PROG(PYTHON26,python2.6,python2.6)
-      if test "x$PYTHON26" = "x"; then
+      if test "x$PYTHON26" == "x"; then
         use_python26="No (python26 not available)"
       else
         PYTHON26_VERSION=`$PYTHON26 -V 2>&1 | $EGREP Python | cut -d ' ' -f 2`
-        if test "x$PYTHON26_VERSION" = "x"; then
+        if test "x$PYTHON26_VERSION" == "x"; then
           PYTHON26=
         else
           PYTHON26_VERSION_MAJOR=`echo $PYTHON26_VERSION | cut -d '.' -f 1`
@@ -1403,7 +1403,7 @@ else
           fi
         fi
       fi
-      if test "x$PYTHON26" = "x"; then
+      if test "x$PYTHON26" == "x"; then
        use_python26="No (python2.6 is too old)"
       else
         PYTHON26_PREFIX=`$PYTHON26 -c "import sys; print sys.prefix"`
@@ -1427,7 +1427,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_PYTHON26, [test "x$use_python26" = "xYes"])
+AM_CONDITIONAL(WITH_PYTHON26, [test "x$use_python26" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for PYTHON27
@@ -1442,15 +1442,15 @@ else
   if test "x$use_swig" != "xYes"; then
     use_python27="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` = 0; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` == 0; then
       use_python27="No (swig does not support -python option)"
     else
       AC_CHECK_PROG(PYTHON27,python2.7,python2.7)
-      if test "x$PYTHON27" = "x"; then
+      if test "x$PYTHON27" == "x"; then
         use_python27="No (python27 not available)"
       else
         PYTHON27_VERSION=`$PYTHON27 -V 2>&1 | $EGREP Python | cut -d ' ' -f 2`
-        if test "x$PYTHON27_VERSION" = "x"; then
+        if test "x$PYTHON27_VERSION" == "x"; then
           PYTHON27=
         else
           PYTHON27_VERSION_MAJOR=`echo $PYTHON27_VERSION | cut -d '.' -f 1`
@@ -1467,7 +1467,7 @@ else
           fi
         fi
       fi
-      if test "x$PYTHON27" = "x"; then
+      if test "x$PYTHON27" == "x"; then
        use_python27="No (python2.7 is too old)"
       else
         PYTHON27_PREFIX=`$PYTHON27 -c "import sys; print sys.prefix"`
@@ -1491,7 +1491,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_PYTHON27, [test "x$use_python27" = "xYes"])
+AM_CONDITIONAL(WITH_PYTHON27, [test "x$use_python27" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for R
@@ -1506,7 +1506,7 @@ else
   if test "x$use_swig" != "xYes"; then
     use_r="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-r *- Generate'` = 0; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-r *- Generate'` == 0; then
       use_r="No (swig does not support -r option)"
     else
       PKG_CHECK_MODULES(R, [libR],[
@@ -1519,7 +1519,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_R, [test "x$use_r" = "xYes"])
+AM_CONDITIONAL(WITH_R, [test "x$use_r" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for RUBY
@@ -1534,39 +1534,48 @@ else
   if test "x$use_swig" != "xYes"; then
     use_ruby="No (swig not available)"
   else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-ruby *- Generate'` = 0; then
+    if test `$SWIG -help 2>&1 | $EGREP -c '\-ruby *- Generate'` == 0; then
       use_ruby="No (swig does not support -ruby option)"
     else
-      PKG_CHECK_MODULES(RUBY, [ruby-1.9],[
+      PKG_CHECK_MODULES(RUBY, [ruby],[
        AC_CHECK_PROG(RUBY,ruby,ruby)
-        if test "x$RUBY" = "x"; then
+        if test "x$RUBY" == "x"; then
           use_ruby="No (ruby not available)"
         else
           RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`"
        fi
       ],[
-        AC_CHECK_PROG(RUBY,ruby,ruby)
-        if test "x$RUBY" = "x"; then
-         use_ruby="No (ruby not available)"
-        else
-          RUBY_CFLAGS="-I`$RUBY $srcdir/config/config_ruby.rb archdir`"
-         # hack for powerpc-darwin8 (10.4)
-         if test "x$DARWIN" = "xyes"; then
-           RUBY_CFLAGS=`echo $RUBY_CFLAGS | sed 's/powerpc/universal/'`
-         fi
-          RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG[['LIBRUBYARG_SHARED']]\"`"
-          RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`"
-         if test "x$RUBY_INSTALL_DIR" = "x"; then
-               RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb sitearchdir`"
+        PKG_CHECK_MODULES(RUBY, [ruby-1.9],[
+         AC_CHECK_PROG(RUBY,ruby,ruby)
+          if test "x$RUBY" == "x"; then
+            use_ruby="No (ruby not available)"
+          else
+            RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`"
          fi
-          save_CPPFLAGS=$CPPFLAGS
-          CPPFLAGS="$CPPFLAGS $RUBY_CFLAGS"
-          AC_CHECK_HEADER(ruby.h,,[
-            use_ruby="No (missing header)"
-            RUBY=
-          ])
-          CPPFLAGS=$save_CPPFLAGS
-        fi
+        ],[
+          AC_CHECK_PROG(RUBY,ruby,ruby)
+          if test "x$RUBY" == "x"; then
+           use_ruby="No (ruby not available)"
+          else
+            RUBY_CFLAGS="-I`$RUBY $srcdir/config/config_ruby.rb archdir`"
+           # hack for powerpc-darwin8 (10.4)
+           if test "x$DARWIN" == "xyes"; then
+             RUBY_CFLAGS=`echo $RUBY_CFLAGS | sed 's/powerpc/universal/'`
+           fi
+            RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG[['LIBRUBYARG_SHARED']]\"`"
+            RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`"
+           if test "x$RUBY_INSTALL_DIR" == "x"; then
+                 RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb sitearchdir`"
+           fi
+            save_CPPFLAGS=$CPPFLAGS
+            CPPFLAGS="$CPPFLAGS $RUBY_CFLAGS"
+            AC_CHECK_HEADER(ruby.h,,[
+              use_ruby="No (missing header)"
+              RUBY=
+            ])
+            CPPFLAGS=$save_CPPFLAGS
+          fi
+        ])
       ])
       if test "x$RUBY" != "x"; then
        use_ruby="Yes"
@@ -1577,7 +1586,7 @@ else
     fi
   fi
 fi
-AM_CONDITIONAL(WITH_RUBY, [test "x$use_ruby" = "xYes"])
+AM_CONDITIONAL(WITH_RUBY, [test "x$use_ruby" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for TCL
@@ -1590,7 +1599,7 @@ if test "x$enable_tcl" != "xyes"; then
   use_tcl="No (disabled)"
 fi
 
-if test "x$use_tcl" = "x"; then
+if test "x$use_tcl" == "x"; then
   TCL_VERSION_FOUND=`echo 'puts [[info tclversion]]' | $TCLSH`
 
   # can't assume ksh on all architectures
@@ -1618,7 +1627,7 @@ if test "x$use_tcl" = "x"; then
   CPPFLAGS=$save_CPPFLAGS
 fi
 
-if test "x$use_tcl" = "x"; then
+if test "x$use_tcl" == "x"; then
   # Some systems don't have Tcl.  Don't build
   # the Tcl products if we don't have the library.
   if test -f ${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}/tclConfig.sh; then
@@ -1643,9 +1652,9 @@ if test "x$use_tcl" = "x"; then
   TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}"
 fi
 
-if test "x$use_tcl" = "x"; then
+if test "x$use_tcl" == "x"; then
   # TCL STUBS support is required
-  if test "x${TCL_SUPPORTS_STUBS}" = "x1"; then
+  if test "x${TCL_SUPPORTS_STUBS}" == "x1"; then
     use_tcl="Yes"
     TCL_CFLAGS="${TCL_CFLAGS} -DUSE_TCL_STUBS"
     AC_DEFINE_UNQUOTED(HAVE_TCL,1,
@@ -1658,7 +1667,7 @@ fi
 
 AC_SUBST([TCL_INSTALL_DIR])
 
-AM_CONDITIONAL(WITH_TCL, [test "x$use_tcl" = "xYes"])
+AM_CONDITIONAL(WITH_TCL, [test "x$use_tcl" == "xYes"])
 
 #AC_SUBST([TCLSH_EXEC_PREFIX])
 AC_SUBST([TCL_VERSION])
@@ -1721,20 +1730,20 @@ if test "x$use_tcl" != "xYes"; then
     use_tk="No (no tcl)"
 fi
 
-if test "x$use_tk" = "x"; then
+if test "x$use_tk" == "x"; then
     AC_ARG_WITH(wish,
         [AS_HELP_STRING([--with-wish=PROG],[use a specific wish])],
         WISH=$withval,)
-    if test "x$WISH" = "x"; then
+    if test "x$WISH" == "x"; then
         AC_PATH_PROGS(WISH,[wish8.6 wish8.5 wish8.4 wish8.3 wish])
-        if test "x$WISH" = "x"; then
+        if test "x$WISH" == "x"; then
             AC_MSG_WARN([Unable to find a wish. The Tk packages will not be built])
             use_tk="No (wish not found)"
     fi
     fi
 fi
 
-if test "x$use_tk" = "x"; then
+if test "x$use_tk" == "x"; then
     #TK_VERSION_FOUND=`echo 'puts [[info tkversion]]' | $WISH`
     #
     # No such var as tkversion.  Use tclversion instead.
@@ -1765,7 +1774,7 @@ if test "x$use_tk" = "x"; then
     CPPFLAGS=$save_CPPFLAGS
 fi
 
-if test "x$use_tk" = "x"; then
+if test "x$use_tk" == "x"; then
     # Some systems don't have Tcl.  Don't build
     # Some systems have Tcl, but not Tk.  Don't build
     # the Tk products if we don't have the library.
@@ -1790,16 +1799,16 @@ if test "x$use_tk" = "x"; then
     fi
 fi
                                                                                 
-if test "x$use_tk" = "x"; then
+if test "x$use_tk" == "x"; then
     use_tk="Yes"
     TK_SUBDIRS="tkstubs tkspline"
 else
     TK_SUBDIRS=""
 fi
-AM_CONDITIONAL(WITH_TK, [test "x$use_tk" = "xYes"])
+AM_CONDITIONAL(WITH_TK, [test "x$use_tk" == "xYes"])
 
 # NB. No TK_SUPPORTS_STUBS set by tkConfig.sh
-if test "${TCL_SUPPORTS_STUBS}" = "1"; then
+if test "${TCL_SUPPORTS_STUBS}" == "1"; then
     TK_CFLAGS="${TK_CFLAGS} -DUSE_TK_STUBS"
 fi
 
@@ -1845,10 +1854,10 @@ save_LIBS=$LIBS
 LIBS=
 tk_checkBoth=0
 AC_CHECK_FUNC(connect, tk_checkSocket=0, tk_checkSocket=1)
-if test "$tk_checkSocket" = 1; then
+if test "$tk_checkSocket" == 1; then
   AC_CHECK_LIB(socket, main, LIBS="$LIBS -lsocket", tk_checkBoth=1)
 fi
-if test "$tk_checkBoth" = 1; then
+if test "$tk_checkBoth" == 1; then
   tk_oldLibs=$LIBS
   LIBS="$LIBS -lsocket -lnsl"
   AC_CHECK_FUNC(accept, tk_checkNsl=0, [LIBS=$tk_oldLibs])
@@ -1907,7 +1916,7 @@ else
   LDFLAGS=$save_LDFLAGS
   CPPFLAGS=$save_CPPFLAGS
 fi
-if test "x$use_expat" = "x"; then
+if test "x$use_expat" == "x"; then
   use_expat="Yes"
   AC_DEFINE_UNQUOTED(HAVE_EXPAT,1,
     [Define if you have the expat library])
@@ -1950,7 +1959,7 @@ else
   LDFLAGS=$save_LDFLAGS
   CPPFLAGS=$save_CPPFLAGS
 fi
-if test "x$use_devil" = "x"; then
+if test "x$use_devil" == "x"; then
   use_devil="Yes"
   AC_DEFINE_UNQUOTED(HAVE_DEVIL,1,
     [Define if you have the DevIL library])
@@ -1958,7 +1967,7 @@ if test "x$use_devil" = "x"; then
   AC_SUBST([DEVIL_LIBS])
 fi
 
-AM_CONDITIONAL(WITH_DEVIL, [test "x$use_devil" = "xYes"])
+AM_CONDITIONAL(WITH_DEVIL, [test "x$use_devil" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for XPM
@@ -2024,7 +2033,7 @@ CPPFLAGS=$save_CPPFLAGS
 AC_SUBST([XAW_INCLUDES])
 AC_SUBST([XAW_LIBS])
 AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" != "xno"])
-if test "x$with_xaw" = "xno"; then
+if test "x$with_xaw" == "xno"; then
     if test "x$no_x" != "xyes"; then
        AC_MSG_WARN(Lefty cannot be built)
     fi
@@ -2077,7 +2086,7 @@ else
     use_webp="No (webp library not available)"
   ])
 fi
-AM_CONDITIONAL(WITH_WEBP, [test "x$use_webp" = "xYes"])
+AM_CONDITIONAL(WITH_WEBP, [test "x$use_webp" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for RSVG
@@ -2099,7 +2108,7 @@ else
     use_rsvg="No (rsvg library not available)"
   ])
 fi
-AM_CONDITIONAL(WITH_RSVG, [test "x$use_rsvg" = "xYes"])
+AM_CONDITIONAL(WITH_RSVG, [test "x$use_rsvg" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GHOSTSCRIPT
@@ -2115,9 +2124,9 @@ else
     use_ghostscript="No (missing Xrender)"
   else
       AC_CHECK_HEADER(ghostscript/iapi.h, GS_CFLAGS="",use_ghostscript="No (missing headers)")
-      if test "x$use_ghostscript" = "x"; then
+      if test "x$use_ghostscript" == "x"; then
         AC_CHECK_LIB(gs, main, GS_LIBS="-lgs", use_ghostscript="No (missing lib)")
-        if test "x$use_ghostscript" = "x"; then
+        if test "x$use_ghostscript" == "x"; then
           use_ghostscript="Yes"
           AC_DEFINE_UNQUOTED(HAVE_GS,1,
             [Define if you have the gs library])
@@ -2127,7 +2136,7 @@ else
      fi
   fi
 fi
-AM_CONDITIONAL(WITH_GS, [test "x$use_ghostscript" = "xYes"])
+AM_CONDITIONAL(WITH_GS, [test "x$use_ghostscript" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for VISIO
@@ -2140,9 +2149,9 @@ if test "x$with_visio" != "xyes"; then
   use_visio="No (disabled by default - experimental)"
 else
 #  AC_CHECK_HEADER(visio/visio.h, VISIO_CFLAGS="",use_visio="No (missing headers)")
-#  if test "x$use_visio" = "x"; then
+#  if test "x$use_visio" == "x"; then
 #    AC_CHECK_LIB(visio, main, VISIO_LIBS="-lgs", use_visio="No (missing lib)")
-#    if test "x$use_visio" = "x"; then
+#    if test "x$use_visio" == "x"; then
       use_visio="Yes"
       AC_DEFINE_UNQUOTED(HAVE_VISIO,1,
         [Define if you have the visio library])
@@ -2151,7 +2160,7 @@ else
 #    fi
 #  fi
 fi
-AM_CONDITIONAL(WITH_VISIO, [test "x$use_visio" = "xYes"])
+AM_CONDITIONAL(WITH_VISIO, [test "x$use_visio" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for PANGO, CAIRO et.al.
@@ -2174,10 +2183,10 @@ else
     use_pangocairo="No (pangocairo library not available)"
   ])
 fi
-AM_CONDITIONAL(WITH_PANGOCAIRO, [test "x$use_pangocairo" = "xYes"])
+AM_CONDITIONAL(WITH_PANGOCAIRO, [test "x$use_pangocairo" == "xYes"])
 
 # see if pango uses a fontconfig/freetype2 backend
-if test "x$use_pangocairo" = "xYes"; then
+if test "x$use_pangocairo" == "xYes"; then
     save_LIBS=$LIBS
     PKG_CHECK_MODULES(PANGOFT2, [pangoft2])
     LIBS="$LIBS $PANGOCAIRO_LIBS $PANGOFT2_LIBS"
@@ -2205,7 +2214,7 @@ else
     use_lasi="No (lasi library not available)"
   ])
 fi
-AM_CONDITIONAL(WITH_LASI, [test "x$use_lasi" = "xYes"])
+AM_CONDITIONAL(WITH_LASI, [test "x$use_lasi" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GLITZ
@@ -2227,7 +2236,7 @@ else
     use_glitz="No (glitz library not available)"
   ])
 fi
-AM_CONDITIONAL(WITH_GLITZ, [test "x$use_glitz" = "xYes"])
+AM_CONDITIONAL(WITH_GLITZ, [test "x$use_glitz" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for FREETYPE2
@@ -2247,8 +2256,8 @@ else
 fi
 
 # pkgconfig for freetype2 did not exist in redhat[78]
-if test "x$use_freetype" = "x"; then
-    if test "x$FREETYPE_DIR" = "xyes"; then
+if test "x$use_freetype" == "x"; then
+    if test "x$FREETYPE_DIR" == "xyes"; then
        AC_PATH_PROG(FREETYPE_CONFIG,freetype-config)
     else
        AC_PATH_PROG(FREETYPE_CONFIG,freetype-config,,[$FREETYPE_DIR/bin:$PATH])
@@ -2268,12 +2277,12 @@ if test "x$use_freetype" = "x"; then
     fi
 fi
 
-if test "x$use_freetype" = "xYes"; then
+if test "x$use_freetype" == "xYes"; then
   AC_DEFINE_UNQUOTED(HAVE_FREETYPE2,1,[Define if you have the freetype2 library])
   AC_SUBST([FREETYPE2_CFLAGS])
   AC_SUBST([FREETYPE2_LIBS])
 fi
-AM_CONDITIONAL(WITH_FREETYPE2, [test "x$ue_freetype" = "xYes"])
+AM_CONDITIONAL(WITH_FREETYPE2, [test "x$ue_freetype" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for FONTCONFIG
@@ -2293,8 +2302,8 @@ else
 fi
 
 # just in case pkgconfig for fontconfig does not exist
-if test "x$use_fontconfig" = "x"; then
-    if test "x$FONTCONFIG_DIR" = "xyes"; then
+if test "x$use_fontconfig" == "x"; then
+    if test "x$FONTCONFIG_DIR" == "xyes"; then
        AC_PATH_PROG(FONTCONFIG_CONFIG,fontconfig-config)
     else
        AC_PATH_PROG(FONTCONFIG_CONFIG,fontconfig-config,,[$FONTCONFIG_DIR/bin:$PATH])
@@ -2314,12 +2323,12 @@ if test "x$use_fontconfig" = "x"; then
     fi
 fi
 
-if test "x$use_fontconfig" = "xYes"; then
+if test "x$use_fontconfig" == "xYes"; then
   AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG,1,[Define if you have the fontconfig library])
   AC_SUBST([FONTCONFIG_CFLAGS])
   AC_SUBST([FONTCONFIG_LIBS])
 fi
-AM_CONDITIONAL(WITH_FONTCONFIG, [test "x$use_fontconfig" = "xYes"])
+AM_CONDITIONAL(WITH_FONTCONFIG, [test "x$use_fontconfig" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GDK_PIXBUF.
@@ -2341,7 +2350,7 @@ else
     use_gdk_pixbuf="No (gdk_pixbuf library not available)"
   ])
 fi
-AM_CONDITIONAL(WITH_GDK_PIXBUF, [test "x$use_gdk_pixbuf" = "xYes"])
+AM_CONDITIONAL(WITH_GDK_PIXBUF, [test "x$use_gdk_pixbuf" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GTK.
@@ -2363,7 +2372,7 @@ else
     use_gtk="No (gtk library not available)"
   ])
 fi
-AM_CONDITIONAL(WITH_GTK, [test "x$use_gtk" = "xYes"])
+AM_CONDITIONAL(WITH_GTK, [test "x$use_gtk" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GTKGL.
@@ -2385,7 +2394,7 @@ else
     use_gtkgl="No (gtkgl library not available)"
   ])
 fi
-AM_CONDITIONAL(WITH_GTKGL, [test "x$use_gtkgl" = "xYes"])
+AM_CONDITIONAL(WITH_GTKGL, [test "x$use_gtkgl" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GTKGLEXT.
@@ -2407,7 +2416,7 @@ else
     use_gtkglext="No (gtkglext library not available)"
   ])
 fi
-AM_CONDITIONAL(WITH_GTKGLEXT, [test "x$use_gtkglext" = "xYes"])
+AM_CONDITIONAL(WITH_GTKGLEXT, [test "x$use_gtkglext" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GTS.
@@ -2429,7 +2438,7 @@ else
     use_gts="No (gts library not available)"
   ])
 fi
-AM_CONDITIONAL(WITH_GTS, [test "x$use_gts" = "xYes"])
+AM_CONDITIONAL(WITH_GTS, [test "x$use_gts" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GLADE.
@@ -2451,7 +2460,7 @@ else
     use_glade="No (glade library not available)"
   ])
 fi
-AM_CONDITIONAL(WITH_GLADE, [test "x$use_glade" = "xYes"])
+AM_CONDITIONAL(WITH_GLADE, [test "x$use_glade" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for MING (SWF renderer)
@@ -2473,7 +2482,7 @@ else
     use_ming="No (ming library not available)"
   ])
 fi
-AM_CONDITIONAL(WITH_MING, [test "x$use_ming" = "xYes"])
+AM_CONDITIONAL(WITH_MING, [test "x$use_ming" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for QT
@@ -2501,7 +2510,7 @@ else
     use_qt="No (qmake not found)"
   fi
 fi
-AM_CONDITIONAL(WITH_QT, [test "x$use_qt" = "xYes"])
+AM_CONDITIONAL(WITH_QT, [test "x$use_qt" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for QUARTZ 
@@ -2524,7 +2533,7 @@ else
     use_quartz="No (missing ApplicationServices.framework)"
   fi
 fi
-AM_CONDITIONAL(WITH_QUARTZ, [test "x$use_quartz" = "xYes"])
+AM_CONDITIONAL(WITH_QUARTZ, [test "x$use_quartz" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for PLATFORMSDK
@@ -2565,7 +2574,7 @@ else
     AC_MSG_WARN(--with-gdiplus requires valid --with-platformsdkincludedir and --with-platformsdklibdir.)
   fi
 fi
-AM_CONDITIONAL(WITH_GDIPLUS, [test "x$use_gdiplus" = "xYes"])
+AM_CONDITIONAL(WITH_GDIPLUS, [test "x$use_gdiplus" == "xYes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GD
@@ -2578,7 +2587,7 @@ if test "x$with_libgd" != "xyes"; then
   use_gd="No (disabled)"
 fi
 
-if test "x$use_gd" = "x"; then
+if test "x$use_gd" == "x"; then
       AC_PATH_PROG(GDLIB_CONFIG,gdlib-config)
       if test -n "$GDLIB_CONFIG"; then
         GD_INCLUDES=`$GDLIB_CONFIG --includes`
@@ -2588,38 +2597,38 @@ if test "x$use_gd" = "x"; then
         GD_MINORVERSION=`$GDLIB_CONFIG --minorversion`
         GD_REVISION=`$GDLIB_CONFIG --revision`
         for f in `$GDLIB_CONFIG --features` ; do
-           if test "$f" = "GD_PNG"; then
+           if test "$f" == "GD_PNG"; then
                 AC_DEFINE_UNQUOTED(HAVE_GD_PNG,1,[Define if the GD library supports PNG])
            fi
-           if test "$f" = "GD_JPEG"; then
+           if test "$f" == "GD_JPEG"; then
                 AC_DEFINE_UNQUOTED(HAVE_GD_JPEG,1,[Define if the GD library supports JPEG])
            fi
-           if test "$f" = "GD_XPM"; then
+           if test "$f" == "GD_XPM"; then
                 AC_DEFINE_UNQUOTED(HAVE_GD_XPM,1,[Define if the GD library supports XPM])
            fi
-           if test "$f" = "GD_FONTCONFIG"; then
+           if test "$f" == "GD_FONTCONFIG"; then
                HAVE_GD_FONTCONFIG=1
                 AC_DEFINE_UNQUOTED(HAVE_GD_FONTCONFIG,1,[Define if the GD library supports FONTCONFIG])
            fi
-           if test "$f" = "GD_FREETYPE"; then
+           if test "$f" == "GD_FREETYPE"; then
                HAVE_GD_FREETYPE=1
                 AC_DEFINE_UNQUOTED(HAVE_GD_FREETYPE,1,[Define if the GD library supports FREETYPE])
            fi
-           if test "$f" = "GD_GIF"; then
+           if test "$f" == "GD_GIF"; then
                 AC_DEFINE_UNQUOTED(HAVE_GD_GIF,1,[Define if the GD library supports GIF])
            fi
-           if test "$f" = "GD_GIFANIM"; then
+           if test "$f" == "GD_GIFANIM"; then
                 AC_DEFINE_UNQUOTED(HAVE_GD_GIFANIM,1,[Define if the GD library supports GIFANIM])
            fi
-           if test "$f" = "GD_OPENPOLYGON"; then
+           if test "$f" == "GD_OPENPOLYGON"; then
                 AC_DEFINE_UNQUOTED(HAVE_GD_OPENPOLYGON,1,[Define if the GD library supports OPENPOLYGON])
            fi
         done
 
-       if test "x$HAVE_GD_FONTCONFIG" = "x"; then
+       if test "x$HAVE_GD_FONTCONFIG" == "x"; then
             AC_MSG_WARN(Your libgd was not built with freetype support. This may result in problems displaying fonts.)
        fi
-       if test "x$HAVE_GD_FREETYPE" = "x"; then
+       if test "x$HAVE_GD_FREETYPE" == "x"; then
            AC_MSG_WARN(Your libgd was not built with fontconfig support. This may result in problems resolving fonts.)
         fi
 
@@ -2649,19 +2658,19 @@ if test "x$use_gd" = "x"; then
             AC_MSG_WARN(GD gdlib-config not found)
       fi
   # prevent explicit use of -I/usr/include as it breaks mingw cross-compiles
-  if test "x$GD_INCLUDES" = "x-I/usr/include"; then
+  if test "x$GD_INCLUDES" == "x-I/usr/include"; then
      GD_INCLUDES="";
   fi
   # prevent explicit use of -L/usr/lib or -L/usr/lib64, unnecessary clutter
-  if test "x$GD_LDFLAGS" = "x-L/usr/lib"; then
+  if test "x$GD_LDFLAGS" == "x-L/usr/lib"; then
      GD_LDFLAGS="";
   fi
-  if test "x$GD_LDFLAGS" = "x-L/usr/lib64"; then
+  if test "x$GD_LDFLAGS" == "x-L/usr/lib64"; then
      GD_LDFLAGS="";
   fi
 
-  if test "x$use_gd" = "x"; then
-    if test "x$with_libgd" = "xyes"; then
+  if test "x$use_gd" == "x"; then
+    if test "x$with_libgd" == "xyes"; then
     # see if we can use the external gd lib
       save_CPPFLAGS=$CPPFLAGS
       save_LDFLAGS=$LDFLAGS
@@ -2679,7 +2688,7 @@ if test "x$use_gd" = "x"; then
         use_gd="No (gd headers not found)"
        with_libgd="no"
       ])
-      if test "x$use_gd" = "x"; then
+      if test "x$use_gd" == "x"; then
         AC_CHECK_LIB(gd,main,[
           AC_DEFINE_UNQUOTED(HAVE_LIBGD,1,[Define if you have the GD library])
          use_gd="Yes"
@@ -2696,7 +2705,7 @@ if test "x$use_gd" = "x"; then
   AC_SUBST([GD_INCLUDES])
   AC_SUBST([GD_LIBS])
 fi
-AM_CONDITIONAL(WITH_LIBGD, [test "x$with_libgd" = "xyes"])
+AM_CONDITIONAL(WITH_LIBGD, [test "x$with_libgd" == "xyes"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GLUT
@@ -2786,15 +2795,15 @@ TCL_PKGINDEX=""
 TCL_PKGINDEX_GD=""
 TCL_PKGINDEX_SWIG=""
 TK_PKGINDEX=""
-if test "$use_tcl" = "Yes"; then
+if test "$use_tcl" == "Yes"; then
     TCL_PKGINDEX="tcldot/pkgIndex.tcl tclpathplan/pkgIndex.tcl"
-    if test "x$with_libgd" = "xyes"; then
+    if test "x$with_libgd" == "xyes"; then
        TCL_PKGINDEX_GD="gdtclft/pkgIndex.tcl"
     fi
     if test "x$SWIG" != "x"; then
        TCL_PKGINDEX_SWIG="gv/pkgIndex.tcl"
     fi
-    if test "$use_tk" = "Yes"; then
+    if test "$use_tk" == "Yes"; then
         TK_PKGINDEX="tkspline/pkgIndex.tcl"
     fi
 fi
@@ -2816,7 +2825,7 @@ else
   use_sfdp="Yes"
   AC_DEFINE_UNQUOTED(SFDP,1,[Define if you want SFDP])
 fi
-AM_CONDITIONAL(WITH_SFDP, [test "x$use_sfdp" = "xYes"])
+AM_CONDITIONAL(WITH_SFDP, [test "x$use_sfdp" == "xYes"])
 
 dnl -----------------------------------
 dnl SMYRNA 
@@ -2855,7 +2864,7 @@ else
      AC_DEFINE_UNQUOTED(SMYRNA,1,[Define if you want SMYRNA])
   fi
 fi
-AM_CONDITIONAL(WITH_SMYRNA, [test "x$use_smyrna" = "xYes"])
+AM_CONDITIONAL(WITH_SMYRNA, [test "x$use_smyrna" == "xYes"])
 
 dnl -----------------------------------
 dnl CGRAPH 
@@ -2872,7 +2881,7 @@ else
   use_graph="No (disabled deprecated)"
   AC_DEFINE_UNQUOTED(WITH_CGRAPH,1,[Define if you want CGRAPH])
 fi
-AM_CONDITIONAL(WITH_CGRAPH, [test "x$use_cgraph" = "xYes"])
+AM_CONDITIONAL(WITH_CGRAPH, [test "x$use_cgraph" == "xYes"])
 
 dnl -----------------------------------
 dnl ORTHO 
@@ -2887,7 +2896,7 @@ else
   use_ortho="Yes"
   AC_DEFINE_UNQUOTED(ORTHO,1,[Define if you want ORTHO])
 fi
-AM_CONDITIONAL(WITH_ORTHO, [test "x$use_ortho" = "xYes"])
+AM_CONDITIONAL(WITH_ORTHO, [test "x$use_ortho" == "xYes"])
 
 dnl -----------------------------------
 dnl DIGCOLA 
@@ -2923,7 +2932,7 @@ else
     AC_SUBST([IPSEPCOLA_LIBS])
   fi
 fi
-AM_CONDITIONAL(WITH_IPSEPCOLA, [test "x$use_ipsepcola" = "xYes"])
+AM_CONDITIONAL(WITH_IPSEPCOLA, [test "x$use_ipsepcola" == "xYes"])
 
 # -----------------------------------
 # Special checks
@@ -2959,7 +2968,7 @@ AC_MSG_CHECKING(if FILE struct contains _cnt)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
        ]], [[FILE *f;
        int i;
-       i = f->_cnt;
+       i=f->_cnt;
        ]])],[AC_MSG_RESULT(yes)
        AC_DEFINE_UNQUOTED(HAVE_FILE_CNT,1,Define if FILE structure provides _cnt)
        ],[AC_MSG_RESULT(no)
@@ -2971,7 +2980,7 @@ AC_MSG_CHECKING(if FILE struct contains _r)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
        ]], [[FILE *f;
        int i;
-       i = f->_r;
+       i=f->_r;
        ]])],[AC_MSG_RESULT(yes)
        AC_DEFINE_UNQUOTED(HAVE_FILE_R,1,Define if FILE structure provides _r)
        ],[AC_MSG_RESULT(no)
@@ -2983,7 +2992,7 @@ AC_MSG_CHECKING(if FILE struct contains _next)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
        ]], [[FILE *f;
        int i;
-       i = f->_next;
+       i=f->_next;
        ]])],[AC_MSG_RESULT(yes)
        AC_DEFINE_UNQUOTED(HAVE_FILE_NEXT,1,Define if FILE structure provides _next)
        ],[AC_MSG_RESULT(no)
@@ -2995,7 +3004,7 @@ AC_MSG_CHECKING(if FILE struct contains _IO_read_end)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
        ]], [[FILE *f;
        int i;
-       i = f->_IO_read_end;
+       i=f->_IO_read_end;
        ]])],[AC_MSG_RESULT(yes)
        AC_DEFINE_UNQUOTED(HAVE_FILE_IO_READ_END,1,Define if FILE structure provides _IO_read_end)
        ],[AC_MSG_RESULT(no)