From 44b21c3160794d6cbbf30e56f76924e7a9c55c3a Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 23 Oct 2011 19:21:24 +0200 Subject: [PATCH] fixed version and init.d script --- config.h.in | 9 +++++++++ configure | 3 ++- configure.ac | 22 +++++++++++++--------- debian/changelog | 7 +++++++ 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/config.h.in b/config.h.in index f68d49d..b1a3859 100644 --- a/config.h.in +++ b/config.h.in @@ -10,6 +10,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_GETOPT_H + /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY @@ -26,10 +29,16 @@ /* Define to 1 if you have the `memset' function. */ #undef HAVE_MEMSET +/* Define to 1 if you have the header file. */ +#undef HAVE_PTHREAD_H + /* Define to 1 if your system has a GNU libc compatible `realloc' function, and to 0 otherwise. */ #undef HAVE_REALLOC +/* Define to 1 if you have the header file. */ +#undef HAVE_SIGNAL_H + /* Define to 1 if you have the `sqrt' function. */ #undef HAVE_SQRT diff --git a/configure b/configure index 4451e7b..d708026 100755 --- a/configure +++ b/configure @@ -2767,6 +2767,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + ac_config_headers="$ac_config_headers config.h" ac_config_files="$ac_config_files Makefile docs/Makefile src/Makefile bin/reader/Makefile bin/logger/Makefile" @@ -4584,7 +4585,7 @@ fi done -for ac_header in fcntl.h stddef.h stdint.h stdlib.h string.h sys/time.h termios.h unistd.h +for ac_header in fcntl.h stddef.h stdint.h stdlib.h string.h sys/time.h termios.h unistd.h getopt.h signal.h pthread.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff --git a/configure.ac b/configure.ac index fc0f902..fcce313 100644 --- a/configure.ac +++ b/configure.ac @@ -2,16 +2,20 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.67]) -AC_INIT([vzlogger], [0.3.1], [http://bugs.volkszaehler.org]) -AM_INIT_AUTOMAKE(vzlogger, 0.2) + +# update version here! +AC_INIT([vzlogger], 0.3.1, [http://bugs.volkszaehler.org]) +AM_INIT_AUTOMAKE([vzlogger], 0.3.1) + AC_CONFIG_SRCDIR([src/meter.c]) AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_FILES([Makefile - docs/Makefile - src/Makefile - bin/reader/Makefile - bin/logger/Makefile - ]) +AC_CONFIG_FILES([ + Makefile + docs/Makefile + src/Makefile + bin/reader/Makefile + bin/logger/Makefile +]) # Checks for programs. AC_PROG_CC @@ -26,7 +30,7 @@ AC_PROG_RANLIB PKG_CHECK_MODULES([DEPS_VZ], [json >= 0.9 libcurl >= 7.19]) # Checks for header files. -AC_CHECK_HEADERS([fcntl.h stddef.h stdint.h stdlib.h string.h sys/time.h termios.h unistd.h]) +AC_CHECK_HEADERS([fcntl.h stddef.h stdint.h stdlib.h string.h sys/time.h termios.h unistd.h getopt.h signal.h pthread.h]) # Checks for typedefs, structures, and compiler characteristics. AC_TYPE_MODE_T diff --git a/debian/changelog b/debian/changelog index 5eaca78..bdc74e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vzlogger (0.3.1-1) stable; urgency=low + + * updated version number + * fixed forking behavior of init script + + -- Steffen Vogel Sun, 16 Oct 2011 14:45:32 +0200 + vzlogger (0.3.1) stable; urgency=low * fixed bug in parsing configuration for sml meters