-#AC_SUBST(RSL_CFLAGS, "-I/usr/local/trmm/GVBOX/include/")
-#AC_SUBST(RSL_LIBS, "-L/usr/local/trmm/GVBOX/lib/ -lrsl")
-AC_SUBST(RSL_CFLAGS, "")
-AC_SUBST(RSL_LIBS, "-lrsl")
+AC_CHECK_LIB(rsl, RSL_wsr88d_to_radar, RSL_LIBS="-lrsl")
+AM_CONDITIONAL(HAVE_RSL, test "$RSL_LIBS" != "")
+AC_SUBST(RSL_LIBS)
+
+# Test for windowing system
+case "${host}" in
+ *mingw32*) SYS="WIN" ;;
+ *cygwin*) SYS="WIN" ;;
+ *apple*) SYS="MAC" ;;
+ *) SYS="X11" ;;
+esac
+AM_CONDITIONAL([SYS_WIN], test "$SYS" = "WIN")
+AM_CONDITIONAL([SYS_MAC], test "$SYS" = "MAC")
+AM_CONDITIONAL([SYS_X11], test "$SYS" = "X11")
+
+# Check for Mac OX
+if test "$SYS" = "MAC"; then
+ PKG_CHECK_MODULES(MAC, gtk-mac-integration)
+fi