issue #24

- moved doxyfile into doxyfile.in. configure now sets the documentation version (doxyfile.in)

Author: HerbertKoelman

.gitignore

@@ -50,6 +50,8 @@ config.log
 Makefile
 
 # layout
+doxyfile
+distrib/
 lib/
 doc/
 pthread-tests

Makefile.in

@@ -18,14 +18,14 @@ all:
 	cd src && $(MAKE) clean all
 
 pkg: 
-	tar cf - ./  | gzip -c > distrib/$(PACKAGE)
+	$(MKDIR) distrib
+	tar cf - `git ls-files`  | gzip -c > distrib/$(PACKAGE)
 
 globber:clean
 	-$(RM) -R Makefile autom4te.cache config.log config.status 
-	-(cd src && $(MAKE) globber)
 
 clean:
-	cd src && $(MAKE) clean
+	-(cd src && $(MAKE) clean)
 
 doxygen:
 	${DOXYGEN} doxyfile

README.md

@@ -16,46 +16,44 @@ Install moves files into your system's default localtion of headers and librarie
 configure --prefix=/usr/local
 ```
 
-[Doxygen documentation](http://herbertkoelman.github.io/cpp-pthread/doc/html/) can be generated with this command:
+[Doxygen documentation](http://herbertkoelman.github.io/cpp-pthread/doc/html/) can be generated with this command. I hope this help make things easier to use and understand.
 ```
 make doxygen
-...
 ```
 
-The target `pkg` will produce au tar.gz.
+> Doxygen can be downloaded [here](http://www.stack.nl/~dimitri/doxygen/index.html).
 
-This command creates a `doc` directory wich will contain the generated documentation.
-
-> **warning** generating documentation requires that doxygen is installed.
-
-The confugre file is not versionned, therefore it is required to run `autoconf` to generate one
-```
-autoconf
-( cd src && autoconf )
-( cd tests && autoconf )
-```
+The `make` target `pkg` will produce au tar.gz that can be distributed.
 
 ### How to use it
 
-Once compiled and installed in a location that suites you, use your compiler options to reference the headers and the libraries directory. In almoast all casses you can:
+Once compiled and installed in a location that suites you, use your compiler options to reference the headers and the library directory. In almoast all casses you can:
 * include `#include "pthread/phtread.hpp"` in your code.
 * comment the c++11 standard includes in your code
 * declare that you're now using the namespace pthread (`using namespace pthread ;`)
 
-It should now compile use this very simple (but often good enough) implementation.
+Sample code can be found in the `tests` directory. To use it, run the following commands:
+```
+cd tests
+./configure
+./make
+```
 
 ### Usefull links
 
-* [documentation](http://pubs.opengroup.org/onlinepubs/007908799/xsh/threads.html) of the underlying POSIX threading library 
+#### project links
+
 * [project's home](https://github.com/HerbertKoelman/cpp-pthread)
 * [project's doxygen](http://herbertkoelman.github.io/cpp-pthread/doc/html/)
+
+#### other
+
+* POSIX Threads [documentation](http://pubs.opengroup.org/onlinepubs/007908799/xsh/threads.html)
 * [std::thread](http://en.cppreference.com/w/cpp/thread/thread) implementation we try to mimic
 * [std::lock_guard](http://en.cppreference.com/w/cpp/thread/lock_guard/lock_guard)  implementation we try to mimic 
 * [std::mutex](http://en.cppreference.com/w/cpp/thread/mutex) implementation we try to mimic
 * [std::condition_variable](http://en.cppreference.com/w/cpp/thread/condition_variable) implementation we try to mimic
 
-More [here](https://github.com/HerbertKoelman/cpp-pthread/wiki)
-
 ### misc
 
 * author herbert koelman

configure

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for cpp-pthread v1.2.0-13-g4209365.
+# Generated by GNU Autoconf 2.69 for cpp-pthread v1.2.0.
 #
-# Report bugs to <herbert.koelman@pmu.fr>.
+# Report bugs to <herbert.koelman@me.com>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -266,7 +266,7 @@ fi
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell [email protected] and
-$0: herbert.koelman@pmu.fr about your system, including any
+$0: herbert.koelman@me.com about your system, including any
 $0: error possibly output before this message. Then install
 $0: a modern shell, or manually run the script under such a
 $0: shell if you do have one."
@@ -579,10 +579,10 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='cpp-pthread'
 PACKAGE_TARNAME='cpp-pthread'
-PACKAGE_VERSION='v1.2.0-13-g4209365'
-PACKAGE_STRING='cpp-pthread v1.2.0-13-g4209365'
-PACKAGE_BUGREPORT='herbert.koelman@pmu.fr'
-PACKAGE_URL=''
+PACKAGE_VERSION='v1.2.0'
+PACKAGE_STRING='cpp-pthread v1.2.0'
+PACKAGE_BUGREPORT='herbert.koelman@me.com'
+PACKAGE_URL='http://herbertkoelman.github.io/cpp-pthread/'
 
 enable_option_checking=no
 ac_subst_vars='LTLIBOBJS
@@ -644,7 +644,7 @@ enable_option_checking
       ac_precious_vars='build_alias
 host_alias
 target_alias'
-ac_subdirs_all='src tests'
+ac_subdirs_all='src'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -1184,7 +1184,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures cpp-pthread v1.2.0-13-g4209365 to adapt to many kinds of systems.
+\`configure' configures cpp-pthread v1.2.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1248,11 +1248,12 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cpp-pthread v1.2.0-13-g4209365:";;
+     short | recursive ) echo "Configuration of cpp-pthread v1.2.0:";;
    esac
   cat <<\_ACEOF
 
-Report bugs to <[email protected]>.
+Report bugs to <[email protected]>.
+cpp-pthread home page: <http://herbertkoelman.github.io/cpp-pthread/>.
 _ACEOF
 ac_status=$?
 fi
@@ -1315,7 +1316,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cpp-pthread configure v1.2.0-13-g4209365
+cpp-pthread configure v1.2.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1332,7 +1333,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by cpp-pthread $as_me v1.2.0-13-g4209365, which was
+It was created by cpp-pthread $as_me v1.2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -1988,9 +1989,9 @@ HEADERS=$HEADERS
 
 
 
-subdirs="$subdirs src tests"
+subdirs="$subdirs src"
 
-ac_config_files="$ac_config_files Makefile"
+ac_config_files="$ac_config_files Makefile doxyfile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -2534,7 +2535,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by cpp-pthread $as_me v1.2.0-13-g4209365, which was
+This file was extended by cpp-pthread $as_me v1.2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2581,13 +2582,14 @@ Usage: $0 [OPTION]... [TAG]...
 Configuration files:
 $config_files
 
-Report bugs to <[email protected]>."
+Report bugs to <[email protected]>.
+cpp-pthread home page: <http://herbertkoelman.github.io/cpp-pthread/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-cpp-pthread config.status v1.2.0-13-g4209365
+cpp-pthread config.status v1.2.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -2700,6 +2702,7 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "doxyfile") CONFIG_FILES="$CONFIG_FILES doxyfile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.69)
-AC_INIT([cpp-pthread],[m4_esyscmd_s(echo $(git describe --always))],[herbert.koelman@pmu.fr],[])
+AC_INIT([cpp-pthread],[m4_esyscmd_s(echo $(git describe --always --abbrev=0))],[herbert.koelman@me.com],[],[http://herbertkoelman.github.io/cpp-pthread/])
 AC_LANG(C++)
 
 AC_CONFIG_AUX_DIR([/usr/bin . bin])
@@ -29,7 +29,7 @@ do
 done
 AC_SUBST(HEADERS,$HEADERS)
 
-AC_CONFIG_SUBDIRS(src tests)
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_SUBDIRS(src)
+AC_CONFIG_FILES([Makefile doxyfile])
 AC_OUTPUT
 

doxyfile renamed to doxyfile.in

@@ -38,7 +38,7 @@ PROJECT_NAME           = "C++ pThread wrapper"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v1.2.0
+PROJECT_NUMBER         = (@PACKAGE_VERSION@)
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

tests/configure

@@ -3989,7 +3989,53 @@ else
   as_fn_error $? "missing pthread library." "$LINENO" 5
 fi
 
-#AC_CHECK_LIB([cpp-pthread], [cpp_pthread_version],[],[AC_ERROR([missing cpp-thread library.])])
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cpp_pthread_version in -lcpp-pthread" >&5
+$as_echo_n "checking for cpp_pthread_version in -lcpp-pthread... " >&6; }
+if ${ac_cv_lib_cpp_pthread_cpp_pthread_version+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcpp-pthread  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cpp_pthread_version ();
+int
+main ()
+{
+return cpp_pthread_version ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_cpp_pthread_cpp_pthread_version=yes
+else
+  ac_cv_lib_cpp_pthread_cpp_pthread_version=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cpp_pthread_cpp_pthread_version" >&5
+$as_echo "$ac_cv_lib_cpp_pthread_cpp_pthread_version" >&6; }
+if test "x$ac_cv_lib_cpp_pthread_cpp_pthread_version" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBCPP_PTHREAD 1
+_ACEOF
+
+  LIBS="-lcpp-pthread $LIBS"
+
+else
+  as_fn_error $? "missing cpp-thread library." "$LINENO" 5
+fi
+
 
 # Checks for header files.
 #AC_HEADER_STDC

tests/configure.ac

@@ -54,7 +54,7 @@ CPPFLAGS="$CPPFLAGS $CFLAGS"
 
 # Checks for libraries.
 AC_CHECK_LIB([pthread], [pthread_create],[],[AC_ERROR([missing pthread library.])])
-#AC_CHECK_LIB([cpp-pthread], [cpp_pthread_version],[],[AC_ERROR([missing cpp-thread library.])])
+AC_CHECK_LIB([cpp-pthread], [cpp_pthread_version],[],[AC_ERROR([missing cpp-thread library.])])
 
 # Checks for header files.
 #AC_HEADER_STDC