Permalink
Browse files

bug#482 : fixing configure/compilation issues

  • Loading branch information...
Douglas E. Warner
Douglas E. Warner committed Mar 27, 2008
1 parent ebe3688 commit 3579eb469a2fb9b897c8ad4f6fedc5276c1f9284
Showing with 5,001 additions and 4,700 deletions.
  1. +88 −69 Makefile.in
  2. +93 −81 aclocal.m4
  3. +1 −1 bootstrap
  4. +4,007 −3,299 configure
  5. +3 −3 configure.ac
  6. +57 −39 etc/Makefile.in
  7. +1 −1 etc/netmrg.xml.in
  8. +53 −34 m4/Makefile.in
  9. +0 −23 m4/codeset.m4
  10. +118 −186 m4/gettext.m4
  11. +0 −32 m4/glibc21.m4
  12. +3 −5 m4/iconv.m4
  13. +0 −72 m4/intdiv0.m4
  14. +0 −32 m4/intmax.m4
  15. +0 −32 m4/inttypes-pri.m4
  16. +0 −27 m4/inttypes.m4
  17. +0 −28 m4/inttypes_h.m4
  18. +0 −26 m4/isc-posix.m4
  19. +0 −32 m4/lcmessage.m4
  20. +3 −5 m4/lib-ld.m4
  21. +112 −19 m4/lib-link.m4
  22. +41 −11 m4/lib-prefix.m4
  23. +0 −30 m4/longdouble.m4
  24. +0 −25 m4/longlong.m4
  25. +7 −25 m4/nls.m4
  26. +57 −55 m4/po.m4
  27. +0 −46 m4/printf-posix.m4
  28. +8 −7 m4/progtest.m4
  29. +0 −19 m4/signed.m4
  30. +0 −61 m4/size_max.m4
  31. +0 −28 m4/stdint_h.m4
  32. +0 −32 m4/uintmax_t.m4
  33. +0 −25 m4/ulonglong.m4
  34. +0 −22 m4/wchar_t.m4
  35. +0 −22 m4/wint_t.m4
  36. +0 −14 m4/xsize.m4
  37. +3 −3 po/Makefile.in.in
  38. +3 −0 share/doc/ChangeLog
  39. +79 −58 src/Makefile.in
  40. +2 −1 src/events.cpp
  41. +9 −1 src/include/config.h.in
  42. +1 −1 src/include/netmrg.h.in
  43. +4 −2 src/netmrg.cpp
  44. +2 −0 subst.in
  45. +68 −47 var/Makefile.in
  46. +68 −47 var/lib/Makefile.in
  47. +55 −36 var/lib/rrd/Makefile.in
  48. +55 −36 www/Makefile.in
View
@@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
# These settings are pulled into Makefile.in by automake
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,7 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/config.h
CONFIG_CLEAN_FILES = subst bin/rrdedit src/include/netmrg.h \
@@ -77,10 +73,11 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-exec-recursive install-info-recursive \
install-recursive installcheck-recursive installdirs-recursive \
pdf-recursive ps-recursive uninstall-info-recursive \
uninstall-recursive
install-dvi-recursive install-exec-recursive \
install-html-recursive install-info-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -98,6 +95,8 @@ DATA = $(netmrg_man1_DATA) $(netmrg_share_bindstats_DATA) \
$(netmrg_share_db_DATA) $(netmrg_share_doc_DATA) \
$(netmrg_share_html_DATA) $(netmrg_share_images_DATA) \
$(netmrg_var_log_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -113,8 +112,6 @@ GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -138,11 +135,15 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
@@ -152,8 +153,9 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
MYSQL_CONFIG = @MYSQL_CONFIG@
OBJEXT = @OBJEXT@
@@ -173,13 +175,13 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WWWDIR = @WWWDIR@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -191,28 +193,39 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_MAKEFLAGS = \
` test "$(VERBOSE)" = "1" && echo $(ECHO_N) "" \
|| echo $(ECHO_N) "-s" `
@@ -295,7 +308,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
src/include/config.h: src/include/stamp-h1
@if test ! -f $@; then \
rm -f src/include/stamp-h1; \
$(MAKE) src/include/stamp-h1; \
$(MAKE) $(AM_MAKEFLAGS) src/include/stamp-h1; \
else :; fi
src/include/stamp-h1: $(top_srcdir)/src/include/config.h.in $(top_builddir)/config.status
@@ -332,7 +345,6 @@ uninstall-netmrg_libexecSCRIPTS:
echo " rm -f '$(DESTDIR)$(netmrg_libexecdir)/$$f'"; \
rm -f "$(DESTDIR)$(netmrg_libexecdir)/$$f"; \
done
uninstall-info-am:
uninstall-netmrg_man1DATA:
@$(NORMAL_UNINSTALL)
@@ -383,7 +395,7 @@ uninstall-netmrg_share_imagesDATA:
done
install-netmrg_var_logDATA: $(netmrg_var_log_DATA)
@$(NORMAL_INSTALL)
test -z "$(netmrg_var_logdir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_var_logdir)"
test -z "$(netmrg_var_logdir)" || $(MKDIR_P) "$(DESTDIR)$(netmrg_var_logdir)"
@list='$(netmrg_var_log_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -430,8 +442,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -533,24 +544,22 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
$(mkdir_p) $(distdir)/. $(distdir)/bin $(distdir)/etc $(distdir)/m4 $(distdir)/po $(distdir)/src/include $(distdir)/www/include
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
test -d $(distdir) || mkdir $(distdir)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
$(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -564,22 +573,24 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(mkdir_p) "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
(cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
done
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -654,7 +665,7 @@ distcheck: dist
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -679,7 +690,7 @@ all-am: Makefile $(SCRIPTS) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(netmrg_libexecdir)" "$(DESTDIR)$(netmrg_man1dir)" "$(DESTDIR)$(netmrg_share_bindstatsdir)" "$(DESTDIR)$(netmrg_share_dbdir)" "$(DESTDIR)$(netmrg_share_docdir)" "$(DESTDIR)$(netmrg_share_htmldir)" "$(DESTDIR)$(netmrg_share_imagesdir)" "$(DESTDIR)$(netmrg_var_logdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -725,12 +736,20 @@ install-data-am: install-netmrg_man1DATA \
install-netmrg_share_docDATA install-netmrg_share_htmlDATA \
install-netmrg_share_imagesDATA install-netmrg_var_logDATA
install-dvi: install-dvi-recursive
install-exec-am: install-binSCRIPTS install-netmrg_libexecSCRIPTS
install-html: install-html-recursive
install-info: install-info-recursive
install-man:
install-pdf: install-pdf-recursive
install-ps: install-ps-recursive
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -751,35 +770,35 @@ ps: ps-recursive
ps-am:
uninstall-am: uninstall-binSCRIPTS uninstall-info-am \
uninstall-netmrg_libexecSCRIPTS uninstall-netmrg_man1DATA \
uninstall-netmrg_share_bindstatsDATA \
uninstall-am: uninstall-binSCRIPTS uninstall-netmrg_libexecSCRIPTS \
uninstall-netmrg_man1DATA uninstall-netmrg_share_bindstatsDATA \
uninstall-netmrg_share_dbDATA uninstall-netmrg_share_docDATA \
uninstall-netmrg_share_htmlDATA \
uninstall-netmrg_share_imagesDATA uninstall-netmrg_var_logDATA
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am clean clean-generic clean-recursive ctags \
ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
dist-tarZ dist-zip distcheck distclean distclean-generic \
distclean-hdr distclean-recursive distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-binSCRIPTS \
install-data install-data-am install-exec install-exec-am \
install-info install-info-am install-man \
install-netmrg_libexecSCRIPTS install-netmrg_man1DATA \
install-netmrg_share_bindstatsDATA install-netmrg_share_dbDATA \
install-netmrg_share_docDATA install-netmrg_share_htmlDATA \
install-netmrg_share_imagesDATA install-netmrg_var_logDATA \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-generic \
mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am \
uninstall-netmrg_libexecSCRIPTS uninstall-netmrg_man1DATA \
uninstall-netmrg_share_bindstatsDATA \
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \
info-am install install-am install-binSCRIPTS install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-netmrg_libexecSCRIPTS \
install-netmrg_man1DATA install-netmrg_share_bindstatsDATA \
install-netmrg_share_dbDATA install-netmrg_share_docDATA \
install-netmrg_share_htmlDATA install-netmrg_share_imagesDATA \
install-netmrg_var_logDATA install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-binSCRIPTS uninstall-netmrg_libexecSCRIPTS \
uninstall-netmrg_man1DATA uninstall-netmrg_share_bindstatsDATA \
uninstall-netmrg_share_dbDATA uninstall-netmrg_share_docDATA \
uninstall-netmrg_share_htmlDATA \
uninstall-netmrg_share_imagesDATA uninstall-netmrg_var_logDATA
Oops, something went wrong.

0 comments on commit 3579eb4

Please sign in to comment.