Skip to content

Commit

Permalink
whitespace changes
Browse files Browse the repository at this point in the history
  • Loading branch information
tessus committed Apr 25, 2017
1 parent fa1bd5b commit d6fd5ad
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
86 changes: 43 additions & 43 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ AM_INIT_AUTOMAKE

# Add non-standard directories to the include path
AC_ARG_WITH(libraries,
[
[
--with-libraries=<path> additional place to look for libraries],
[LDFLAGS="$LDFLAGS -L $withval"],
,
[LDFLAGS="$LDFLAGS -L $withval"],
,
)
# Add non-standard includes to the include path
AC_ARG_WITH(includes,
[
[
--with-includes=<path> additional place to look for header files],
[CPPFLAGS="$CPPFLAGS -I $withval"],
,
[CPPFLAGS="$CPPFLAGS -I $withval"],
,
)


Expand All @@ -59,8 +59,8 @@ AC_LANG([C++])
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h \
string.h strings.h sys/socket.h time.h sys/time.h \
limits.h sys/param.h])
string.h strings.h sys/socket.h time.h sys/time.h \
limits.h sys/param.h])

# Checks for typedefs, structures, and compiler characteristics.
#AC_HEADER_STDBOOL # not in 2.53?
Expand All @@ -78,55 +78,55 @@ AC_CHECK_FUNCS([inet_aton memset strchr strdup kqueue strerror strstr])

# pcre {{{
AC_ARG_WITH(pcre,
[ --with-pcre=<path> prefix of pcre installation (eg /usr/local)],
[
CPPFLAGS="$CPPFLAGS -I $withval/include"
LDFLAGS="$LDFLAGS -L $withval/lib"
]
[ --with-pcre=<path> prefix of pcre installation (eg /usr/local)],
[
CPPFLAGS="$CPPFLAGS -I $withval/include"
LDFLAGS="$LDFLAGS -L $withval/lib"
]
)

AC_CHECK_HEADERS(pcre.h,
AC_SEARCH_LIBS([pcre_compile], [pcre]) ,
AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre])
AC_SEARCH_LIBS([pcre_compile], [pcre]) ,
AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre])
)
# }}}

# fam {{{
AC_ARG_WITH(fam,
[ --with-fam=<path> prefix of fam installation (eg /usr/local)],
[
CPPFLAGS="$CPPFLAGS -I $withval/include"
LDFLAGS="$LDFLAGS -L $withval/lib"
]
[ --with-fam=<path> prefix of fam installation (eg /usr/local)],
[
CPPFLAGS="$CPPFLAGS -I $withval/include"
LDFLAGS="$LDFLAGS -L $withval/lib"
]
)

AC_CHECK_HEADERS(fam.h,
AC_SEARCH_LIBS([FAMOpen], [fam]) ,
AC_MSG_WARN([*** fam.h not found -- consider using --with-fam])
AC_SEARCH_LIBS([FAMOpen], [fam]) ,
AC_MSG_WARN([*** fam.h not found -- consider using --with-fam])
)
# }}}

# adns {{{
AC_ARG_WITH(adns,
[ --with-adns=<path> prefix of adns installation (eg /usr/local)],
[
CPPFLAGS="$CPPFLAGS -I $withval/include"
LDFLAGS="$LDFLAGS -L $withval/lib"
]
[ --with-adns=<path> prefix of adns installation (eg /usr/local)],
[
CPPFLAGS="$CPPFLAGS -I $withval/include"
LDFLAGS="$LDFLAGS -L $withval/lib"
]
)

AC_CHECK_HEADERS(adns.h,
AC_SEARCH_LIBS([adns_submit], [adns]) ,
AC_MSG_WARN([*** adns.h not found -- consider using --with-adns])
AC_SEARCH_LIBS([adns_submit], [adns]) ,
AC_MSG_WARN([*** adns.h not found -- consider using --with-adns])
)
# }}}

# --with-logfile {{{
AC_ARG_WITH(logfile,
[
[
--with-logfile=<log> location of default logfile],
[AC_DEFINE_UNQUOTED(DEFAULT_LOGFILE, "$withval", [Optionally override the DEFAULT_LOGFILE in apachetop.h])],
,
[AC_DEFINE_UNQUOTED(DEFAULT_LOGFILE, "$withval", [Optionally override the DEFAULT_LOGFILE in apachetop.h])],
,
)
# }}}

Expand All @@ -135,20 +135,20 @@ AC_SEARCH_LIBS([inet_addr], [nsl])
AC_SEARCH_LIBS([attron], [ncurses])
AC_SEARCH_LIBS([tgetstr], [termcap])
AC_SEARCH_LIBS([mvprintw], [curses ncurses] ,
[] ,
[
AC_MSG_ERROR([No useful curses library found!])
]
[] ,
[
AC_MSG_ERROR([No useful curses library found!])
]
)

AC_SEARCH_LIBS([readline], [readline],
[
AC_DEFINE(HAVE_READLINE,1,[Define if you have readline library])
AC_SUBST(HAVE_READLINE)
] ,
[
AC_MSG_ERROR(readline library not found)
]
[
AC_DEFINE(HAVE_READLINE,1,[Define if you have readline library])
AC_SUBST(HAVE_READLINE)
] ,
[
AC_MSG_ERROR(readline library not found)
]
)


Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ bin_PROGRAMS = apachetop

apachetop_SOURCES = apachetop.cc log.cc inlines.cc ohtbl.cc map.cc queue.cc \
display.cc hits_circle.cc timed_circle.cc filters.cc \
resolver.cc
resolver.cc


noinst_HEADERS = apachetop.h log.h ohtbl.h map.h queue.h \
display.h hits_circle.h circle.h timed_circle.h filters.h \
resolver.h pcre_cpp_wrapper.h
resolver.h pcre_cpp_wrapper.h

MAINTAINERCLEANFILES = Makefile.in

0 comments on commit d6fd5ad

Please sign in to comment.