RC1.2: comment out options and build of store_(mysql/mysqlbulk/sos) a…

…nd sampler sedc.c
ovis-hpc · Sep 15, 2014 · 9563bf6 · 9563bf6
1 parent 913a2e1
commit 9563bf6
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 37 deletions.
diff --git a/ldms/configure.ac b/ldms/configure.ac
@@ -46,7 +46,7 @@ OPTION_DEFAULT_ENABLE([sock], [ENABLE_SOCK])
 
 dnl Options for store
 OPTION_DEFAULT_ENABLE([store], [ENABLE_STORE])
-OPTION_DEFAULT_DISABLE([mysql], [ENABLE_MYSQL])
+dnl OPTION_DEFAULT_DISABLE([mysql], [ENABLE_MYSQL])
 OPTION_DEFAULT_DISABLE([mysqlbulk], [ENABLE_MYSQLBULK])
 OPTION_DEFAULT_ENABLE([flatfile], [ENABLE_FLATFILE])
 OPTION_DEFAULT_ENABLE([csv], [ENABLE_CSV])
@@ -62,7 +62,7 @@ OPTION_DEFAULT_ENABLE([procnetdev], [ENABLE_PROCNETDEV])
 OPTION_DEFAULT_ENABLE([procnfs], [ENABLE_PROCNFS])
 OPTION_DEFAULT_ENABLE([procsensors], [ENABLE_PROCSENSORS])
 OPTION_DEFAULT_ENABLE([procstatutil], [ENABLE_PROCSTATUTIL])
-OPTION_DEFAULT_DISABLE([sedc], [ENABLE_SEDC])
+dnl OPTION_DEFAULT_DISABLE([sedc], [ENABLE_SEDC])
 OPTION_DEFAULT_ENABLE([sysclassib], [ENABLE_SYSCLASSIB])
 OPTION_DEFAULT_ENABLE([vmstat], [ENABLE_VMSTAT])
 OPTION_DEFAULT_ENABLE([procdiskstats], [ENABLE_PROCDISKSTATS])
@@ -100,14 +100,14 @@ dnl This got defined here for LIBEVENT_ENABLE
 OPTION_DEFAULT_ENABLE([libevent], [ENABLE_LIBEVENT])
 OPTION_WITH([libevent], [LIBEVENT])
 
-if test -z "$ENABLE_MYSQL_TRUE"
-then
-OPTION_WITH_MYSQL dnl MYSQL is special.
-fi
-if test -z "$ENABLE_GLIB_TRUE"
-then
-PKG_CHECK_MODULES([GLIB20], [glib-2.0])
-fi
+dnl if test -z "$ENABLE_MYSQL_TRUE"
+dnl then
+dnl OPTION_WITH_MYSQL dnl MYSQL is special.
+dnl fi
+dnl if test -z "$ENABLE_GLIB_TRUE"
+dnl then
+dnl PKG_CHECK_MODULES([GLIB20], [glib-2.0])
+dnl fi
 
 dnl Check for libevent
 OPTION_WITH_EVENT

diff --git a/ldms/src/sampler/Makefile.am b/ldms/src/sampler/Makefile.am
@@ -76,14 +76,14 @@ libprocstatutil_la_LIBADD = $(COMMON_LIBADD)
 pkglib_LTLIBRARIES += libprocstatutil.la
 endif
 
-if ENABLE_GLIB
-if ENABLE_SEDC
-libsedc_la_SOURCES = sedc.c
-libsedc_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
-libsedc_la_LIBADD = $(COMMON_LIBADD) $(GLIB20_LIBS)
-pkglib_LTLIBRARIES += libsedc.la
-endif
-endif
+## if ENABLE_GLIB
+## if ENABLE_SEDC
+## libsedc_la_SOURCES = sedc.c
+## libsedc_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
+## libsedc_la_LIBADD = $(COMMON_LIBADD) $(GLIB20_LIBS)
+## pkglib_LTLIBRARIES += libsedc.la
+## endif
+## endif
 
 if ENABLE_SYSCLASSIB
 libsysclassib_la_SOURCES = sysclassib.c

diff --git a/ldms/src/store/Makefile.am b/ldms/src/store/Makefile.am
@@ -5,12 +5,12 @@ AM_CFLAGS = -I$(srcdir)/$(CORE) -I$(top_srcdir)  @OVIS_LIB_INCDIR_FLAG@
 STORE_LIBADD = $(CORE)/libldms.la -lcoll -lovis_util @OVIS_LIB_LIB64DIR_FLAG@ \
 	       @OVIS_LIB_LIBDIR_FLAG@
 
-if ENABLE_SOS
-libstore_sos_la_SOURCES = store_sos.c
-libstore_sos_la_CFLAGS = $(AM_CFLAGS) @SOS_INCDIR_FLAG@
-libstore_sos_la_LIBADD = $(STORE_LIBADD) -lsos @SOS_LIB64DIR_FLAG@ @SOS_LIBDIR_FLAG@
-pkglib_LTLIBRARIES += libstore_sos.la
-endif
+## if ENABLE_SOS
+## libstore_sos_la_SOURCES = store_sos.c
+## libstore_sos_la_CFLAGS = $(AM_CFLAGS) @SOS_INCDIR_FLAG@
+## libstore_sos_la_LIBADD = $(STORE_LIBADD) -lsos @SOS_LIB64DIR_FLAG@ @SOS_LIBDIR_FLAG@
+## pkglib_LTLIBRARIES += libstore_sos.la
+## endif
 
 if ENABLE_FLATFILE
 libstore_flatfile_la_SOURCES = store_flatfile.c
@@ -19,20 +19,20 @@ libstore_flatfile_la_LIBADD = $(STORE_LIBADD)
 pkglib_LTLIBRARIES += libstore_flatfile.la
 endif
 
-if ENABLE_MYSQL
-libstore_mysql_la_SOURCES = store_mysql.c
-libstore_mysql_la_CFLAGS = $(AM_CFLAGS) @MYSQL_INCLUDE@
-libstore_mysql_la_LIBADD = $(STORE_LIBADD) -lmysqlclient @MYSQL_LIBS@
-pkglib_LTLIBRARIES += libstore_mysql.la
-endif
+## if ENABLE_MYSQL
+## libstore_mysql_la_SOURCES = store_mysql.c
+## libstore_mysql_la_CFLAGS = $(AM_CFLAGS) @MYSQL_INCLUDE@
+## libstore_mysql_la_LIBADD = $(STORE_LIBADD) -lmysqlclient @MYSQL_LIBS@
+## pkglib_LTLIBRARIES += libstore_mysql.la
+## endif
 
-if ENABLE_MYSQLBULK
-libstore_mysqlbulk_la_SOURCES = store_mysqlbulk.c
-libstore_mysqlbulk_la_CFLAGS = $(AM_CFLAGS) @MYSQL_INCLUDE@
-libstore_mysqlbulk_la_LIBADD = $(STORE_LIBADD) -lmysqlclient \
-			       @MYSQL_LIBS@
-pkglib_LTLIBRARIES += libstore_mysqlbulk.la
-endif
+## if ENABLE_MYSQLBULK
+## libstore_mysqlbulk_la_SOURCES = store_mysqlbulk.c
+## libstore_mysqlbulk_la_CFLAGS = $(AM_CFLAGS) @MYSQL_INCLUDE@
+## libstore_mysqlbulk_la_LIBADD = $(STORE_LIBADD) -lmysqlclient \
+## 			       @MYSQL_LIBS@
+## pkglib_LTLIBRARIES += libstore_mysqlbulk.la
+## endif
 
 if ENABLE_CSV
 libstore_csv_la_SOURCES = store_csv.c