Commit 5bbec3b0 authored by Michael Ott's avatar Michael Ott
Browse files

Remove unnecessary dependencies

parent fc9a8353
......@@ -2,36 +2,27 @@ MAKEFILENAME := $(lastword $(MAKEFILE_LIST))
include config.mk
LIBRARIES = DCDBLib
PROJECTS = FilePusher SysFsPusher CollectAgent ParastationProvider IPMIPusher MontBlancPusher SNMPPusher DCDBTools DCDBBenchmark scripts webgui
PROJECTS = CollectAgent DCDBTools scripts
CASSANDRA_VERSION = 2.2.6
MOSQUITTO_VERSION = 1.3.5
BOOST_VERSION = 1.58.0
SNMP_VERSION = 5.7.3
OPENSSL_VERSION = 1.0.1u
CPPDRV_VERSION = 2.0.1
LIBUV_VERSION = 0.10.36
HTTPD_VERSION = 2.4.23
APR_VERSION = 1.5.2
APR_UTIL_VERSION = 1.5.4
SOURCEFORGE_MROR = netcologne
CPPNET_VERSION = 0.12.0-final
BOOST_VERSION_U = $(subst .,_,$(BOOST_VERSION))
DISTFILES = apache-cassandra-$(CASSANDRA_VERSION).tar.gz;http://archive.apache.org/dist/cassandra/$(CASSANDRA_VERSION)/apache-cassandra-$(CASSANDRA_VERSION)-bin.tar.gz \
mosquitto-$(MOSQUITTO_VERSION).tar.gz;http://mosquitto.org/files/source/mosquitto-$(MOSQUITTO_VERSION).tar.gz \
OpenIPMI-2.0.21.tar.gz;http://$(SOURCEFORGE_MROR).dl.sourceforge.net/project/openipmi/OpenIPMI%202.0%20Library/OpenIPMI-2.0.21.tar.gz \
boost_$(BOOST_VERSION_U).tar.gz;http://$(SOURCEFORGE_MROR).dl.sourceforge.net/project/boost/boost/$(BOOST_VERSION)/boost_$(BOOST_VERSION_U).tar.gz \
net-snmp-$(SNMP_VERSION).zip;http://$(SOURCEFORGE_MROR).dl.sourceforge.net/project/net-snmp/net-snmp/$(SNMP_VERSION)/net-snmp-$(SNMP_VERSION).zip \
openssl-$(OPENSSL_VERSION).tar.gz;ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/openssl-$(OPENSSL_VERSION).tar.gz \
cpp-driver-$(CPPDRV_VERSION).tar.gz;https://github.com/datastax/cpp-driver/archive/$(CPPDRV_VERSION).tar.gz \
libuv-v$(LIBUV_VERSION).tar.gz;http://dist.libuv.org/dist/v$(LIBUV_VERSION)/libuv-v$(LIBUV_VERSION).tar.gz \
httpd-$(HTTPD_VERSION).tar.gz;http://mirror.softaculous.com/apache//httpd/httpd-$(HTTPD_VERSION).tar.gz \
apr-util-$(APR_UTIL_VERSION).tar.gz;http://www-us.apache.org/dist//apr/apr-util-$(APR_UTIL_VERSION).tar.gz \
apr-$(APR_VERSION).tar.gz;http://www-us.apache.org/dist//apr/apr-$(APR_VERSION).tar.gz \
cpp-netlib-$(CPPNET_VERSION).tar.gz;http://downloads.cpp-netlib.org/0.12.0/cpp-netlib-$(CPPNET_VERSION).tar.gz
DISTFILES_HASHES = apache-cassandra-2.2.6.tar.gz;8e2a8696ced6c4f9db06c40b2f5a7936;mosquitto-1.3.5.tar.gz;55094ad4dc7c7985377f43d4fc3d09da;OpenIPMI-2.0.21.tar.gz;dc0b42ae40b3f1d0db2a94b75b95fae1;boost_1_58_0.tar.gz;5a5d5614d9a07672e1ab2a250b5defc5;net-snmp-5.7.3.zip;9f682bd70c717efdd9f15b686d07baee;openssl-1.0.1u.tar.gz;130bb19745db2a5a09f22ccbbf7e69d0;cpp-driver-2.0.1.tar.gz;70bf83e1cbd0d35b7e5ed66fc4dccbb1;libuv-v0.10.36.tar.gz;8eb77b4fee4f311c114a9fee06f5a2ab;httpd-2.4.23.tar.gz;b711ea7d8b75dc8bfdf5a5d7e5253088;apr-util-1.5.4.tar.gz;866825c04da827c6e5f53daff5569f42;apr-1.5.2.tar.gz;98492e965963f852ab29f9e61b2ad700;cpp-netlib-0.12.0-final.tar.gz;29b87c0e8c1a9e7fbdea5afcec947d53
DISTFILES_HASHES = apache-cassandra-2.2.6.tar.gz;8e2a8696ced6c4f9db06c40b2f5a7936;mosquitto-1.3.5.tar.gz;55094ad4dc7c7985377f43d4fc3d09da;boost_1_58_0.tar.gz;5a5d5614d9a07672e1ab2a250b5defc5;openssl-1.0.1u.tar.gz;130bb19745db2a5a09f22ccbbf7e69d0;cpp-driver-2.0.1.tar.gz;70bf83e1cbd0d35b7e5ed66fc4dccbb1;libuv-v0.10.36.tar.gz;8eb77b4fee4f311c114a9fee06f5a2ab;cpp-netlib-0.12.0-final.tar.gz;29b87c0e8c1a9e7fbdea5afcec947d53
FETCH = wget -c --no-check-certificate -O -
MD5 = $(if $(shell which md5),md5,$(if $(shell md5sum --tag Makefile 2&> /dev/null || true),md5sum --tag,openssl md5 <))
......@@ -177,43 +168,20 @@ $(DCDBDEPSPATH)/.prerequesites: $(DCDBDEPSPATH)/.extract-distfiles
fi; \
mkdir -p $(DCDBDEPSPATH)/mosquitto_build; \
cd $(DCDBDEPSPATH)/mosquitto_build && \
cmake $(CMAKE_CROSS_FLAGS) \
-DOPENSSL_ROOT_DIR=$(DCDBDEPLOYPATH)/ \
-DWITH_SRV=no \
-DWITH_TLS=yes \
-DWITH_TLS_PSK=yes \
-DCMAKE_INSTALL_PREFIX:PATH=$(DCDBDEPLOYPATH)/ \
$(DCDBDEPSPATH)/$(M) && \
make -j $(MAKETHREADS) && make install && \
touch $(DCDBDEPSPATH)/$(M)/.installed; \
cmake $(CMAKE_CROSS_FLAGS) \
-DOPENSSL_ROOT_DIR=$(DCDBDEPLOYPATH)/ \
-DWITH_SRV=no \
-DWITH_TLS=yes \
-DWITH_TLS_PSK=yes \
-DCMAKE_INSTALL_PREFIX:PATH=$(DCDBDEPLOYPATH)/ \
$(DCDBDEPSPATH)/$(M) && \
make -j $(MAKETHREADS) && make install && \
touch $(DCDBDEPSPATH)/$(M)/.installed; \
else \
echo "Skipping Mosquitto library (already built)..."; \
fi
$(eval O := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*OpenIPMI/OpenIPMI/' | sed 's/\ .*//'))
$(eval X := $(shell uname))
@if [ "$(ARCH)" = "arm" ]; then \
echo "Skipping OpenIPMI - does not build on ARM"; \
elif [ ! -e $(DCDBDEPSPATH)/$(O)/.installed ]; then \
echo ""; \
echo "Building OpenIPMI library..."; \
if [ -e $(DCDBDEPSPATH)/patches/$(O).patch ]; then \
echo "Patching OpenIPMI..."; \
cd $(DCDBDEPSPATH)/$(O) && (patch -N -p1 < $(DCDBDEPSPATH)/patches/$(O).patch || true); \
fi; \
if [ "$(X)" == "Darwin" ]; then \
echo "Fixing OpenIPMI for Mac OS..."; \
cd $(DCDBDEPSPATH)/$(O) && find . -name 'Makefile*' | xargs sed -i '' -e 's/Map/map/g'; \
fi; \
cd $(DCDBDEPSPATH)/$(O) && aclocal && automake; \
cd $(DCDBDEPSPATH)/$(O) && ./configure --prefix=$(DCDBDEPLOYPATH) --with-swig=no --with-perl=no --with-python=no \
CC="$(CC)" CFLAGS="$(CFLAGS) $(LRT)" \
$(AUTOCONF_CROSS_FLAGS); \
echo "LRT = $(LRT)" && cd $(DCDBDEPSPATH)/$(O) && make -j $(MAKETHREADS) && make install && touch $(DCDBDEPSPATH)/$(O)/.installed; \
else \
echo "Skipping OpenIPMI library (already built)..."; \
fi
$(eval B := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*boost/boost/' | sed 's/\ .*//'))
@if [ ! -e $(DCDBDEPSPATH)/$(B)/.installed ]; then \
echo ""; \
......@@ -233,23 +201,6 @@ $(DCDBDEPSPATH)/.prerequesites: $(DCDBDEPSPATH)/.extract-distfiles
echo "Skipping Boost (already built)..."; \
fi
$(eval S := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*net-snmp/net-snmp/' | sed 's/\ .*//'))
@if [ ! -e $(DCDBDEPSPATH)/$(S)/.installed ]; then \
echo ""; \
echo "Building net-snmp..."; \
if [ -e $(DCDBDEPSPATH)/patches/$(S).patch ]; then \
echo "Patching net-snmp..."; \
cd $(DCDBDEPSPATH)/$(S) && (patch -N -p1 < $(DCDBDEPSPATH)/patches/$(S).patch || true); \
fi; \
cd $(DCDBDEPSPATH)/$(S) && env CC="$(CC)" CFLAGS="$(CFLAGS)" ./configure --prefix=$(DCDBDEPLOYPATH) --with-default-snmp-version="3" \
--with-sys-contact="@@no.where" --with-sys-location="Unknown" --with-logfile="$(DCDBDEPLOYPATH)/var/log/snmpd.log" \
--with-persistent-directory="$(DCDBDEPLOYPATH)/var/net-snmp" --disable-embedded-perl --without-perl-modules \
--with-openssl=$(DCDBDEPLOYPATH) $(AUTOCONF_CROSS_FLAGS); \
cd $(DCDBDEPSPATH)/$(S) && env CFLAGS="$(CFLAGS)" make -j $(MAKETHREADS) && make install && touch $(DCDBDEPSPATH)/$(S)/.installed; \
else \
echo "Skipping net-snmp (already built)..."; \
fi
$(eval U := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*libuv/libuv/' | sed 's/\ .*//'))
@if [ ! -e $(DCDBDEPSPATH)/$(U)/.installed ]; then \
echo ""; \
......@@ -322,33 +273,6 @@ $(DCDBDEPSPATH)/.prerequesites: $(DCDBDEPSPATH)/.extract-distfiles
echo "Skipping cpp-netlib (already built)..."; \
fi
$(eval H := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*httpd/httpd/' | sed 's/\ .*//'))
$(eval A := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*apr/apr/' | sed 's/\ .*//'))
$(eval U := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*apr-util/apr-util/' | sed 's/\ .*//'))
@if [ ! -e $(DCDBDEPSPATH)/$(H)/.installed ]; then \
echo ""; \
echo "Building Apache HTTPD server..."; \
cp -a $(DCDBDEPSPATH)/$(A) $(DCDBDEPSPATH)/$(H)/srclib/apr; \
cp -a $(DCDBDEPSPATH)/$(U) $(DCDBDEPSPATH)/$(H)/srclib/apr-util; \
cd $(DCDBDEPSPATH)/$(H) && ./configure --with-included-apr --prefix=$(DCDBDEPLOYPATH); \
cd $(DCDBDEPSPATH)/$(H) && make -j $(MAKETHREADS) && make install && touch $(DCDBDEPSPATH)/$(H)/.installed; \
echo "Configuring Apache HTTPD server:"; \
echo " Setting listen port: $(HTTPD_PORT)"; \
sed -i -e 's/Listen\ 80/Listen $(HTTPD_PORT)/' $(DCDBDEPLOYPATH)/conf/httpd.conf; \
echo " Enabling mod_cgid..."; \
sed -i -e 's/#LoadModule\ cgid_module.*/LoadModule\ cgid_module\ modules\/mod_cgid.so/' $(DCDBDEPLOYPATH)/conf/httpd.conf; \
echo " Setting symlink for dcdbquery..."; \
ln -s $(DCDBDEPLOYPATH)/bin/dcdbquery $(DCDBDEPLOYPATH)/cgi-bin/; \
echo " Setting symlink for dcdbconfig..."; \
ln -s $(DCDBDEPLOYPATH)/bin/dcdbconfig $(DCDBDEPLOYPATH)/cgi-bin/; \
echo " Adding cgi-bin SymLinksIfOwnerMatch option..."; \
sed -i -e '/<Directory.*cgi-bin.>/,/<\/Directory>/ s/Options.*/Options\ SymLinksIfOwnerMatch/' $(DCDBDEPLOYPATH)/conf/httpd.conf; \
touch $(DCDBDEPSPATH)/$(H)/.installed; \
else \
echo "Skipping Apache HTTPD server (already built)..."; \
fi
@echo ""
@echo "Staging and configuring Cassandra..."
@$(eval C := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*apache-cassandra/apache-cassandra/' | sed 's/\ .*//'))
......
diff -r -U3 OpenIPMI-2.0.19/configure.in OpenIPMI-2.0.19-patched/configure.in
--- OpenIPMI-2.0.19/configure.in 2011-10-12 17:34:43.000000000 +0200
+++ OpenIPMI-2.0.19-patched/configure.in 2013-12-04 11:49:00.560170498 +0100
@@ -51,18 +51,6 @@
SNMPLIBS="$withval"
)
-POPTCFLAGS=
-AC_ARG_WITH(poptflags,
-[ --with-poptflags=flags Set the flags to compile with popt.],
- CPPFLAGS="$withval $CPPFLAGS"
-)
-
-POPTCFLAGS=
-AC_ARG_WITH(poptlibs,
-[ --with-poptlibs=libs Set the libraries to link with popt.],
- POPTLIBS="$withval"
-)
-
# If UCD SNMP requires OpenSSL, this tells where to find the crypto lib
tryopenssl=yes
AC_ARG_WITH(openssl,
@@ -280,23 +268,6 @@
AC_SUBST(OPENIPMI_VERSION_RELEASE)
AC_SUBST(OPENIPMI_VERSION_EXTRA)
-AC_SUBST(POPTLIBS)
-
-FOUND_POPT_HEADER=no
-AC_CHECK_HEADER(popt.h, FOUND_POPT_HEADER=yes; )
-if test "x$FOUND_POPT_HEADER" != "xyes"; then
- echo "Could not find headers for the popt library"
- exit 1
-fi
-
-if test "x$POPTLIBS" = "x"; then
- AC_CHECK_LIB(popt, poptHelpOptions, POPTLIBS=-lpopt)
- if test "x$POPTLIBS" = ""; then
- echo "Could not find the popt library"
- exit 1
- fi
-fi
-
# Check for GDBM
have_gdbm_h="no"
GDBM_LIB=
@@ -841,62 +812,11 @@
AC_SUBST(BIBTEX)
AC_SUBST(DVIPDF)
-OPENIPMI_SWIG_LIBS="${PYTHON_POSIX_LIB} \$(top_builddir)/lib/libOpenIPMI.la \$(top_builddir)/utils/libOpenIPMIutils.la \$(top_builddir)/cmdlang/libOpenIPMIcmdlang.la ${GLIB_SINGLE_LIB} ${TCL_LIB}"
-OPENIPMI_SWIG_SO="${PYTHON_POSIX_SO}:\$(top_builddir)/lib/.libs/libOpenIPMI.so:\$(top_builddir)/utils/.libs/libOpenIPMIutils.so:\$(top_builddir)/cmdlang/.libs/libOpenIPMIcmdlang.so:${GLIB_SINGLE_SO}:${TCL_SO}"
+OPENIPMI_SWIG_LIBS="${PYTHON_POSIX_LIB} \$(top_builddir)/lib/libOpenIPMI.la \$(top_builddir)/utils/libOpenIPMIutils.la ${GLIB_SINGLE_LIB} ${TCL_LIB}"
+OPENIPMI_SWIG_SO="${PYTHON_POSIX_SO}:\$(top_builddir)/lib/.libs/libOpenIPMI.so:\$(top_builddir)/utils/.libs/libOpenIPMIutils.so:\${GLIB_SINGLE_SO}:${TCL_SO}"
AC_SUBST(OPENIPMI_SWIG_LIBS)
AC_SUBST(OPENIPMI_SWIG_SO)
-# Everything from here to AC_OUTPUT is for libedit
-
-# AC_PROG_LIBTOOL runs AC_CANONICAL_HOST
-case $host in
- *-sun-*) AC_DEFINE([_SUNOS], [], [Solaris's term.h does horrid things.]);;
-esac
-
-AC_CHECK_LIB(curses, tgetent, TERM_LIBS=-lcurses,
- [AC_CHECK_LIB(ncursesw, tgetent, TERM_LIBS=-lncursesw,
- [AC_CHECK_LIB(ncurses, tgetent, TERM_LIBS=-lncurses,
- [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])])] )] )
-
-# Checks for header files.
-AC_FUNC_ALLOCA
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h termios.h unistd.h curses.h ncurses.h sys/cdefs.h])
-
-## include curses.h to prevent "Present But Cannot Be Compiled"
-AC_CHECK_HEADERS([term.h],,,
-[[#if HAVE_CURSES_H
-# include <curses.h>
-#elif HAVE_NCURSES_H
-# include <ncurses.h>
-#endif
-]])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_CHECK_TYPES([u_int32_t])
-
-# Checks for library functions.
-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_FORK
-AC_CHECK_FUNCS(strlcpy strlcat fgetln)
-AC_PROG_GCC_TRADITIONAL
-## _AIX is offended by rpl_malloc and rpl_realloc
-#AC_FUNC_MALLOC
-#AC_FUNC_REALLOC
-AC_TYPE_SIGNAL
-AC_FUNC_STAT
-AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid])
-EL_GETPW_R_POSIX
-EL_GETPW_R_DRAFT
-AC_SUBST(TERM_LIBS)
-
-# End of libedit inclusions
-
AC_OUTPUT(Makefile
utils/Makefile
lib/Makefile
@@ -913,8 +833,6 @@
swig/perl/Makefile
swig/python/Makefile
swig/python/openipmigui/Makefile
- libedit/Makefile
- cmdlang/Makefile
include/Makefile
include/OpenIPMI/Makefile
include/OpenIPMI/ipmiif.h
@@ -927,6 +845,4 @@
OpenIPMIposix.pc
OpenIPMIglib.pc
OpenIPMIglib12.pc
- OpenIPMItcl.pc
- OpenIPMIcmdlang.pc
- OpenIPMIui.pc)
+ OpenIPMItcl.pc)
diff -r -U3 OpenIPMI-2.0.19/Makefile.am OpenIPMI-2.0.19-patched/Makefile.am
--- OpenIPMI-2.0.19/Makefile.am 2011-10-12 17:05:09.000000000 +0200
+++ OpenIPMI-2.0.19-patched/Makefile.am 2013-12-04 11:46:09.384924417 +0100
@@ -2,16 +2,16 @@
RPMFLAGS = -ta
-SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
- ui lanserv sample doc man $(SWIG_DIR)
+SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) \
+ doc man $(SWIG_DIR)
-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
- ui lanserv sample doc man swig
+DIST_SUBDIRS = include utils lib unix glib tcl \
+ doc man swig
EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
OpenIPMI.spec ipmi.init ipmi.sysconf COPYING.BSD \
CONFIGURING_FOR_LAN
-PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIui.pc OpenIPMIposix.pc \
+PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIposix.pc \
OpenIPMIpthread.pc OpenIPMIcmdlang.pc $(GLIB_PKGCONF) \
$(GLIB12_PKGCONF) $(TCL_PKGCONF)
@@ -29,11 +29,11 @@
rpm: dist
$(RPM) $(RPMFLAGS) $(distdir).tar.gz < /dev/null
-PYPATH=$(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs:$(srcdir)/openipmigui
+PYPATH=$(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs
rungui:
LD_LIBRARY_PATH=$(top_builddir)/glib/.libs LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/.libs/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) $(top_srcdir)/swig/python/openipmigui.py
DISTCLEANFILES=OpenIPMI.spec OpenIPMIcmdlang.pc OpenIPMI.pc OpenIPMItcl.pc \
- OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIui.pc OpenIPMIglib.pc \
+ OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIglib.pc \
OpenIPMIpthread.pc OpenIPMIutils.pc
diff -r -U3 OpenIPMI-2.0.19/Makefile.in OpenIPMI-2.0.19-patched/Makefile.in
--- OpenIPMI-2.0.19/Makefile.in 2011-10-12 17:35:10.000000000 +0200
+++ OpenIPMI-2.0.19-patched/Makefile.in 2013-12-04 11:49:07.712180765 +0100
@@ -37,7 +37,7 @@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/OpenIPMI.pc.in \
- $(srcdir)/OpenIPMI.spec.in $(srcdir)/OpenIPMIcmdlang.pc.in \
+ $(srcdir)/OpenIPMI.spec.in \
$(srcdir)/OpenIPMIglib.pc.in $(srcdir)/OpenIPMIglib12.pc.in \
$(srcdir)/OpenIPMIposix.pc.in $(srcdir)/OpenIPMIpthread.pc.in \
$(srcdir)/OpenIPMItcl.pc.in $(srcdir)/OpenIPMIui.pc.in \
@@ -58,7 +58,7 @@
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = OpenIPMI.spec OpenIPMIutils.pc OpenIPMI.pc \
OpenIPMIpthread.pc OpenIPMIposix.pc OpenIPMIglib.pc \
- OpenIPMIglib12.pc OpenIPMItcl.pc OpenIPMIcmdlang.pc \
+ OpenIPMIglib12.pc OpenIPMItcl.pc \
OpenIPMIui.pc
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
@@ -204,7 +204,6 @@
PERL_INSTALL_DIR = @PERL_INSTALL_DIR@
PERL_POSIX_LIB = @PERL_POSIX_LIB@
PERL_POSIX_SO = @PERL_POSIX_SO@
-POPTLIBS = @POPTLIBS@
PYTHON_CFLAGS = @PYTHON_CFLAGS@
PYTHON_DIR = @PYTHON_DIR@
PYTHON_GUI_DIR = @PYTHON_GUI_DIR@
@@ -228,7 +227,6 @@
TCL_PKGCONF = @TCL_PKGCONF@
TCL_SO = @TCL_SO@
TCL_TARGET = @TCL_TARGET@
-TERM_LIBS = @TERM_LIBS@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -294,23 +292,23 @@
top_srcdir = @top_srcdir@
RPM = rpmbuild
RPMFLAGS = -ta
-SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
- ui lanserv sample doc man $(SWIG_DIR)
+SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) \
+ doc man $(SWIG_DIR)
-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
- ui lanserv sample doc man swig
+DIST_SUBDIRS = include utils lib unix glib tcl \
+ doc man swig
EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
OpenIPMI.spec ipmi.init ipmi.sysconf COPYING.BSD \
CONFIGURING_FOR_LAN
-PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIui.pc OpenIPMIposix.pc \
- OpenIPMIpthread.pc OpenIPMIcmdlang.pc $(GLIB_PKGCONF) \
+PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIposix.pc \
+ OpenIPMIpthread.pc $(GLIB_PKGCONF) \
$(GLIB12_PKGCONF) $(TCL_PKGCONF)
ACLOCAL_AMFLAGS = -I m4
PYPATH = $(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs:$(srcdir)/openipmigui
-DISTCLEANFILES = OpenIPMI.spec OpenIPMIcmdlang.pc OpenIPMI.pc OpenIPMItcl.pc \
+DISTCLEANFILES = OpenIPMI.spec OpenIPMI.pc OpenIPMItcl.pc \
OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIui.pc OpenIPMIglib.pc \
OpenIPMIpthread.pc OpenIPMIutils.pc
@@ -385,8 +383,6 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
OpenIPMItcl.pc: $(top_builddir)/config.status $(srcdir)/OpenIPMItcl.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-OpenIPMIcmdlang.pc: $(top_builddir)/config.status $(srcdir)/OpenIPMIcmdlang.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
OpenIPMIui.pc: $(top_builddir)/config.status $(srcdir)/OpenIPMIui.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
diff -r -U3 OpenIPMI-2.0.19/configure OpenIPMI-2.0.19-patched/configure
--- OpenIPMI-2.0.19/configure 2011-10-12 17:35:11.000000000 +0200
+++ OpenIPMI-2.0.19-patched/configure 2013-12-04 11:48:49.859155269 +0100
@@ -802,7 +802,6 @@
glibprog
pkgprog
GDBM_LIB
-POPTLIBS
OPENIPMI_VERSION_EXTRA
OPENIPMI_VERSION_RELEASE
OPENIPMI_VERSION_MINOR
@@ -923,8 +922,6 @@
with_ucdsnmp
with_snmpflags
with_snmplibs
-with_poptflags
-with_poptlibs
with_openssl
with_opensslflags
with_openssllibs
@@ -1599,8 +1596,6 @@
--with-ucdsnmp=PATH Look for ucdsnmp in PATH.
--with-snmpflags=flags Set the flags to compile with SNMP.
--with-snmplibs=libs Set the libraries to link with SNMP.
- --with-poptflags=flags Set the flags to compile with popt.
- --with-poptlibs=libs Set the libraries to link with popt.
--with-openssl[=yes|no|PATH] Look for openssl, with the optional path.
--with-opensslflags=flags Set the flags to compile with OpenSSL.
--with-openssllibs=libs Set the libraries to link with OpenSSL.
@@ -3152,24 +3147,6 @@
fi
-POPTCFLAGS=
-
-# Check whether --with-poptflags was given.
-if test "${with_poptflags+set}" = set; then :
- withval=$with_poptflags; CPPFLAGS="$withval $CPPFLAGS"
-
-fi
-
-
-POPTCFLAGS=
-
-# Check whether --with-poptlibs was given.
-if test "${with_poptlibs+set}" = set; then :
- withval=$with_poptlibs; POPTLIBS="$withval"
-
-fi
-
-
# If UCD SNMP requires OpenSSL, this tells where to find the crypto lib
tryopenssl=yes
@@ -11229,65 +11206,6 @@
-FOUND_POPT_HEADER=no
-ac_fn_c_check_header_mongrel "$LINENO" "popt.h" "ac_cv_header_popt_h" "$ac_includes_default"
-if test "x$ac_cv_header_popt_h" = x""yes; then :
- FOUND_POPT_HEADER=yes;
-fi
-
-
-if test "x$FOUND_POPT_HEADER" != "xyes"; then
- echo "Could not find headers for the popt library"
- exit 1
-fi
-
-if test "x$POPTLIBS" = "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poptHelpOptions in -lpopt" >&5
-$as_echo_n "checking for poptHelpOptions in -lpopt... " >&6; }
-if test "${ac_cv_lib_popt_poptHelpOptions+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpopt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char poptHelpOptions ();
-int
-main ()
-{
-return poptHelpOptions ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_popt_poptHelpOptions=yes
-else
- ac_cv_lib_popt_poptHelpOptions=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_popt_poptHelpOptions" >&5
-$as_echo "$ac_cv_lib_popt_poptHelpOptions" >&6; }
-if test "x$ac_cv_lib_popt_poptHelpOptions" = x""yes; then :
- POPTLIBS=-lpopt
-fi
-
- if test "x$POPTLIBS" = ""; then
- echo "Could not find the popt library"
- exit 1
- fi
-fi
-
# Check for GDBM
have_gdbm_h="no"
GDBM_LIB=
@@ -12618,1329 +12536,10 @@
-OPENIPMI_SWIG_LIBS="${PYTHON_POSIX_LIB} \$(top_builddir)/lib/libOpenIPMI.la \$(top_builddir)/utils/libOpenIPMIutils.la \$(top_builddir)/cmdlang/libOpenIPMIcmdlang.la ${GLIB_SINGLE_LIB} ${TCL_LIB}"
-OPENIPMI_SWIG_SO="${PYTHON_POSIX_SO}:\$(top_builddir)/lib/.libs/libOpenIPMI.so:\$(top_builddir)/utils/.libs/libOpenIPMIutils.so:\$(top_builddir)/cmdlang/.libs/libOpenIPMIcmdlang.so:${GLIB_SINGLE_SO}:${TCL_SO}"
-
-
-
-# Everything from here to AC_OUTPUT is for libedit
-
-# AC_PROG_LIBTOOL runs AC_CANONICAL_HOST
-case $host in
- *-sun-*)
-$as_echo "#define _SUNOS /**/" >>confdefs.h
-;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
-$as_echo_n "checking for tgetent in -lcurses... " >&6; }
-if test "${ac_cv_lib_curses_tgetent+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcurses $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char tgetent ();
-int
-main ()
-{
-return tgetent ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_curses_tgetent=yes
-else
- ac_cv_lib_curses_tgetent=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tgetent" >&5
-$as_echo "$ac_cv_lib_curses_tgetent" >&6; }
-if test "x$ac_cv_lib_curses_tgetent" = x""yes; then :
- TERM_LIBS=-lcurses
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncursesw" >&5
-$as_echo_n "checking for tgetent in -lncursesw... " >&6; }
-if test "${ac_cv_lib_ncursesw_tgetent+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncursesw $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char tgetent ();
-int
-main ()
-{
-return tgetent ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ncursesw_tgetent=yes
-else
- ac_cv_lib_ncursesw_tgetent=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_tgetent" >&5
-$as_echo "$ac_cv_lib_ncursesw_tgetent" >&6; }
-if test "x$ac_cv_lib_ncursesw_tgetent" = x""yes; then :
- TERM_LIBS=-lncursesw
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
-$as_echo_n "checking for tgetent in -lncurses... " >&6; }
-if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncurses $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char tgetent ();
-int
-main ()
-{
-return tgetent ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ncurses_tgetent=yes