$NetBSD: patch-aa,v 1.1.1.1 2006/04/06 13:30:47 adam Exp $

--- configure.orig	2005-12-10 15:25:16.000000000 +0100
+++ configure
@@ -4921,7 +4921,7 @@ echo $ECHO_N "checking the wxWidgets ver
 # Check whether --with-wx-version or --without-wx-version was given.
 if test "${with_wx_version+set}" = set; then
   withval="$with_wx_version"
-  if test "$withval" == yes; then
+  if test "$withval" = yes; then
     echo "$as_me:$LINENO: result: unspecified" >&5
 echo "${ECHO_T}unspecified" >&6
     { { echo "$as_me:$LINENO: error: you must specify a version number when using --with-wx-version=<version number>" >&5
@@ -5540,20 +5540,20 @@ echo "$as_me: error: Could not find wx-c
     WX_OLD_LDFLAGS="$LDFLAGS"
     WX_OLD_CPPFLAGS="$CPPFLAGS"
 
-    if test "$pg_debug_build" == yes
+    if test "$pg_debug_build" = yes
     then
-        WX_NEW_CPPFLAGS=`${WX_CONFIG} --cppflags --unicode=yes --debug=yes --version=${wx_version}`
+        WX_NEW_CPPFLAGS=`${WX_CONFIG} --cppflags --unicode=no --debug=yes --version=${wx_version}`
         CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -g -O0"
 
-        WX_NEW_LIBS=`${WX_CONFIG} ${WX_STATIC} --libs --unicode=yes --debug=yes --version=${wx_version}`
-        WX_NEW_CONTRIB_LIBS=`${WX_CONFIG} ${WX_STATIC} --libs stc,ogl --unicode=yes --debug=yes --version=${wx_version}`
+        WX_NEW_LIBS=`${WX_CONFIG} ${WX_STATIC} --libs --unicode=no --debug=yes --version=${wx_version}`
+        WX_NEW_CONTRIB_LIBS=`${WX_CONFIG} ${WX_STATIC} --libs stc,ogl --unicode=no --debug=yes --version=${wx_version}`
         LIBS="$LIBS $WX_NEW_LIBS $WX_NEW_CONTRIB_LIBS"
     else
-        WX_NEW_CPPFLAGS=`${WX_CONFIG} --cppflags --unicode=yes --debug=no --version=${wx_version}`
+        WX_NEW_CPPFLAGS=`${WX_CONFIG} --cppflags --unicode=no --debug=no --version=${wx_version}`
         CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -O2"
 
-        WX_NEW_LIBS=`${WX_CONFIG} ${WX_STATIC} --libs --unicode=yes --debug=no --version=${wx_version}`
-        WX_NEW_CONTRIB_LIBS=`${WX_CONFIG} ${WX_STATIC} --libs stc,ogl --unicode=yes --debug=no --version=${wx_version}`
+        WX_NEW_LIBS=`${WX_CONFIG} ${WX_STATIC} --libs --unicode=no --debug=no --version=${wx_version}`
+        WX_NEW_CONTRIB_LIBS=`${WX_CONFIG} ${WX_STATIC} --libs stc,ogl --unicode=no --debug=no --version=${wx_version}`
         LIBS="$LIBS $WX_NEW_LIBS $WX_NEW_CONTRIB_LIBS"
     fi
 
@@ -5579,19 +5579,19 @@ fi
 # Print a configuration summary
 echo
 echo "Using wxWidgets version:             $wx_version"
-if test "$pg_debug_build" == yes
+if test "$pg_debug_build" = yes
 then
 	echo "Building a debug version of pgAdmin: Yes"
 else
 	echo "Building a debug version of pgAdmin: No"
 fi
-if test "$pg_static_build" == yes
+if test "$pg_static_build" = yes
 then
 	echo "Statically linking pgAdmin:          Yes"
 else
 	echo "Statically linking pgAdmin:          No"
 fi
-if test "$pg_appbundle" == yes
+if test "$pg_appbundle" = yes
 then
 	echo "Building a Mac OS X appbundle:       Yes"
 else
@@ -5600,8 +5600,6 @@ fi
 echo
 
 # CFLAGS/CXXFLAGS may well contain unwanted settings, so clear them.
-CFLAGS=""
-CXXFLAGS=""
 
 
 
@@ -6099,6 +6097,8 @@ do
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    # Avoid regenerating for rechecks on pkgsrc
+    exit 0
     ac_cs_recheck=: ;;
   --version | --vers* | -V )
     echo "$ac_cs_version"; exit 0 ;;
