From Marc Moussali:

Make it easier to add custom plugins.

svn path=/trunk/; revision=26627

Makefile.am

@@ -238,8 +238,8 @@ wimaxasncp_DATA = \
 PLATFORM_SRC = capture-pcap-util-unix.c
 
 if HAVE_PLUGINS
-
-plugin_ldadd = \
+-include plugins/Custom.make
+plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
 	-dlopen plugins/agentx/agentx.la \
 	-dlopen plugins/artnet/artnet.la \
 	-dlopen plugins/asn1/asn1.la \

configure.in

@@ -1558,6 +1558,9 @@ AC_SUBST(ENABLE_STATIC)
 dnl Save the cacheable configure results to config.cache before recursing
 AC_CACHE_SAVE
 
+sinclude(plugins/Custom.m4) dnl
+ifdef(_CUSTOM_AC_OUTPUT_, '', define(_CUSTOM_AC_OUTPUT_, )) dnl
+
 AM_CONFIG_HEADER(config.h)
 AC_OUTPUT(
   Makefile
@@ -1697,6 +1700,7 @@ AC_OUTPUT(
   tools/lemon/Makefile
   wiretap/Makefile
   wsutil/Makefile
+  _CUSTOM_AC_OUTPUT_
   ,)
 dnl AC_CONFIG_FILES([tools/setuid-root.pl], [chmod +x tools/setuid-root.pl])
 

epan/Makefile.am

@@ -185,7 +185,7 @@ inet_pton.c:
 if HAVE_PLUGINS
 
 if ENABLE_STATIC
-
+-include ../plugins/Custom.make
 plugin_src = \
 	../plugins/artnet/packet-artnet.c \
 	../plugins/asn1/packet-asn1.c \

plugins/Makefile.am

@@ -21,7 +21,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-SUBDIRS = \
+-include Custom.make
+SUBDIRS = $(_CUSTOM_SUBDIRS_) \
 	agentx \
 	artnet \
 	asn1 \