Remove --with-plugindir=DIR, use --prefix or --libdir instead

The /lib/finit/plugins path is as of this patch not longer possible to
change.  Use --prefix or --libdir instead to change the leading path.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>

configure.ac

@@ -93,11 +93,6 @@ AC_ARG_WITH(fifo,
         AS_HELP_STRING([--with-fifo=FIFO], [FIFO for init/telinit clients, default /var/run/initctl]),
 	[fifo=$withval], [fifo=$localstatedir/run/initctl])
 
-AC_ARG_WITH(plugindir,
-        AS_HELP_STRING([--with-plugindir=DIR], [Finit plugin directory, default /lib/finit/plugins]),
-	[pkglibdir=$withval], [pkglibdir=$libdir/finit/plugins])
-AC_SUBST([pkglibdir])
-
 AC_ARG_WITH(config,
         AS_HELP_STRING([--with-config=CONFIG], [Finit bootstrap config file, default /etc/finit.conf]),
 	[conf=$withval], [conf=$sysconfdir/finit.conf])
@@ -214,6 +209,14 @@ AM_CONDITIONAL(STATIC,    [test "x$enable_static" = "xyes"])
 AM_CONDITIONAL(INETD,     [test "x$enable_inetd" = "xyes"])
 AM_CONDITIONAL(WATCHDOGD, [test "x$enable_watchdog" = "xyes"])
 
+# Override default libdir, used for plugins and rescue.conf
+#pkglibdir=$libdir/finit
+#AC_SUBST(pkglibdir)
+#AC_EXPAND_DIR(pkglibdir, "$libdir/finit")
+AC_EXPAND_DIR(plugin_path, "$libdir/finit/plugins")
+AC_SUBST(plugin_path)
+AC_DEFINE_UNQUOTED(PLUGIN_PATH, "$plugin_path", [Finit plugin path])
+
 # Generate all files
 AC_OUTPUT
 
@@ -227,6 +230,7 @@ cat <<EOF
   FIFO path.............: $fifo_path
   Finit config file.....: $conf_path
   Finit config.d path...: $rcsd_path
+  Finit plugin path.....: $plugin_path
   Compat rc.local path..: $rclocal_path
   Random seed path......: $random_path
   C Compiler............: $CC $CFLAGS $CPPFLAGS $LDFLAGS $LIBS

plugins/Makefile.am

@@ -1,3 +1,4 @@
+pkglibdir           = $(plugin_path)
 AM_LDFLAGS          = -module -avoid-version -shared
 AM_CFLAGS           = -W -Wall -Wextra -Wno-unused-parameter -std=gnu99
 AM_CPPFLAGS         = -I$(top_srcdir)/src -U_FORTIFY_SOURCE

src/Makefile.am

@@ -4,7 +4,6 @@ if STATIC
 AM_CPPFLAGS       += -DENABLE_STATIC
 AM_LDFLAGS         = -static-libtool-libs
 else
-AM_CPPFLAGS       += -DPLUGIN_PATH=\"$(pkglibdir)\"
 AM_LDFLAGS         = -export-dynamic
 endif
 

src/plugin.h

@@ -24,6 +24,7 @@
 #ifndef FINIT_PLUGIN_H_
 #define FINIT_PLUGIN_H_
 
+#include <config.h>
 #include <uev/uev.h>
 #include <lite/queue.h>		/* BSD sys/queue.h API */