From: "Fabio M. Di Nitto" <fdinitto@xxxxxxxxxx>
yet another leftover from the past that can go away
Signed-off-by: Fabio M. Di Nitto <fdinitto@xxxxxxxxxx>
---
Makefile.am | 2 --
configure.ac | 10 +---------
include/Makefile.am | 2 +-
include/corosync/.gitignore | 1 -
include/corosync/cs_config.h.in | 2 --
pkgconfig/Makefile.am | 1 -
pkgconfig/corosync.pc.in | 1 -
7 files changed, 2 insertions(+), 17 deletions(-)
delete mode 100644 include/corosync/cs_config.h.in
diff --git a/Makefile.am b/Makefile.am
index 4e535ff..182b001 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,14 +68,12 @@ install-exec-local:
$(INSTALL) -d $(DESTDIR)/${COROSYSCONFDIR}/uidgid.d
$(INSTALL) -d $(DESTDIR)/${localstatedir}/lib/corosync
$(INSTALL) -d $(DESTDIR)/${localstatedir}/log/cluster
- $(INSTALL) -d $(DESTDIR)/${SOCKETDIR}
uninstall-local:
rmdir $(DESTDIR)/${COROSYSCONFDIR}/service.d || :;
rmdir $(DESTDIR)/${COROSYSCONFDIR}/uidgid.d || :;
rmdir $(DESTDIR)/${localstatedir}/lib/corosync || :;
rmdir $(DESTDIR)/${localstatedir}/log/cluster || :;
- rmdir $(DESTDIR)/${SOCKETDIR} || :;
if AUGTOOL
check_SCRIPTS = test_lense.sh
diff --git a/configure.ac b/configure.ac
index b426db9..fbaabac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AM_INIT_AUTOMAKE([-Wno-portability])
AM_SILENT_RULES([yes])
AC_CONFIG_SRCDIR([lib/cpg.c])
-AC_CONFIG_HEADER([include/corosync/config.h include/corosync/cs_config.h])
+AC_CONFIG_HEADER([include/corosync/config.h])
AC_CANONICAL_HOST
@@ -288,11 +288,6 @@ AC_ARG_WITH([initddir],
[ INITDDIR="$withval" ],
[ INITDDIR="$sysconfdir/init.d" ])
-AC_ARG_WITH([socket-dir],
- [ --with-socket-dir=DIR : corosync socket dir. ],
- [ SOCKETDIR="$withval" ],
- [ SOCKETDIR="$localstatedir/run" ])
-
AC_ARG_ENABLE([snmp],
[ --enable-snmp : SNMP protocol support ],
[ default="no" ])
@@ -594,7 +589,6 @@ LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS"
# substitute what we need:
AC_SUBST([INITDDIR])
-AC_SUBST([SOCKETDIR])
AC_SUBST([SOMAJOR])
AC_SUBST([SOMINOR])
@@ -618,7 +612,6 @@ AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}")
AC_SUBST([LINT_FLAGS])
-AC_DEFINE_UNQUOTED([SOCKETDIR], "$(eval echo ${SOCKETDIR})", [Socket directory])
AC_DEFINE_UNQUOTED([LOCALSTATEDIR], "$(eval echo ${localstatedir})", [localstate directory])
COROSYSCONFDIR=${sysconfdir}/corosync
@@ -643,7 +636,6 @@ AC_MSG_RESULT([ State information = ${localstatedir}])
AC_MSG_RESULT([ System configuration = ${sysconfdir}])
AC_MSG_RESULT([ System init.d directory = ${INITDDIR}])
AC_MSG_RESULT([ corosync config dir = ${COROSYSCONFDIR}])
-AC_MSG_RESULT([ SOCKETDIR = ${SOCKETDIR}])
AC_MSG_RESULT([ Features =${PACKAGE_FEATURES}])
AC_MSG_RESULT([])
AC_MSG_RESULT([$PACKAGE build info:])
diff --git a/include/Makefile.am b/include/Makefile.am
index 780d012..c056674 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -36,7 +36,7 @@ CS_H = hdb.h cpg.h cfg.h corodefs.h \
CS_INTERNAL_H = ipc_cfg.h ipc_cpg.h ipc_quorum.h \
quorum.h sq.h ipc_votequorum.h ipc_cmap.h \
- logsys.h coroapi.h icmap.h mar_gen.h list.h swab.h cs_config.h
+ logsys.h coroapi.h icmap.h mar_gen.h list.h swab.h
TOTEM_H = totem.h totemip.h totempg.h
diff --git a/include/corosync/.gitignore b/include/corosync/.gitignore
index 7c9b0fc..6754e35 100644
--- a/include/corosync/.gitignore
+++ b/include/corosync/.gitignore
@@ -1,3 +1,2 @@
config.h*
-cs_config.h
stamp-*
diff --git a/include/corosync/cs_config.h.in b/include/corosync/cs_config.h.in
deleted file mode 100644
index 37f7212..0000000
--- a/include/corosync/cs_config.h.in
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Location of sockets */
-#undef SOCKETDIR
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 597a5dc..70fce1d 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -56,7 +56,6 @@ lib%.pc: libtemplate.pc.in Makefile
-e 's#@''PREFIX@#$(exec_prefix)#g' \
-e 's#@''LIBDIR@#$(libdir)#g' \
-e 's#@''LIBVERSION@#$(VERSION)#g' \
- -e 's#@''COROSOCKETDIR@#$(SOCKETDIR)#g' \
$< > $@-t
chmod a-w $@-t
mv $@-t $@
diff --git a/pkgconfig/corosync.pc.in b/pkgconfig/corosync.pc.in
index f166d01..031aac9 100644
--- a/pkgconfig/corosync.pc.in
+++ b/pkgconfig/corosync.pc.in
@@ -2,7 +2,6 @@ prefix=@PREFIX@
exec_prefix=${prefix}
libdir=@LIBDIR@
includedir=${prefix}/include
-socketdir=@COROSOCKETDIR@
Name: corosync
Version: @LIBVERSION@
--
1.7.7.6
_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss
