Skip to content

Commit

Permalink
Prepare for 0.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
oschwald committed Nov 17, 2014
1 parent 9f7458e commit 94fcdda
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 9 deletions.
8 changes: 8 additions & 0 deletions Changes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
## 0.1.0 - 2014-11-17

* The module was largely rewritten. It now supports configuration contexts
and handles configuration merging.

## 0.0.1 - 2014-02-12

* Initial release.
4 changes: 2 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = \
src
SUBDIRS = src

EXTRA_DIST = t Changes.md CONTRIBUTING.md LICENSE README.md TESTING.md

5 changes: 3 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT(mod_maxminddb, 0.0.1, support@maxmind.com)
AC_INIT(mod_maxminddb, 0.1.0, support@maxmind.com)
AC_ARG_WITH(apxs, AC_HELP_STRING([--with-apxs=NAME],
[name of your apxs executable [[apxs]]]),
[APXS="$with_apxs"])
Expand All @@ -15,7 +15,8 @@ AC_CHECK_LIB(maxminddb, MMDB_lib_version, [
AC_DEFINE([HAVE_LIBMAXMINDDB], [1], [Have found libmaxminddb])
LIBMAXMINDDB_LDFLAGS='-lmaxminddb'
AC_SUBST(LIBMAXMINDDB_LDFLAGS)
][])
],
[AC_MSG_ERROR([libmaxminddb was not found])])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile src/Makefile])
AC_OUTPUT
12 changes: 7 additions & 5 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ AUTOMAKE_OPTIONS = foreign
WC=-Wc,"$(CFLAGS)"

# the default target
all: mod_maxminddb.so
all: module

# compile the DSO file
mod_maxminddb.so: $(TARGET)
module: mod_maxminddb.c $(TARGET)
$(APXS) -c $(LDFLAGS) $(LIBMAXMINDDB_LDFLAGS) $(LIBS) $(WC) $(APXS_LDFLAGS) mod_maxminddb.c

install:
install-exec-local: module
$(APXS) -i -a -n maxminddb .libs/mod_maxminddb.so

clean:
-rm -rf .libs *.o *.so *.lo *.la *.slo *.loT
CLEANFILES= *.la *.lo *.o *.so *.slo .libs/*

EXTRA_DIST= mod_maxminddb.c

0 comments on commit 94fcdda

Please sign in to comment.