@@ -15,10 +15,17 @@
 LIBS="$LIBS -lobjc"
 
 AC_DEFINE(OF_CONFIG_H, 1, [Define so that we know we got our config.h])
 
 BUILDSYS_LIB
+AC_DEFINE_UNQUOTED(PLUGIN_SUFFIX, "$PLUGIN_SUFFIX", [Suffix for plugins])
+
+if test x"$PLUGIN_SUFFIX" != "x"; then
+	AC_SUBST(OFPLUGIN_M, "OFPlugin.m")
+	AC_SUBST(OFPLUGIN, "OFPlugin")
+fi
+
 AC_C_BIGENDIAN([AC_DEFINE(OF_BIG_ENDIAN, 1, [Whether we are big endian])])
 
 AC_MSG_CHECKING(for SIZE_MAX)
 AC_EGREP_CPP(yes, [
 	#include <stdint.h>
@@ -40,10 +47,12 @@
 		size_max="SIZE_T_MAX"], [
 		AC_MSG_RESULT(no)
 		size_max="((size_t)-1)"])
 	AC_DEFINE_UNQUOTED(SIZE_MAX, $size_max, [Maximum value for size_t])])
 
+AC_CHECK_LIB(dl, dlopen, LIBS="$LIBS -ldl")
+
 AC_CHECK_HEADER(objc/runtime.h,
 	[AC_DEFINE(HAVE_OBJC_RUNTIME_H, 1, [Whether we have objc/runtime.h])])
 AC_CHECK_LIB(objc, sel_get_name,
 	[AC_DEFINE(HAVE_SEL_GET_NAME, 1, [Whether we have sel_get_name])])
 AC_CHECK_LIB(objc, sel_getName,
@@ -51,11 +60,11 @@
 
 AC_CHECK_FUNC(asprintf, [
 	have_asprintf="yes"
 	AC_DEFINE(HAVE_ASPRINTF, 1, "Whether we have asprintf")], [
 	have_asprintf="no"
-	AC_SUBST(ASPRINTF, "asprintf.c")])
+	AC_SUBST(ASPRINTF_C, "asprintf.c")])
 
 AC_MSG_CHECKING(whether snprintf returns something useful)
 AC_CACHE_VAL(ac_cv_snprintf_useful_ret, [
 	AC_TRY_RUN([
 		#include <stdio.h>