diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | config.h.in | 6 | ||||
| -rw-r--r-- | configure.ac | 33 | ||||
| -rw-r--r-- | examples/Makefile.am | 2 |
4 files changed, 41 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 7462988..c1148eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## top directory #Build in these directories: -SUBDIRS= $(GENERIC_LIBRARY_NAME) examples +SUBDIRS= $(GENERIC_LIBRARY_NAME) $(NANOHTTP_LIBRARY_NAME) examples #Distribute these directories: DIST_SUBDIRS = $(GENERIC_LIBRARY_NAME) diff --git a/config.h.in b/config.h.in index cb48434..7b39ea8 100644 --- a/config.h.in +++ b/config.h.in @@ -51,6 +51,9 @@ /* Define to 1 if you have the `vprintf' function. */ #undef HAVE_VPRINTF +/* Name of package */ +#undef PACKAGE + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -69,6 +72,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Version number of package */ +#undef VERSION + /* Define to empty if `const' does not conform to ANSI C. */ #undef const diff --git a/configure.ac b/configure.ac index e3a4c06..a51cae9 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,19 @@ GENERIC_LIBRARY_VERSION=1:0:0 # +- increment if interfaces have been added, removed or changed +NANOHTTP_LIBRARY_NAME=nanohttp +#release versioning +NANOHTTP_MAJOR_VERSION=1 +NANOHTTP_MINOR_VERSION=0 +NANOHTTP_MICRO_VERSION=0 + +#API version (often = GENERIC_MAJOR_VERSION.GENERIC_MINOR_VERSION) +NANOHTTP_API_VERSION=1.0 +AC_SUBST(NANOHTTP_API_VERSION) + +#shared library versioning +NANOHTTP_LIBRARY_VERSION=1:0:0 + dnl -------------------------------- dnl Package name and version number dnl -------------------------------- @@ -53,6 +66,22 @@ VERSION=$GENERIC_VERSION AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) +dnl -------------------------------- +dnl Package name and version number (nanohttp) +dnl -------------------------------- + +AC_SUBST(NANOHTTP_LIBRARY_VERSION) + +PACKAGE=$NANOHTTP_LIBRARY_NAME +AC_SUBST(NANOHTTP_LIBRARY_NAME) + +NANOHTTP_VERSION=$NANOHTTP_MAJOR_VERSION.$NANOHTTP_MINOR_VERSION.$NANOHTTP_MICRO_VERSION +NANOHTTP_RELEASE=$NANOHTTP_MAJOR_VERSION.$NANOHTTP_MINOR_VERSION +AC_SUBST(NANOHTTP_RELEASE) +AC_SUBST(NANOHTTP_VERSION) + + + # Process this file with autoconf to produce a configure script. #AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS) #AC_INIT(src/csoap.c) @@ -70,6 +99,8 @@ AC_CHECK_HEADERS([arpa/inet.h netdb.h string.h sys/socket.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST +AC_HEADER_TIME +AC_STRUCT_TM Checks for library functions. #AC_FUNC_MALLOC @@ -199,6 +230,8 @@ AC_SUBST(LDFLAGS) #AC_CONFIG_FILES([]) AC_OUTPUT(Makefile libcsoap/Makefile +nanohttp/Makefile examples/Makefile +examples/nanohttp/Makefile examples/ex1/Makefile libcsoap-1.0.pc) diff --git a/examples/Makefile.am b/examples/Makefile.am index f76d84e..875e0d4 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1 +1 @@ -SUBDIRS=ex1
\ No newline at end of file +SUBDIRS=ex1 nanohttp |