Release 3-2-3 with tag: REL_mrw-c++-3-2-3
This commit is contained in:
		
							
								
								
									
										11
									
								
								configure.in
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								configure.in
									
									
									
									
									
								
							@@ -17,7 +17,7 @@ AC_CANONICAL_SYSTEM
 | 
				
			|||||||
PACKAGENAME=mrw-c++
 | 
					PACKAGENAME=mrw-c++
 | 
				
			||||||
m4_define(x_major, 3)
 | 
					m4_define(x_major, 3)
 | 
				
			||||||
m4_define(x_minor, 2)
 | 
					m4_define(x_minor, 2)
 | 
				
			||||||
m4_define(x_least, 3)
 | 
					m4_define(x_least, 4)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# copy M4 to shell
 | 
					# copy M4 to shell
 | 
				
			||||||
MAJOR=x_major
 | 
					MAJOR=x_major
 | 
				
			||||||
@@ -95,6 +95,11 @@ AC_ARG_ENABLE(dot,
 | 
				
			|||||||
  [  --disable-dot           disable dot graphic tools for documentation],
 | 
					  [  --disable-dot           disable dot graphic tools for documentation],
 | 
				
			||||||
  [have_dot="$enableval"])
 | 
					  [have_dot="$enableval"])
 | 
				
			||||||
test "$enableval" = "yes" && HAVE_DOT="YES" || HAVE_DOT="NO";
 | 
					test "$enableval" = "yes" && HAVE_DOT="YES" || HAVE_DOT="NO";
 | 
				
			||||||
 | 
					AC_ARG_ENABLE(doxygen,
 | 
				
			||||||
 | 
					  [  --disable-doxygen       disable build of documentation],
 | 
				
			||||||
 | 
					  [have_doxygen="$enableval"])
 | 
				
			||||||
 | 
					test "$enableval" = "yes" && HAVE_DOXYGEN="YES" || HAVE_DOXYGEN="NO";
 | 
				
			||||||
 | 
					AM_CONDITIONAL(HAVE_DOXYGEN, test "$enableval" = "yes")
 | 
				
			||||||
AC_ARG_ENABLE(dir,
 | 
					AC_ARG_ENABLE(dir,
 | 
				
			||||||
  [  --disable-dir           disable POSIX directory access],
 | 
					  [  --disable-dir           disable POSIX directory access],
 | 
				
			||||||
  [have_dir="$enableval"])
 | 
					  [have_dir="$enableval"])
 | 
				
			||||||
@@ -186,6 +191,7 @@ AM_PATH_CPPUNIT([1.0.0], [have_cppunit="yes"], [have_cppunit="no"])
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# export macros
 | 
					# export macros
 | 
				
			||||||
AC_SUBST(HAVE_DOT)
 | 
					AC_SUBST(HAVE_DOT)
 | 
				
			||||||
 | 
					AC_SUBST(HAVE_DOXYGEN)
 | 
				
			||||||
AC_SUBST(THREADS)
 | 
					AC_SUBST(THREADS)
 | 
				
			||||||
AC_SUBST(PACKAGENAME)
 | 
					AC_SUBST(PACKAGENAME)
 | 
				
			||||||
AC_SUBST(AM_CXXFLAGS)
 | 
					AC_SUBST(AM_CXXFLAGS)
 | 
				
			||||||
@@ -206,6 +212,9 @@ if test "$have_dot" = "no"; then
 | 
				
			|||||||
AC_MSG_WARN([Missing program dot!
 | 
					AC_MSG_WARN([Missing program dot!
 | 
				
			||||||
  - when you rebild documentation with make doc, there are no generated images
 | 
					  - when you rebild documentation with make doc, there are no generated images
 | 
				
			||||||
  - there are precompiled derived files in the distribution]); fi
 | 
					  - there are precompiled derived files in the distribution]); fi
 | 
				
			||||||
 | 
					if test "$have_doxygen" = "no"; then
 | 
				
			||||||
 | 
					AC_MSG_WARN([Disabled doxygen!
 | 
				
			||||||
 | 
					  - documentation will not be built]); fi
 | 
				
			||||||
if test "$have_cppunit" = "no"; then
 | 
					if test "$have_cppunit" = "no"; then
 | 
				
			||||||
AC_MSG_WARN([Missing cppunit development library!
 | 
					AC_MSG_WARN([Missing cppunit development library!
 | 
				
			||||||
  - you cannot check the library using "make check"
 | 
					  - you cannot check the library using "make check"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,7 +10,7 @@
 | 
				
			|||||||
##
 | 
					##
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# rpmbuild -bb --clean @PACKAGENAME@.spec
 | 
					# rpmbuild -bb --clean @PACKAGENAME@.spec
 | 
				
			||||||
BuildRequires: gcc-c++ doxygen graphviz cppunit-devel boost-devel log4cxx-devel freefont te_latex
 | 
					BuildRequires: gcc-c++ doxygen graphviz cppunit-devel boost-devel log4cxx-devel freefont te_latex ghostscript-library tetex
 | 
				
			||||||
Summary: MRW's C++ Class Library, facilities for modern C++ programming
 | 
					Summary: MRW's C++ Class Library, facilities for modern C++ programming
 | 
				
			||||||
Name: @PACKAGENAME@
 | 
					Name: @PACKAGENAME@
 | 
				
			||||||
Version: @MAJOR@.@MINOR@.@LEAST@
 | 
					Version: @MAJOR@.@MINOR@.@LEAST@
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,9 +22,11 @@ CLEANFILES = doxygen.errors functiontrace_test.log \
 | 
				
			|||||||
examplesdir = $(pkgdatadir)/examples
 | 
					examplesdir = $(pkgdatadir)/examples
 | 
				
			||||||
dist_examples_DATA = $(top_srcdir)/mrw/examples/*
 | 
					dist_examples_DATA = $(top_srcdir)/mrw/examples/*
 | 
				
			||||||
htmldir = $(pkgdatadir)/doc/html
 | 
					htmldir = $(pkgdatadir)/doc/html
 | 
				
			||||||
html_DATA = $(top_builddir)/doc/html/index.html
 | 
					 | 
				
			||||||
pdfdir =  $(pkgdatadir)/doc/pdf
 | 
					pdfdir =  $(pkgdatadir)/doc/pdf
 | 
				
			||||||
 | 
					if HAVE_DOXYGEN
 | 
				
			||||||
 | 
					html_DATA = $(top_builddir)/doc/html/index.html
 | 
				
			||||||
dist_pdf_DATA = $(top_builddir)/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
 | 
					dist_pdf_DATA = $(top_builddir)/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
 | 
				
			||||||
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
lib_LTLIBRARIES = libmrw.la
 | 
					lib_LTLIBRARIES = libmrw.la
 | 
				
			||||||
if HAVE_BOOST_THREAD
 | 
					if HAVE_BOOST_THREAD
 | 
				
			||||||
@@ -385,14 +387,17 @@ $(html_DATA): doxyfile *.[ch]pp $(deps) style.css head.html foot.html
 | 
				
			|||||||
	@test -f $(top_builddir)/doc/html/hintergrund.png || \
 | 
						@test -f $(top_builddir)/doc/html/hintergrund.png || \
 | 
				
			||||||
	  cp $(srcdir)/hintergrund.png \
 | 
						  cp $(srcdir)/hintergrund.png \
 | 
				
			||||||
	  $(top_builddir)/doc/html
 | 
						  $(top_builddir)/doc/html
 | 
				
			||||||
	doxygen doxyfile
 | 
						doxygen doxyfile || \
 | 
				
			||||||
 | 
						  ( echo "**** ERROR in Doxygen ****" && cat doxygen.errors && false )
 | 
				
			||||||
if PEDANTIC
 | 
					if PEDANTIC
 | 
				
			||||||
	test \! -s doxygen.errors
 | 
						test \! -s doxygen.errors
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
$(top_builddir)/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf: doxyfile *.[ch]pp $(deps) $(html_DATA)
 | 
					$(top_builddir)/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf: doxyfile *.[ch]pp $(deps) $(html_DATA)
 | 
				
			||||||
	cd $(top_builddir)/doc/latex && make && \
 | 
						cd $(top_builddir)/doc/latex && make && \
 | 
				
			||||||
	  mv refman.pdf @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
 | 
						  mv refman.pdf @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf || \
 | 
				
			||||||
 | 
						  ( echo "**** ERROR in Doxygen-PDF ****" && \
 | 
				
			||||||
 | 
						    cat refman.log && false )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
clean-local:
 | 
					clean-local:
 | 
				
			||||||
	- rm doxygen.err libmrw.doxytag
 | 
						- rm doxygen.err libmrw.doxytag
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -73,7 +73,7 @@
 | 
				
			|||||||
                  -# <code>./configure && make all install</code>
 | 
					                  -# <code>./configure && make all install</code>
 | 
				
			||||||
        - Source RPM Packages:
 | 
					        - Source RPM Packages:
 | 
				
			||||||
           - <a href="/downloads/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.src.rpm">@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.src.rpm</a>
 | 
					           - <a href="/downloads/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.src.rpm">@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.src.rpm</a>
 | 
				
			||||||
              - Installation:<br /><code>sudo rpmbuild --rebuild @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.src.rpm</code>
 | 
					              - Installation:@n <code>sudo rpmbuild --rebuild @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.src.rpm</code>
 | 
				
			||||||
        - Requirements to build from source:
 | 
					        - Requirements to build from source:
 | 
				
			||||||
           - boost: http://boost.org
 | 
					           - boost: http://boost.org
 | 
				
			||||||
           - cppunit: http://cppunit.sf.net
 | 
					           - cppunit: http://cppunit.sf.net
 | 
				
			||||||
@@ -85,19 +85,19 @@
 | 
				
			|||||||
     - Binary
 | 
					     - Binary
 | 
				
			||||||
        - Binary RPM Packages (built on i586/SuSE):
 | 
					        - Binary RPM Packages (built on i586/SuSE):
 | 
				
			||||||
           - <a href="/downloads/@PACKAGENAME@-minimal-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm">@PACKAGENAME@-minimal-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</a>
 | 
					           - <a href="/downloads/@PACKAGENAME@-minimal-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm">@PACKAGENAME@-minimal-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</a>
 | 
				
			||||||
              - Minimal runtime package without debugging support.<br />Does not depend on boost and log4cxx and ltdl.<br />To be used e.g. with [[:Computer:Linux:Programme:Videorekorder]]
 | 
					              - Minimal runtime package without debugging support.@n Does not depend on boost and log4cxx and ltdl.@n To be used e.g. with [[:Computer:Linux:Programme:Videorekorder]]
 | 
				
			||||||
              - Installation:<br /><code>rpm -Uvh @PACKAGENAME@-minimal-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</code>
 | 
					              - Installation:@n <code>rpm -Uvh @PACKAGENAME@-minimal-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</code>
 | 
				
			||||||
           - <a href="/downloads/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm">@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</a>
 | 
					           - <a href="/downloads/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm">@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</a>
 | 
				
			||||||
              - Full runtime library, no multithreading.
 | 
					              - Full runtime library, no multithreading.
 | 
				
			||||||
              - Installation:<br /><code>rpm -Uvh @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</code>
 | 
					              - Installation:@n <code>rpm -Uvh @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</code>
 | 
				
			||||||
           - <a href="/downloads/@PACKAGENAME@-mt-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm">@PACKAGENAME@-mt-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</a>
 | 
					           - <a href="/downloads/@PACKAGENAME@-mt-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm">@PACKAGENAME@-mt-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</a>
 | 
				
			||||||
              - Full runtime library, with multithreading support.
 | 
					              - Full runtime library, with multithreading support.
 | 
				
			||||||
              - Installation:<br /><code>rpm -Uvh @PACKAGENAME@-mt-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</code>
 | 
					              - Installation:@n <code>rpm -Uvh @PACKAGENAME@-mt-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</code>
 | 
				
			||||||
           - <a href="/downloads/@PACKAGENAME@-devel-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm">@PACKAGENAME@-devel-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</a>
 | 
					           - <a href="/downloads/@PACKAGENAME@-devel-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm">@PACKAGENAME@-devel-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</a>
 | 
				
			||||||
              - The package for developers.
 | 
					              - The package for developers.
 | 
				
			||||||
              - Installation:<br /><code>rpm -Uvh @PACKAGENAME@-devel-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</code>
 | 
					              - Installation:@n <code>rpm -Uvh @PACKAGENAME@-devel-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</code>
 | 
				
			||||||
     - Requirements:
 | 
					     - Requirements:
 | 
				
			||||||
        - Boost thread library for multi threading:<br />http://boost.org
 | 
					        - Boost thread library for multi threading:@n http://boost.org
 | 
				
			||||||
        - log4cxx for automated tracing and function traces:
 | 
					        - log4cxx for automated tracing and function traces:
 | 
				
			||||||
           - http://logging.apache.org/log4cxx
 | 
					           - http://logging.apache.org/log4cxx
 | 
				
			||||||
           - RPM: <a href="/downloads/log4cxx-0.9.7-3.i386.rpm">log4cxx-0.9.7-3.i386.rpm</a>
 | 
					           - RPM: <a href="/downloads/log4cxx-0.9.7-3.i386.rpm">log4cxx-0.9.7-3.i386.rpm</a>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user