Skip to content

Commit

Permalink
overall cleanup and make ready for release
Browse files Browse the repository at this point in the history
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
  • Loading branch information
fabbione committed Nov 5, 2010
1 parent c3491b7 commit 79336e5
Show file tree
Hide file tree
Showing 10 changed files with 9 additions and 576 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -5,8 +5,10 @@ autoconf
autoheader
autom4te.cache
automake
autoscan.log
compile
configure
configure.scan
config.guess
config.log
config.sub
Expand Down
5 changes: 2 additions & 3 deletions Makefile.am
Expand Up @@ -6,7 +6,8 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure depcomp \
config.guess config.sub missing install-sh \
autoheader automake autoconf libtool libtoolize \
ltmain.sh compile make/clusterautoconfig.h.in \
make/clusterautoconfig.h.in~
make/clusterautoconfig.h.in~ autoscan.log \
configure.scan

noinst_HEADERS = make/copyright.cf

Expand All @@ -17,12 +18,10 @@ SUBDIRS = fence doc
install-exec-local:
$(INSTALL) -d $(DESTDIR)/$(LOGDIR)
$(INSTALL) -d $(DESTDIR)/$(CLUSTERVARRUN)
$(INSTALL) -d $(DESTDIR)/$(CLUSTERVARLIB)

uninstall-local:
rmdir $(DESTDIR)/$(LOGDIR) || :;
rmdir $(DESTDIR)/$(CLUSTERVARRUN) || :;
rmdir $(DESTDIR)/$(CLUSTERVARLIB) || :;

maintainer-clean-local:
rm -rf m4
32 changes: 2 additions & 30 deletions configure.ac
Expand Up @@ -52,6 +52,7 @@ AM_PROG_CC_C_O
AC_PROG_LN_S
AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_PROG_AWK

## local helper functions

Expand Down Expand Up @@ -81,22 +82,14 @@ PKG_CHECK_MODULES([nss],[nss])
PKG_CHECK_MODULES([nspr],[nspr])

# Checks for header files.
AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h syslog.h unistd.h])
AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h stddef.h sys/socket.h sys/time.h syslog.h])

# Checks for typedefs, structures, and compiler characteristics.
AC_C_INLINE
AC_TYPE_INT32_T
AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_TYPE_SSIZE_T
AC_TYPE_UINT16_T
AC_TYPE_UINT32_T
AC_TYPE_UINT64_T
AC_TYPE_UINT8_T

# Checks for library functions.
AC_FUNC_FORK
AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
AC_FUNC_MALLOC
AC_CHECK_FUNCS([alarm atexit bzero dup2 memmove memset select socket strcasecmp strchr strdup strerror strtol])

Expand All @@ -105,18 +98,6 @@ AC_ARG_ENABLE([debug],
[ --enable-debug enable debug build. ],
[ default="no" ])

AC_ARG_WITH([syslogfacility],
[ --syslogfacility=FACILITY
cluster default syslog facility. ],
[ SYSLOGFACILITY="$withval" ],
[ SYSLOGFACILITY="LOG_LOCAL4" ])

AC_ARG_WITH([sysloglevel],
[ --sysloglevel=LEVEL
cluster default syslog level. ],
[ SYSLOGLEVEL="$withval" ],
[ SYSLOGLEVEL="LOG_INFO" ])

AC_ARG_WITH([fenceagentslibdir],
[ --fenceagentslibdir=PATH
installation path for fence library. ],
Expand Down Expand Up @@ -145,7 +126,6 @@ AC_ARG_WITH([default-config-file],

LOGDIR=${localstatedir}/log/cluster
CLUSTERVARRUN=${localstatedir}/run/cluster
CLUSTERVARLIB=${localstatedir}/lib/cluster

## do subst

Expand All @@ -165,17 +145,9 @@ AC_SUBST([CLUSTERVARRUN])
AC_DEFINE_UNQUOTED([CLUSTERVARRUN], "$(eval echo ${CLUSTERVARRUN})",
[Default cluster var/run directory])

AC_SUBST([CLUSTERVARLIB])

AC_SUBST([FENCEAGENTSLIBDIR])
AC_SUBST([SNMPBIN])

AC_DEFINE_UNQUOTED([SYSLOGFACILITY], $(eval echo ${SYSLOGFACILITY}),
[Default syslog facility])

AC_DEFINE_UNQUOTED([SYSLOGLEVEL], $(eval echo ${SYSLOGLEVEL}),
[Default syslog level])

## *FLAGS handling

ENV_CFLAGS="$CFLAGS"
Expand Down
6 changes: 1 addition & 5 deletions doc/Makefile.am
@@ -1,10 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in

dist_doc_DATA = gfs2.txt \
journaling.txt \
min-gfs.txt \
usage.txt \
COPYING.applications \
dist_doc_DATA = COPYING.applications \
COPYING.libraries \
COPYRIGHT \
README.licence
45 changes: 0 additions & 45 deletions doc/gfs2.txt

This file was deleted.

155 changes: 0 additions & 155 deletions doc/journaling.txt

This file was deleted.

0 comments on commit 79336e5

Please sign in to comment.