[vhffs-dev] [679] God said "IT IS NOT ENOUGH LITTLE BEETLE", so I finished the work. |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 679
Author: beuss
Date: 2007-07-06 13:03:47 +0000 (Fri, 06 Jul 2007)
Log Message:
-----------
God said "IT IS NOT ENOUGH LITTLE BEETLE", so I finished the work.
Added --disable-[doc|jabber|tools|listengine|robots|backend|compat] flags to configure script.
Modified Paths:
--------------
trunk/configure.ac
trunk/vhffs-backend/Makefile.am
trunk/vhffs-compat/Makefile.am
trunk/vhffs-jabber/Makefile.am
trunk/vhffs-listengine/Makefile.am
trunk/vhffs-panel/Makefile.am
trunk/vhffs-robots/Makefile.am
trunk/vhffs-tools/Makefile.am
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-07-06 12:11:27 UTC (rev 678)
+++ trunk/configure.ac 2007-07-06 13:03:47 UTC (rev 679)
@@ -183,10 +183,12 @@
)
AC_SUBST(MINGID)
-dnl Modular build (if someone wants to imrove...)
+dnl Modular build (if someone wants to improve...)
+
+#TODO add format/language handling
AC_ARG_ENABLE(doc,
AC_HELP_STRING([--enable-doc],
- [Enable vhffs documentation (need DocBook)]))
+ [Enable vhffs documentation, need DocBook [default=no]]))
AM_CONDITIONAL(BUILD_DOC, test "$enable_doc" = yes)
@@ -197,6 +199,64 @@
fi
fi
+dnl Install panel or not ?
+AC_ARG_ENABLE(panel,
+ AC_HELP_STRING([--enable-panel],
+ [Enable panel and templates installation [default=yes]]),
+ enable_panel=$enableval,enable_panel=yes)
+
+AM_CONDITIONAL(INSTALL_PANEL, test "$enable_panel" = yes)
+
+dnl Install listengine or not ?
+AC_ARG_ENABLE(listengine,
+ AC_HELP_STRING([--enable-listengine],
+ [Enable listengine installation [default=yes]]),
+ enable_listengine=$enableval, enable_listengine=yes)
+
+AM_CONDITIONAL(INSTALL_LISTENGINE, test "$enable_listengine" = yes)
+
+dnl Install robots or not ?
+AC_ARG_ENABLE(robots,
+ AC_HELP_STRING([--enable-robots],
+ [Enable robots installation [default=yes]]),
+ enable_robots=$enableval, enable_robots=yes)
+
+AM_CONDITIONAL(INSTALL_ROBOTS, test "$enable_robots" = yes)
+
+dnl Install backend or not ?
+AC_ARG_ENABLE(backend,
+ AC_HELP_STRING([--enable-backend],
+ [Enable backend installation [default=yes]]),
+ enable_backend=$enableval, enable_backend=yes)
+
+AM_CONDITIONAL(INSTALL_BACKEND, test "$enable_backend" = yes)
+
+dnl Install migration scripts or not ?
+AC_ARG_ENABLE(compat,
+ AC_HELP_STRING([--enable-compat],
+ [Enable migration scripts installation [default=yes]]),
+ enable_compat=$enableval, enable_compat=yes)
+
+AM_CONDITIONAL(INSTALL_COMPAT, test "$enable_compat" = yes)
+
+dnl Install jabber or not ?
+AC_ARG_ENABLE(jabber,
+ AC_HELP_STRING([--enable-jabber],
+ [Enable jabber bridge installation [default=yes]]),
+ enable_jabber=$enableval, enable_jabber=yes)
+
+AM_CONDITIONAL(INSTALL_JABBER, test "$enable_jabber" = yes)
+
+dnl Install tools or not ?
+AC_ARG_ENABLE(tools,
+ AC_HELP_STRING([--enable-tools],
+ [Enable VHFFS tools installation [default=yes]]),
+ enable_tools=$enableval, enable_tools=yes)
+
+AM_CONDITIONAL(INSTALL_TOOLS, test "$enable_tools" = yes)
+
+
+
# -- Starting system checks
AC_CHECK_HEADERS([stdlib.h string.h sys/time.h syslog.h unistd.h])
Modified: trunk/vhffs-backend/Makefile.am
===================================================================
--- trunk/vhffs-backend/Makefile.am 2007-07-06 12:11:27 UTC (rev 678)
+++ trunk/vhffs-backend/Makefile.am 2007-07-06 13:03:47 UTC (rev 679)
@@ -1,3 +1,5 @@
+if INSTALL_BACKEND
+
config_DATA = conf/vhffs.conf.dist
configdir = @CONFDIR@
CONF_FILE = @CONFDIR@/vhffs.conf
@@ -12,3 +14,5 @@
backenddir = @BACKENDDIR@
backend_DATA = src/pgsql/initdb.sql
+
+endif
Modified: trunk/vhffs-compat/Makefile.am
===================================================================
--- trunk/vhffs-compat/Makefile.am 2007-07-06 12:11:27 UTC (rev 678)
+++ trunk/vhffs-compat/Makefile.am 2007-07-06 13:03:47 UTC (rev 679)
@@ -1,3 +1,5 @@
+if INSTALL_COMPAT
+
compatdir = @COMPATDIR@
compat_DATA = \
4.0pre1.sql \
@@ -26,3 +28,5 @@
for f in $(compat_SCRIPTS) ; do \
$(do_sed) $(DESTDIR)$(compatdir)/$$f; \
done
+
+endif # INSTALL_COMPAT
Modified: trunk/vhffs-jabber/Makefile.am
===================================================================
--- trunk/vhffs-jabber/Makefile.am 2007-07-06 12:11:27 UTC (rev 678)
+++ trunk/vhffs-jabber/Makefile.am 2007-07-06 13:03:47 UTC (rev 679)
@@ -1,3 +1,5 @@
+if INSTALL_JABBER
+
jabberdir = @JABBERDIR@
jabber_SCRIPTS = vhffspipe.pl
@@ -11,4 +13,6 @@
install-data-hook :
for f in $(jabber_SCRIPTS) ; do \
$(do_sed) $(DESTDIR)$(jabberdir)/$$f; \
- done
\ No newline at end of file
+ done
+
+endif
Modified: trunk/vhffs-listengine/Makefile.am
===================================================================
--- trunk/vhffs-listengine/Makefile.am 2007-07-06 12:11:27 UTC (rev 678)
+++ trunk/vhffs-listengine/Makefile.am 2007-07-06 13:03:47 UTC (rev 679)
@@ -1,3 +1,6 @@
+if INSTALL_LISTENGINE
+
SUBDIRS = src
EXTRA_DIST = misc
+endif # INSTALL_LISTENGINE
Modified: trunk/vhffs-panel/Makefile.am
===================================================================
--- trunk/vhffs-panel/Makefile.am 2007-07-06 12:11:27 UTC (rev 678)
+++ trunk/vhffs-panel/Makefile.am 2007-07-06 13:03:47 UTC (rev 679)
@@ -1,3 +1,4 @@
+if INSTALL_PANEL
SUBDIRS = templates
paneldir = @PANELDIR@
@@ -255,4 +256,4 @@
$(do_sed) $(DESTDIR)$(paneldir)/$$f; \
done
-
+endif # Install panel
Modified: trunk/vhffs-robots/Makefile.am
===================================================================
--- trunk/vhffs-robots/Makefile.am 2007-07-06 12:11:27 UTC (rev 678)
+++ trunk/vhffs-robots/Makefile.am 2007-07-06 13:03:47 UTC (rev 679)
@@ -1,3 +1,5 @@
+if INSTALL_ROBOTS
+
botsdir = @BOTSDIR@
nobase_bots_DATA = \
misc/awstats_6.4_vhffs.patch \
@@ -84,3 +86,5 @@
for f in $(nobase_bots_SCRIPTS) ; do \
$(do_sed) $(DESTDIR)$(botsdir)/$$f; \
done
+
+endif # INSTALL_ROBOTS
Modified: trunk/vhffs-tools/Makefile.am
===================================================================
--- trunk/vhffs-tools/Makefile.am 2007-07-06 12:11:27 UTC (rev 678)
+++ trunk/vhffs-tools/Makefile.am 2007-07-06 13:03:47 UTC (rev 679)
@@ -1,2 +1,6 @@
+if INSTALL_TOOLS
+
SUBDIRS = src
DIST_SUBDIRS = src mans
+
+endif