build: drop obsoleted SOCKETDIR option

yet another leftover from the past that can go away

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Reviewed-by: Steven Dake <sdake@redhat.com>

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

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
 
@@ -289,11 +289,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" ])
@@ -595,7 +590,6 @@ LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS"
 
 # substitute what we need:
 AC_SUBST([INITDDIR])
-AC_SUBST([SOCKETDIR])
 
 AC_SUBST([SOMAJOR])
 AC_SUBST([SOMINOR])
@@ -619,7 +613,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
@@ -644,7 +637,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:])

include/Makefile.am

@@ -36,7 +36,7 @@ CS_H			= hdb.h cpg.h cfg.h evs.h corodefs.h \
 
 CS_INTERNAL_H		= ipc_cfg.h ipc_cpg.h ipc_evs.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
 

include/corosync/.gitignore

@@ -1,3 +1,2 @@
 config.h*
-cs_config.h
 stamp-*

include/corosync/cs_config.h.in

@@ -1,2 +0,0 @@
-/* Location of sockets */
-#undef SOCKETDIR

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 $@

pkgconfig/corosync.pc.in

@@ -2,7 +2,6 @@ prefix=@PREFIX@
 exec_prefix=${prefix}
 libdir=@LIBDIR@
 includedir=${prefix}/include
-socketdir=@COROSOCKETDIR@
 
 Name: corosync
 Version: @LIBVERSION@