[monit-dev] [monit] r395 committed - Removing libmonit until we are ready with 'check command' in a short w...

[monit]

Revision: 395
Author:   address@hidden
Date:     Sun Jun 12 05:26:23 2011
Log:      Removing libmonit until we are ready with 'check command' in a  
short while

http://code.google.com/p/monit/source/detail?r=395

Modified:
 /trunk/Makefile.am
 /trunk/bootstrap
 /trunk/configure.ac
 /trunk/src/monit.c

=======================================
--- /trunk/Makefile.am  Sat Jun 11 17:50:47 2011
+++ /trunk/Makefile.am  Sun Jun 12 05:26:23 2011
@@ -3,9 +3,7 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies subdir-objects
 ACLOCAL_AMFLAGS         = -I m4

-EXTRA_DIST	= README AUTHORS CHANGES COPYING bootstrap doc src config  
monitrc contrib libmonit monit.1
-
-SUBDIRS                = libmonit
+EXTRA_DIST	= README AUTHORS CHANGES COPYING bootstrap doc src config  
monitrc contrib monit.1

 CC             = @CC@
 FLEX           = @FLEX@
@@ -18,7 +16,6 @@
 AM_CPPFLAGS	= $(CPPFLAGS) $(EXTCPPFLAGS) address@hidden@  
-DSYSCONFDIR="\"@address@hidden""
 AM_LDFLAGS     = $(LDFLAGS) $(EXTLDFLAGS) -L./lib/
 INCLUDES	= -I./src -I./src/device -I./src/http -I./src/process  
-I./src/protocols
-INCLUDES       += -I./libmonit/src

 # The mmonit binary
 bin_PROGRAMS   = monit
@@ -87,7 +84,6 @@
                  src/process/process_common.c \
                  src/process/address@hidden@.c

-monit_LDADD    = libmonit/libmonit.la
 monit_LDFLAGS  = -static $(EXTLDFLAGS)

 man_MANS       = monit.1
=======================================
--- /trunk/bootstrap    Sat Jun 11 17:19:40 2011
+++ /trunk/bootstrap    Sun Jun 12 05:26:23 2011
@@ -6,8 +6,6 @@
 glibtoolize -f 2>/dev/null || libtoolize -f
 if aclocal -I config && autoheader && automake --foreign --add-missing  
--copy && autoconf
 then
-        cd libmonit || exit 1;
-        ./bootstrap || exit 1;
         echo "Success bootstrapping Monit"
         exit 0;
 fi
=======================================
--- /trunk/configure.ac Sat Jun 11 17:19:40 2011
+++ /trunk/configure.ac Sun Jun 12 05:26:23 2011
@@ -11,7 +11,6 @@
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/monit.c])
-AC_CONFIG_SUBDIRS([libmonit])
 AC_CONFIG_COMMANDS([libtool_patch],[test `uname` = "OpenBSD" && perl -p -i  
-e "s/deplibs_check_method=.*/deplibs_check_method=pass_all/g" libtool])


=======================================
--- /trunk/src/monit.c  Sat Jun 11 17:53:57 2011
+++ /trunk/src/monit.c  Sun Jun 12 05:26:23 2011
@@ -76,9 +76,6 @@
 #include "state.h"
 #include "event.h"

-// libmonit
-#include "Bootstrap.h"
-

 /**
  *  DESCRIPTION
@@ -154,10 +151,6 @@
  * The Prime mover
  */
 int main(int argc, char **argv) {
-        Bootstrap();
-        Bootstrap_setAbortHandler(vLogError); // We let Monit continue  
even if libmonit should throw an exception
-        Bootstrap_setErrorHandler(vLogError);
-
   setlocale(LC_ALL, "C");
   prog = Util_basename(argv[0]);
   init_env();