--- ../configure.orig	Tue Sep  5 16:18:02 2006
+++ ../configure	Tue Sep  5 16:18:10 2006
@@ -13347,15 +13347,15 @@
   aix*)       AMAYAOS="LINUX" ;;
   cygwin*)    AMAYAOS="WINDOWS" ;;
   darwin*)    AMAYAOS="MACOSX" ;;
-  freebsd2*)  AMAYAOS="LINUX" ;;
-  freebsd*)   AMAYAOS="LINUX" ;;
+  freebsd2*)  AMAYAOS="BSD" ;;
+  freebsd*)   AMAYAOS="BSD" ;;
   hpux*)      AMAYAOS="LINUX" ;;
   irix*)      AMAYAOS="LINUX" ;;
   linuxaout*) AMAYAOS="LINUX" ;;
   linux*)     AMAYAOS="LINUX" ;;
   mingw32*)   AMAYAOS="WINDOWS" ;;
-  netbsd*)    AMAYAOS="LINUX" ;;
-  openbsd*)   AMAYAOS="LINUX" ;;
+  netbsd*)    AMAYAOS="BSD" ;;
+  openbsd*)   AMAYAOS="BSD" ;;
   osf12*)   AMAYAOS="LINUX" ;;
   osf*)       AMAYAOS="LINUX" ;;
   solaris2*)  AMAYAOS="LINUX" ;;
@@ -13375,6 +13375,7 @@
   LINUX)       OS_OPTIONS="-D_UNIX" ;;
   WINDOWS)     OS_OPTIONS="-D_WINDOWS" ;; # not tested (cygwin or mingw)
   MACOSX)      OS_OPTIONS="-D_UNIX -D_MACOS" ;;
+  BSD)         OS_OPTIONS="-D_UNIX -D_BSD" ;;
 esac
 
 
@@ -13706,7 +13707,7 @@
   #   --disable-backtrace # to avoid the buggy popup when an assert occurs
   WXCONFIGURE_TUNNING_OPTION="--disable-printarch --disable-htmlhelp --disable-html --disable-docview --disable-mdi --disable-mdidoc --disable-sound --disable-backtrace"
 
-  if test "$AMAYAOS" = "LINUX" ; then
+  if test "$AMAYAOS" = "LINUX" -o "$AMAYAOS" = "BSD" ; then
     # LINUX
     #   --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)
     #   --disable-shared        create only static library (.a)
@@ -13990,7 +13991,7 @@
 
   # if with_gl is on then test system opengl library (GL & GLU)
   if test "$with_gl" = "yes" ; then
-    if test "$AMAYAOS" = "LINUX" ; then
+    if test "$AMAYAOS" = "LINUX" -o "$AMAYAOS" = "BSD" ; then
 	# setup a list of standard paths int LDFLAGS
 	# for AC_CHECK_LIB library existance checks
 	LIBS_OLD=$LIBS