--- configure.orig	2011-01-15 03:04:22 UTC
+++ configure
@@ -62,7 +62,7 @@ else
       case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+	arg=`expr \( "X$arg" : ".*$as_nl\\(.*\\)" \)`;;
       esac;
       expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
     '
@@ -376,7 +376,7 @@ as_fn_error ()
 } # as_fn_error
 
 if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   test "X`expr \( 00001 : '.*\(...\)' \)`" = X001; then
   as_expr=expr
 else
   as_expr=false
@@ -888,7 +888,7 @@ do
   fi
 
   case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=?*) ac_optarg=`expr \( "X$ac_option" : '[^=]*=\(.*\)' \)` ;;
   *=)   ac_optarg= ;;
   *)    ac_optarg=yes ;;
   esac
@@ -932,7 +932,7 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr \( "x$ac_option" : 'x-*disable-\(.*\)' \)`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: $ac_useropt"
@@ -958,7 +958,7 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr \( "x$ac_option" : 'x-*enable-\([^=]*\)' \)`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: $ac_useropt"
@@ -1162,7 +1162,7 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr \( "x$ac_option" : 'x-*with-\([^=]*\)' \)`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: $ac_useropt"
@@ -1178,7 +1178,7 @@ do
     eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr \( "x$ac_option" : 'x-*without-\(.*\)' \)`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: $ac_useropt"
@@ -1216,7 +1216,7 @@ Try \`$0 --help' for more information"
     ;;
 
   *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    ac_envvar=`expr \( "x$ac_option" : 'x\([^=]*\)=' \)`
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
@@ -1259,7 +1259,7 @@ do
   # Remove trailing slashes.
   case $ac_val in
     */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      ac_val=`expr \( "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)' \)`
       eval $ac_var=\$ac_val;;
   esac
   # Be sure to have absolute directory names.
@@ -1352,7 +1352,7 @@ fi
 # Double slashes in file names in object file debugging info
 # mess up M-x gdb in Emacs.
 case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+*/) srcdir=`expr \( "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)' \)`;;
 esac
 for ac_var in $ac_precious_vars; do
   eval ac_env_${ac_var}_set=\${${ac_var}+set}
@@ -2786,7 +2786,7 @@ do
     *.* )
 	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	   ac_cv_exeext=`expr \( "$ac_file" : '[^.]*\(\..*\)' \)`
 	fi
 	# We set ac_cv_exeext here because the later test for it is not
 	# safe: cross compilers may not add the suffix if given an `-o'
@@ -2846,7 +2846,7 @@ for ac_file in conftest.exe conftest con
   test -f "$ac_file" || continue
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+    *.* ) ac_cv_exeext=`expr \( "$ac_file" : '[^.]*\(\..*\)' \)`
 	  break;;
     * ) break;;
   esac
@@ -2955,7 +2955,7 @@ $as_echo "$ac_try_echo"; } >&5
   test -f "$ac_file" || continue;
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+    *) ac_cv_objext=`expr \( "$ac_file" : '.*\.\(.*\)' \)`
        break;;
   esac
 done
@@ -6755,7 +6755,7 @@ $as_echo "$enable_image" >&6; }
   if test x"$enable_image" = xyes; then
     enable_image=x11
     case "`uname -s`" in
-    Linux|linux|LINUX)
+    Linux|linux|LINUX|FreeBSD|freebsd|FREEBSD|BSDSUniX|bsdsunix|BSDSUNIX)
 	if test -c /dev/fb0; then
 	  enable_image=x11,fb
         fi;;
@@ -6828,6 +6828,7 @@ $as_echo "$with_imagelib" >&6; }
      fi;;
    esac
   done
+  PKG_CONFIG=pkg-config
   IMGTARGETS=""
   IMGLINK='$(CC)'
   if test x"$with_gtk2" = xyes; then
@@ -9259,7 +9260,7 @@ else
       case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+	arg=`expr \( "X$arg" : ".*$as_nl\\(.*\\)" \)`;;
       esac;
       expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
     '
@@ -9413,7 +9414,7 @@ fi # as_fn_arith
 
 
 if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   test "X`expr \( 00001 : '.*\(...\)' \)`" = X001; then
   as_expr=expr
 else
   as_expr=false
@@ -9683,12 +9684,12 @@ while test $# != 0
 do
   case $1 in
   --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_option=`expr \( "X$1" : 'X\([^=]*\)=' \)`
+    ac_optarg=`expr \( "X$1" : 'X[^=]*=\(.*\)' \)`
     ac_shift=:
     ;;
   --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_option=`expr \( "X$1" : 'X\([^=]*\)=' \)`
     ac_optarg=
     ac_shift=:
     ;;