X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=configure.in;h=d82aed55a2ca0f7115bc53a031a1b4bfaf33d138;hb=3e3138025852408ef03f3213972e042e12841bed;hp=148b28c239951797fdfbf2e264c852dd8ead1998;hpb=376c1ce8122eff572cd196b326227cc6e0ae6eec;p=blerg.git diff --git a/configure.in b/configure.in index 148b28c..d82aed5 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ AC_PREREQ([2.65]) AC_INIT(config.h) -AM_INIT_AUTOMAKE([blerg], [1.6.1]) +AM_INIT_AUTOMAKE([blerg], [1.7]) AC_PROG_RANLIB AC_CONFIG_SRCDIR([common/app.c]) AC_CONFIG_HEADERS([config.h]) @@ -17,9 +17,10 @@ PKG_PROG_PKG_CONFIG AC_CHECK_LIB([pthread], [main]) AX_CHECK_YAJL AX_CHECK_CGIUTIL -PKG_CHECK_MODULES([MICROHTTPD], [libmicrohttpd]) -AC_SUBST([MICROHTTPD_CFLAGS]) -AC_SUBST([MICROHTTPD_LIBS]) +# blerg.httpd deprecated +#PKG_CHECK_MODULES([MICROHTTPD], [libmicrohttpd]) +#AC_SUBST([MICROHTTPD_CFLAGS]) +#AC_SUBST([MICROHTTPD_LIBS]) # Checks for header files. @@ -39,13 +40,27 @@ AC_FUNC_REALLOC AC_CHECK_FUNCS([ftruncate memset mkdir munmap select strchr strtoull]) # Needed variables for programs to function... +AC_ARG_WITH([blerg-path], +AC_HELP_STRING([--with-blerg-path=@<:@DIR@:>@], +[Base directory for database default=/var/lib/blerg] +), +[ +if test "$withval" != "no"; then + AC_DEFINE_UNQUOTED([DATA_PATH], ["$withval"], [Base data directory]) +else + AC_MSG_ERROR(blerg-path MUST be defined) +fi +], +[AC_DEFINE([BLERG_PATH], ["/var/lib/blerg"], [Base data directory])] +) + AC_ARG_WITH([blerg-data-path], AC_HELP_STRING([--with-blerg-data-path=@<:@DIR@:>@], -[Where database files will be stored default=data] +[Where account data will be stored default=data] ), [ if test "$withval" != "no"; then - AC_DEFINE_UNQUOTED([DATA_PATH], ["$withval"], [Where data is located]) + AC_DEFINE_UNQUOTED([DATA_PATH], ["$withval"], [Where account data is located]) else AC_MSG_ERROR(blerg-data-path MUST be defined) fi