-PKG_CHECK_MODULES(GLIB, glib-2.0)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-PKG_CHECK_MODULES(GMODULE, gmodule-2.0)
-AC_SUBST(GMODULE_CFLAGS)
-AC_SUBST(GMODULE_LIBS)
-
-AC_PROG_LN_S
+AC_PROG_MAKE_SET
+
+if test "$CVS" = "yes"; then
+ AC_PATH_PROG([FLEX], [flex])
+ test "$FLEX" || AC_MSG_ERROR([flex not found])
+
+ AC_PATH_PROG([BISON], [bison])
+ test "BISON" || AC_MSG_ERROR([bison not found])
+fi
+
+AC_DISABLE_STATIC
+AC_LIBTOOL_DLOPEN