--- configure.in.orig	Tue Aug 16 03:22:51 2005
+++ configure.in	Tue Aug 16 10:39:12 2005
@@ -127,7 +127,7 @@ else
     esac
 fi
 
-CXXFLAGS="$CXXFLAGS $CFLAGS"
+CXXFLAGS="$CXXFLAGS"
 
 AC_CONFIG_SRCDIR([kismet_server.cc])
 AC_CONFIG_HEADER([config.h])
@@ -856,6 +856,11 @@ else
 	gmpl="no"
 	gpslc=""
 	pthr="no"
+fi
+
+# Not all OpenBSD archs have apm:
+if test "$bsd" = "yes"; then
+	AC_CHECK_HEADERS([machine/apmvar.h])
 fi
 
 
