From: Tobias Oetiker Date: Tue, 12 Sep 2017 12:05:53 +0000 (+0200) Subject: update infrastructure files X-Git-Tag: v1.7.1~113 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d74882a171165b8679a4d2202f933f88d82eb1c2;p=thirdparty%2Frrdtool-1.x.git update infrastructure files --- diff --git a/.travis.yml b/.travis.yml index fdce9819..6300cd28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ perl: install: - sudo apt-get update || true - - sudo apt-get install autopoint libdbi-dev tcl-dev lua5.1 liblua5.1-0-dev valgrind dc python-pip python-setuptools + - sudo apt-get install autopoint libdbi-dev tcl-dev lua5.1 liblua5.1-0-dev valgrind dc python-pip python-setuptools libpango1.0-dev - sudo pip install cpp-coveralls before_script: diff --git a/bindings/tcl/Makefile.in b/bindings/tcl/Makefile.in index d39d6981..44693fd7 100644 --- a/bindings/tcl/Makefile.in +++ b/bindings/tcl/Makefile.in @@ -137,11 +137,10 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgindexdir)" \ - "$(DESTDIR)$(tclpkgdir)" "$(DESTDIR)$(pkgindexdir)" \ +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(tclpkgdir)" \ "$(DESTDIR)$(tclpkgdir)" LIBRARIES = $(lib_LIBRARIES) -SCRIPTS = $(pkgindex_SCRIPTS) $(tclpkg_SCRIPTS) +SCRIPTS = $(tclpkg_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -161,7 +160,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -DATA = $(pkgindex_DATA) $(tclpkg_DATA) +DATA = $(tclpkg_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/ifOctets.tcl.in \ README @@ -375,12 +374,14 @@ SRC_DIR = $(top_srcdir)/src AM_CPPFLAGS = $(TCL_INCLUDE_SPEC) -I$(top_builddir)/src -I$(SRC_DIR) -DUSE_TCL_STUBS LIBDIRS = -L$(top_builddir)/src/.libs -L$(top_builddir)/src -L$(libdir) LIB_RUNTIME_DIR = $(libdir) +@BUILD_TCL_SITE_FALSE@tclpkgdir = $(pkglibdir) @BUILD_TCL_SITE_TRUE@tclpkgdir = @TCL_PACKAGE_DIR@ +@BUILD_TCL_SITE_FALSE@tclpkg_DATA = pkgIndex.tcl @BUILD_TCL_SITE_TRUE@tclpkg_DATA = pkgIndex.tcl +@BUILD_TCL_SITE_FALSE@tclpkg_SCRIPTS = ifOctets.tcl @BUILD_TCL_SITE_TRUE@tclpkg_SCRIPTS = ifOctets.tcl -@BUILD_TCL_SITE_FALSE@pkgindexdir = $(pkglibdir) -@BUILD_TCL_SITE_FALSE@pkgindex_DATA = pkgIndex.tcl -@BUILD_TCL_SITE_FALSE@pkgindex_SCRIPTS = ifOctets.tcl +@BUILD_TCL_SITE_FALSE@tclpkg_rellibdir = .. +@BUILD_TCL_SITE_TRUE@tclpkg_rellibdir = $(libdir) # Automake doesn't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as # library name. So we build and install this library `by hand'. @@ -456,41 +457,6 @@ uninstall-libLIBRARIES: clean-libLIBRARIES: -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) -install-pkgindexSCRIPTS: $(pkgindex_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(pkgindex_SCRIPTS)'; test -n "$(pkgindexdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkgindexdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pkgindexdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pkgindexdir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pkgindexdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-pkgindexSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(pkgindex_SCRIPTS)'; test -n "$(pkgindexdir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(pkgindexdir)'; $(am__uninstall_files_from_dir) install-tclpkgSCRIPTS: $(tclpkg_SCRIPTS) @$(NORMAL_INSTALL) @list='$(tclpkg_SCRIPTS)'; test -n "$(tclpkgdir)" || list=; \ @@ -532,27 +498,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-pkgindexDATA: $(pkgindex_DATA) - @$(NORMAL_INSTALL) - @list='$(pkgindex_DATA)'; test -n "$(pkgindexdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkgindexdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pkgindexdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgindexdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgindexdir)" || exit $$?; \ - done - -uninstall-pkgindexDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgindex_DATA)'; test -n "$(pkgindexdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(pkgindexdir)'; $(am__uninstall_files_from_dir) install-tclpkgDATA: $(tclpkg_DATA) @$(NORMAL_INSTALL) @list='$(tclpkg_DATA)'; test -n "$(tclpkgdir)" || list=; \ @@ -615,7 +560,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(SCRIPTS) $(DATA) all-local installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgindexdir)" "$(DESTDIR)$(tclpkgdir)" "$(DESTDIR)$(pkgindexdir)" "$(DESTDIR)$(tclpkgdir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(tclpkgdir)" "$(DESTDIR)$(tclpkgdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -670,8 +615,7 @@ info: info-am info-am: -install-data-am: install-pkgindexDATA install-pkgindexSCRIPTS \ - install-tclpkgDATA install-tclpkgSCRIPTS +install-data-am: install-tclpkgDATA install-tclpkgSCRIPTS install-dvi: install-dvi-am @@ -715,8 +659,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-libLIBRARIES uninstall-pkgindexDATA \ - uninstall-pkgindexSCRIPTS uninstall-tclpkgDATA \ +uninstall-am: uninstall-libLIBRARIES uninstall-tclpkgDATA \ uninstall-tclpkgSCRIPTS .MAKE: install-am install-strip @@ -729,13 +672,11 @@ uninstall-am: uninstall-libLIBRARIES uninstall-pkgindexDATA \ install-exec install-exec-am install-exec-local install-html \ install-html-am install-info install-info-am \ install-libLIBRARIES install-man install-pdf install-pdf-am \ - install-pkgindexDATA install-pkgindexSCRIPTS install-ps \ - install-ps-am install-strip install-tclpkgDATA \ + install-ps install-ps-am install-strip install-tclpkgDATA \ install-tclpkgSCRIPTS installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am uninstall-libLIBRARIES \ - uninstall-pkgindexDATA uninstall-pkgindexSCRIPTS \ uninstall-tclpkgDATA uninstall-tclpkgSCRIPTS .PRECIOUS: Makefile @@ -750,7 +691,7 @@ tclrrd.o: tclrrd.c $(CC) $(AM_CFLAGS) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -c $(srcdir)/tclrrd.c -DVERSION=\"$(VERSION)\" pkgIndex.tcl: - echo "package ifneeded Rrd $(VERSION) \"load $(libdir)/tclrrd$(VERSION)[info sharedlibextension]\"" > $@ + echo "package ifneeded Rrd $(VERSION) [list load [file join \$$dir $(tclpkg_rellibdir)/tclrrd$(VERSION)[info sharedlibextension]]]" > $@ install-exec-local: $(TCL_RRD_LIB) @$(NORMAL_INSTALL) diff --git a/configure b/configure index 26b3ce1b..2728e56c 100755 --- a/configure +++ b/configure @@ -20167,6 +20167,270 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to include gthreads for g_thread_init" >&5 +$as_echo_n "checking whether we need to include gthreads for g_thread_init... " >&6; } +if ${ac_cv_glibc_g_thread_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +#if !GLIB_CHECK_VERSION(2, 32, 0) + # error "glib needs g_thread_init" + #endif + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +else + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + EX_CHECK_STATE=NO + ex_check_save_LIBS=${LIBS} + ex_check_save_CPPFLAGS=${CPPFLAGS} + ex_check_save_LDFLAGS=${LDFLAGS} + if test "x""" != "x"; then + CPPFLAGS="$CPPFLAGS -I""" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for g_thread_init in -lgthread-2.0" >&5 +$as_echo_n "checking for g_thread_init in -lgthread-2.0... " >&6; } +if ${ac_cv_lib_gthread_2_0_g_thread_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgthread-2.0 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char g_thread_init (); +int +main () +{ +return g_thread_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gthread_2_0_g_thread_init=yes +else + ac_cv_lib_gthread_2_0_g_thread_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gthread_2_0_g_thread_init" >&5 +$as_echo "$ac_cv_lib_gthread_2_0_g_thread_init" >&6; } +if test "x$ac_cv_lib_gthread_2_0_g_thread_init" = xyes; then : + + ac_fn_c_check_header_mongrel "$LINENO" "glib.h" "ac_cv_header_glib_h" "$ac_includes_default" +if test "x$ac_cv_header_glib_h" = xyes; then : + LIBS="-lgthread-2.0 ${LIBS}";EX_CHECK_STATE=YES +fi + + +fi + + if test $EX_CHECK_STATE = NO; then + for ac_prog in pkg-config +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PKGCONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PKGCONFIG"; then + ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_PKGCONFIG="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +PKGCONFIG=$ac_cv_prog_PKGCONFIG +if test -n "$PKGCONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 +$as_echo "$PKGCONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$PKGCONFIG" && break +done +test -n "$PKGCONFIG" || PKGCONFIG="no" + + if test "$PKGCONFIG" != "no"; then + if $PKGCONFIG --exists gthread-2.0; then + CPPFLAGS=${CPPFLAGS}" "`$PKGCONFIG --cflags gthread-2.0` + LDFLAGS=${LDFLAGS}" "`$PKGCONFIG --libs-only-L gthread-2.0` + LDFLAGS=${LDFLAGS}" "`$PKGCONFIG --libs-only-other gthread-2.0` + LIBS=${LIBS}" "`$PKGCONFIG --libs-only-l gthread-2.0` + unset ac_cv_lib_`echo gthread-2.0 | sed 's/[^_a-zA-Z0-9]/_/g;s/^[0-9]/_/'`_g_thread_init + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for g_thread_init in -lgthread-2.0" >&5 +$as_echo_n "checking for g_thread_init in -lgthread-2.0... " >&6; } +if ${ac_cv_lib_gthread_2_0_g_thread_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgthread-2.0 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char g_thread_init (); +int +main () +{ +return g_thread_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gthread_2_0_g_thread_init=yes +else + ac_cv_lib_gthread_2_0_g_thread_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gthread_2_0_g_thread_init" >&5 +$as_echo "$ac_cv_lib_gthread_2_0_g_thread_init" >&6; } +if test "x$ac_cv_lib_gthread_2_0_g_thread_init" = xyes; then : + + unset ac_cv_header_`echo glib.h | sed 's/[^_a-zA-Z0-9]/_/g;s/^[0-9]/_/'` + ac_fn_c_check_header_mongrel "$LINENO" "glib.h" "ac_cv_header_glib_h" "$ac_includes_default" +if test "x$ac_cv_header_glib_h" = xyes; then : + EX_CHECK_STATE=YES +fi + + + +fi + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +---------------------------------------------------------------------------- +* I found a copy of pkgconfig, but there is no gthread-2.0.pc file around. + You may want to set the PKG_CONFIG_PATH variable to point to its + location. +---------------------------------------------------------------------------- + " >&5 +$as_echo "$as_me: WARNING: +---------------------------------------------------------------------------- +* I found a copy of pkgconfig, but there is no gthread-2.0.pc file around. + You may want to set the PKG_CONFIG_PATH variable to point to its + location. +---------------------------------------------------------------------------- + " >&2;} + fi + fi + fi + + if test ${EX_CHECK_STATE} = NO; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +---------------------------------------------------------------------------- +* I could not find a working copy of gthread-2.0. Check config.log for hints on why + this is the case. Maybe you need to set LDFLAGS and CPPFLAGS appropriately + so that compiler and the linker can find libgthread-2.0 and its header files. If + you have not installed gthread-2.0, you can get it either from its original home on + + \"\" + + You can find also find an archive copy on + + http://oss.oetiker.ch/rrdtool/pub/libs + + The last tested version of gthread-2.0 is x.x.x. + + LIBS=$LIBS + LDFLAGS=$LDFLAGS + CPPFLAGS=$CPPFLAGS + +---------------------------------------------------------------------------- + " >&5 +$as_echo "$as_me: WARNING: +---------------------------------------------------------------------------- +* I could not find a working copy of gthread-2.0. Check config.log for hints on why + this is the case. Maybe you need to set LDFLAGS and CPPFLAGS appropriately + so that compiler and the linker can find libgthread-2.0 and its header files. If + you have not installed gthread-2.0, you can get it either from its original home on + + \"\" + + You can find also find an archive copy on + + http://oss.oetiker.ch/rrdtool/pub/libs + + The last tested version of gthread-2.0 is x.x.x. + + LIBS=$LIBS + LDFLAGS=$LDFLAGS + CPPFLAGS=$CPPFLAGS + +---------------------------------------------------------------------------- + " >&2;} + EX_CHECK_ALL_ERR=YES + LIBS="${ex_check_save_LIBS}" + CPPFLAGS="${ex_check_save_CPPFLAGS}" + LDFLAGS="${ex_check_save_LDFLAGS}" + fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_glibc_g_thread_init" >&5 +$as_echo "$ac_cv_glibc_g_thread_init" >&6; } + ac_fn_c_check_func "$LINENO" "g_regex_new" "ac_cv_func_g_regex_new" if test "x$ac_cv_func_g_regex_new" = xyes; then : diff --git a/src/Makefile.in b/src/Makefile.in index 204abc2e..6848c2b5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -540,7 +540,7 @@ librrd_la_DEPENDENCIES = librrdupd.la librrd_la_LIBADD = librrdupd.la $(ALL_LIBS) $(LIBINTL) librrd_la_CFLAGS = $(AM_CFLAGS) $(MULTITHREAD_CFLAGS) librrd_la_LDFLAGS = $(MULTITHREAD_LDFLAGS) -version-info @LIBVERS@ \ - -export-symbols librrd.sym + -export-symbols $(srcdir)/librrd.sym include_HEADERS = rrd.h rrd_format.h rrd_client.h rrdcgi_SOURCES = rrd_cgi.c rrdcgi_LDADD = librrd.la librrdupd.la