diff --git a/configure.ac b/configure.ac index 889909d..b27459c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([cava], [0.3.5], [karl@stavestrand.no]) +AC_INIT([cava], [m4_esyscmd_s([git describe --always --tags --dirty])], [karl@stavestrand.no]) AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror foreign]) AC_CONFIG_MACRO_DIRS([m4]) AM_PROG_AR @@ -8,22 +8,21 @@ AC_PROG_CC_STDC AM_PROG_LIBTOOL + +dnl ############################ +dnl checking if debug is enabled +dnl ############################ + AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [enable debug messages and frequency table output]) ) AS_IF([test "x$enable_debug" = "xyes"], [ - dnl enabling debug mode not working + dnl enabling debug mode CPPFLAGS="$CPPFLAGS -DDEBUG" ]) -dnl AS_IF([test "x$enable_debug" = "xno"], [ - dnl enabling debug mode -dnl CPPFLAGS=-DDEBUG -dnl ]) - - dnl ###################### diff --git a/iniparser/Makefile b/iniparser/Makefile index 58e0d13..1c19914 100644 --- a/iniparser/Makefile +++ b/iniparser/Makefile @@ -205,10 +205,10 @@ CC = gcc -std=gnu99 CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 CPP = gcc -E -CPPFLAGS = -DDEBUG -I/usr/include/ncursesw +CPPFLAGS = -I/usr/include/ncursesw CURSES_CONFIG = /usr/bin/ncursesw5-config CYGPATH_W = echo -DEFS = -DPACKAGE_NAME=\"cava\" -DPACKAGE_TARNAME=\"cava\" -DPACKAGE_VERSION=\"0.3.5\" -DPACKAGE_STRING=\"cava\ 0.3.5\" -DPACKAGE_BUGREPORT=\"karl@stavestrand.no\" -DPACKAGE_URL=\"\" -DPACKAGE=\"cava\" -DVERSION=\"0.3.5\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_PTHREAD_H=1 -DHAVE_CURSES_H=1 +DEFS = -DPACKAGE_NAME=\"cava\" -DPACKAGE_TARNAME=\"cava\" -DPACKAGE_VERSION=\"0.3.5-25-gd6b4231-dirty\" -DPACKAGE_STRING=\"cava\ 0.3.5-25-gd6b4231-dirty\" -DPACKAGE_BUGREPORT=\"karl@stavestrand.no\" -DPACKAGE_URL=\"\" -DPACKAGE=\"cava\" -DVERSION=\"0.3.5-25-gd6b4231-dirty\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_PTHREAD_H=1 -DHAVE_CURSES_H=1 DEPDIR = .deps DLLTOOL = false DSYMUTIL = @@ -245,10 +245,10 @@ OTOOL64 = PACKAGE = cava PACKAGE_BUGREPORT = karl@stavestrand.no PACKAGE_NAME = cava -PACKAGE_STRING = cava 0.3.5 +PACKAGE_STRING = cava 0.3.5-25-gd6b4231-dirty PACKAGE_TARNAME = cava PACKAGE_URL = -PACKAGE_VERSION = 0.3.5 +PACKAGE_VERSION = 0.3.5-25-gd6b4231-dirty PATH_SEPARATOR = : RANLIB = ranlib SED = /bin/sed @@ -256,7 +256,7 @@ SET_MAKE = SHELL = /bin/bash STRIP = strip SYSTEM_LIBINIPARSER = 0 -VERSION = 0.3.5 +VERSION = 0.3.5-25-gd6b4231-dirty abs_builddir = /home/karl/cava/iniparser abs_srcdir = /home/karl/cava/iniparser abs_top_builddir = /home/karl/cava