libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

fixed some more debian build issues - changed like in webtester; refs #12

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-02-17 12:44:12 +00:00
parent 23830ed443
commit b87f822154
18 changed files with 1851 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/makefile.am
View File

@@ -22,13 +22,13 @@ if HAVE_STACKTRACE
endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = @PACKAGENAME@.pc
pkgconfig_DATA = @PACKAGE_NAME@.pc
pkgconfig2dir = $(datarootdir)/pkgconfig
pkgconfig2_DATA = $(pkgconfig_DATA)
EXTRA_DIST = $(pkgconfig_DATA).in
AM_LDFLAGS = -version-info ${LIB_VERSION}
AM_LDFLAGS = -version-info ${LIB_PACKAGE_VERSION}
lib_LTLIBRARIES = libmrw.la
if HAVE_BOOST_THREAD
@@ -97,7 +97,7 @@ if HAVE_STACKTRACE
libmrw_la_SOURCES += \
mrw/stacktrace.hxx stacktrace.cxx
endif
libmrw_la_LDFLAGS = -version-info @LIB_VERSION@
libmrw_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrw_la_LIBADD =
if HAVE_STACKTRACE
libmrw_la_LIBADD += -lltdl
@@ -107,7 +107,7 @@ if HAVE_THREADS
if HAVE_BOOST_THREAD
libmrw_mt_la_SOURCES = $(libmrw_la_SOURCES)
libmrw_mt_la_CXXFLAGS = @THREADS@
libmrw_mt_la_LDFLAGS = $(libmrw_la_LDFLAGS) -version-info @LIB_VERSION@ \
libmrw_mt_la_LDFLAGS = $(libmrw_la_LDFLAGS) -version-info @LIB_PACKAGE_VERSION@ \
@THREADS@
libmrw_mt_la_LIBADD = $(libmrw_la_LIBADD) @BOOST_THREAD_LIB@
endif
@@ -115,13 +115,13 @@ endif
if HAVE_STACKTRACE
libmrwexcstderr_la_SOURCES = autostacktracestderr.cxx version.cxx
libmrwexcstderr_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwexcstderr_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwexcstderr_la_LIBADD = libmrw.la
if HAVE_THREADS
if HAVE_BOOST_THREAD
libmrwexcstderr_mt_la_SOURCES = autostacktracestderr.cxx version.cxx
libmrwexcstderr_mt_la_CXXFLAGS = @THREADS@
libmrwexcstderr_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@
libmrwexcstderr_mt_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@ @THREADS@
libmrwexcstderr_mt_la_LIBADD = libmrw-mt.la
endif
endif
@@ -129,7 +129,7 @@ if AUTOFNTRACE
libmrwautofunctiontracestdlog_la_SOURCES = autofunctiontracestdlog.cxx \
version.cxx
libmrwautofunctiontracestdlog_la_CXXFLAGS = -w
libmrwautofunctiontracestdlog_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwautofunctiontracestdlog_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwautofunctiontracestdlog_la_LIBADD = libmrw.la
if HAVE_THREADS
if HAVE_BOOST_THREAD
@@ -137,7 +137,7 @@ if HAVE_BOOST_THREAD
autofunctiontracestdlog.cxx version.cxx
libmrwautofunctiontracestdlog_mt_la_CXXFLAGS = @THREADS@ -w
libmrwautofunctiontracestdlog_mt_la_LDFLAGS = \
-version-info @LIB_VERSION@ @THREADS@
-version-info @LIB_PACKAGE_VERSION@ @THREADS@
libmrwautofunctiontracestdlog_mt_la_LIBADD = \
libmrw-mt.la
endif
@@ -145,13 +145,13 @@ endif
endif
if HAVE_LOG4CXX
libmrwexclog4cxx_la_SOURCES = autostacktracelog4cxx.cxx version.cxx
libmrwexclog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwexclog4cxx_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwexclog4cxx_la_LIBADD = libmrw.la -llog4cxx
if HAVE_THREADS
if HAVE_BOOST_THREAD
libmrwexclog4cxx_mt_la_SOURCES = autostacktracelog4cxx.cxx version.cxx
libmrwexclog4cxx_mt_la_CXXFLAGS = @THREADS@
libmrwexclog4cxx_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@
libmrwexclog4cxx_mt_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@ @THREADS@
libmrwexclog4cxx_mt_la_LIBADD = libmrw-mt.la -llog4cxx
endif
endif
@@ -159,7 +159,7 @@ if AUTOFNTRACE
libmrwautofunctiontracelog4cxx_la_SOURCES = autofunctiontracelog4cxx.cxx \
version.cxx
libmrwautofunctiontracelog4cxx_la_CXXFLAGS = -w
libmrwautofunctiontracelog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwautofunctiontracelog4cxx_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwautofunctiontracelog4cxx_la_LIBADD = libmrw.la -llog4cxx
if HAVE_THREADS
if HAVE_BOOST_THREAD
@@ -167,7 +167,7 @@ if HAVE_BOOST_THREAD
autofunctiontracelog4cxx.cxx version.cxx
libmrwautofunctiontracelog4cxx_mt_la_CXXFLAGS = @THREADS@ -w
libmrwautofunctiontracelog4cxx_mt_la_LDFLAGS = \
-version-info @LIB_VERSION@ @THREADS@
-version-info @LIB_PACKAGE_VERSION@ @THREADS@
libmrwautofunctiontracelog4cxx_mt_la_LIBADD = \
libmrw-mt.la -llog4cxx
endif
@@ -177,13 +177,13 @@ endif
endif
if HAVE_LOG4CXX
libmrwlog4cxxconfiguration_la_SOURCES = log4cxxconfiguration.cxx version.cxx
libmrwlog4cxxconfiguration_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwlog4cxxconfiguration_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwlog4cxxconfiguration_la_LIBADD = -llog4cxx
if HAVE_THREADS
libmrwlog4cxxconfiguration_mt_la_SOURCES = log4cxxconfiguration.cxx \
version.cxx
libmrwlog4cxxconfiguration_mt_la_CXXFLAGS = @THREADS@
libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_VERSION@ \
libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@ \
@THREADS@
libmrwlog4cxxconfiguration_mt_la_LIBADD = -llog4cxx
endif

6
src/mrw-c++.pc.in
View File

@@ -1,11 +1,11 @@
prefix=@PACKAGENAME@
prefix=@PACKAGE_NAME@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: @PACKAGENAME@
Name: @PACKAGE_NAME@
Description:
Version: @VERSION@
Version: @PACKAGE_VERSION@
Libs: -L${libdir}
Libs.private:
Cflags: -I${includedir}

16
src/mrw/args.hxx
View File

@@ -27,8 +27,8 @@
*/
// Add version information for @c what and @c ident
const std::string MRW_IDENT("$Id: " PACKAGENAME "-" PACKAGEVERSION " $");
const std::string MRW_WHAT("#(@)" PACKAGENAME "-" PACKAGEVERSION);
const std::string MRW_IDENT("$Id: " PACKAGE_NAME "-" PACKAGEPACKAGE_VERSION " $");
const std::string MRW_WHAT("#(@)" PACKAGE_NAME "-" PACKAGEPACKAGE_VERSION);
namespace mrw {
/// Cool and easy evaluation of commandline arguments in C++11.
@@ -340,15 +340,15 @@ namespace mrw {
}
/// @return version information
std::string version_text() {
# ifdef PACKAGEVERSION
# ifdef PACKAGENAME
std::string v(": " PACKAGENAME "-" PACKAGEVERSION);
# ifdef PACKAGEPACKAGE_VERSION
# ifdef PACKAGE_NAME
std::string v(": " PACKAGE_NAME "-" PACKAGEPACKAGE_VERSION);
# else
std::string v("-" PACKAGEVERSION);
std::string v("-" PACKAGEPACKAGE_VERSION);
# endif
# else
# ifdef PACKAGENAME
std::string v(": " PACKAGENAME);
# ifdef PACKAGE_NAME
std::string v(": " PACKAGE_NAME);
# else
std::string v;
# endif

4
src/mrw/checkcxx11.hxx
View File

@@ -14,7 +14,7 @@
# if __cplusplus < 201103L
# if __cplusplus==1
# if __APPLE__
# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9
# if MAC_OS_X_PACKAGE_VERSION_MIN_REQUIRED < MAC_OS_X_PACKAGE_VERSION_10_9
/// Code is compiled with old non C++11 standard compliant compiler
/** There are workarounds for old non C++11 compatible
compilers. These workarounds are deprecated, but will
@@ -73,7 +73,7 @@ namespace std {
# warning trying standard C++11 support
# include <memory>
# endif
# elif __APPLE__ && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9
# elif __APPLE__ && MAC_OS_X_PACKAGE_VERSION_MIN_REQUIRED < MAC_OS_X_PACKAGE_VERSION_10_9
/// Code is compiled with an old non C++11 standard compliant compiler
/** There are workarounds for old non C++11 compatible
compilers. These workarounds are deprecated, but will remain

26
src/mrw/makefile.am
View File

@@ -26,7 +26,7 @@ htmldir = $(pkgdatadir)/doc/html
pdfdir = $(pkgdatadir)/doc/pdf
if HAVE_DOXYGEN
html_DATA = $(top_builddir)/doc/html/index.html
pdf_DATA = $(top_builddir)/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
pdf_DATA = $(top_builddir)/doc/latex/@PACKAGE_NAME@-@PACKAGE_VERSION@.pdf
EXTRA_DIST += $(pdf_DATA)
endif
@@ -101,7 +101,7 @@ if HAVE_STACKTRACE
libmrw_la_SOURCES += \
stacktrace.hxx stacktrace.cxx
endif
libmrw_la_LDFLAGS = -version-info @LIB_VERSION@
libmrw_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrw_la_LIBADD =
if HAVE_STACKTRACE
libmrw_la_LIBADD += -lltdl
@@ -111,7 +111,7 @@ if HAVE_THREADS
if HAVE_BOOST_THREAD
libmrw_mt_la_SOURCES = $(libmrw_la_SOURCES)
libmrw_mt_la_CXXFLAGS = @THREADS@
libmrw_mt_la_LDFLAGS = $(libmrw_la_LDFLAGS) -version-info @LIB_VERSION@ \
libmrw_mt_la_LDFLAGS = $(libmrw_la_LDFLAGS) -version-info @LIB_PACKAGE_VERSION@ \
@THREADS@
libmrw_mt_la_LIBADD = $(libmrw_la_LIBADD) @BOOST_THREAD_LIB@
endif
@@ -119,13 +119,13 @@ endif
if HAVE_STACKTRACE
libmrwexcstderr_la_SOURCES = autostacktracestderr.cxx version.cxx
libmrwexcstderr_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwexcstderr_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwexcstderr_la_LIBADD = $(top_builddir)/mrw/libmrw.la
if HAVE_THREADS
if HAVE_BOOST_THREAD
libmrwexcstderr_mt_la_SOURCES = autostacktracestderr.cxx version.cxx
libmrwexcstderr_mt_la_CXXFLAGS = @THREADS@
libmrwexcstderr_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@
libmrwexcstderr_mt_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@ @THREADS@
libmrwexcstderr_mt_la_LIBADD = $(top_builddir)/mrw/libmrw-mt.la
endif
endif
@@ -133,7 +133,7 @@ if AUTOFNTRACE
libmrwautofunctiontracestdlog_la_SOURCES = autofunctiontracestdlog.cxx \
version.cxx
libmrwautofunctiontracestdlog_la_CXXFLAGS = -w
libmrwautofunctiontracestdlog_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwautofunctiontracestdlog_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwautofunctiontracestdlog_la_LIBADD = $(top_builddir)/mrw/libmrw.la
if HAVE_THREADS
if HAVE_BOOST_THREAD
@@ -141,7 +141,7 @@ if HAVE_BOOST_THREAD
autofunctiontracelog4cxx.cxx version.cxx
libmrwautofunctiontracestdlog_mt_la_CXXFLAGS = @THREADS@ -w
libmrwautofunctiontracestdlog_mt_la_LDFLAGS = \
-version-info @LIB_VERSION@ @THREADS@
-version-info @LIB_PACKAGE_VERSION@ @THREADS@
libmrwautofunctiontracestdlog_mt_la_LIBADD = \
$(top_builddir)/mrw/libmrw-mt.la
endif
@@ -149,13 +149,13 @@ endif
endif
if HAVE_LOG4CXX
libmrwexclog4cxx_la_SOURCES = autostacktracelog4cxx.cxx version.cxx
libmrwexclog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwexclog4cxx_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwexclog4cxx_la_LIBADD = $(top_builddir)/mrw/libmrw.la -llog4cxx
if HAVE_THREADS
if HAVE_BOOST_THREAD
libmrwexclog4cxx_mt_la_SOURCES = autostacktracelog4cxx.cxx version.cxx
libmrwexclog4cxx_mt_la_CXXFLAGS = @THREADS@
libmrwexclog4cxx_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@
libmrwexclog4cxx_mt_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@ @THREADS@
libmrwexclog4cxx_mt_la_LIBADD = $(top_builddir)/mrw/libmrw-mt.la -llog4cxx
endif
endif
@@ -163,7 +163,7 @@ if AUTOFNTRACE
libmrwautofunctiontracelog4cxx_la_SOURCES = autofunctiontracelog4cxx.cxx \
version.cxx
libmrwautofunctiontracelog4cxx_la_CXXFLAGS = -w
libmrwautofunctiontracelog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwautofunctiontracelog4cxx_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwautofunctiontracelog4cxx_la_LIBADD = $(top_builddir)/mrw/libmrw.la -llog4cxx
if HAVE_THREADS
if HAVE_BOOST_THREAD
@@ -171,7 +171,7 @@ if HAVE_BOOST_THREAD
autofunctiontracelog4cxx.cxx version.cxx
libmrwautofunctiontracelog4cxx_mt_la_CXXFLAGS = @THREADS@ -w
libmrwautofunctiontracelog4cxx_mt_la_LDFLAGS = \
-version-info @LIB_VERSION@ @THREADS@
-version-info @LIB_PACKAGE_VERSION@ @THREADS@
libmrwautofunctiontracelog4cxx_mt_la_LIBADD = \
$(top_builddir)/mrw/libmrw-mt.la -llog4cxx
endif
@@ -181,13 +181,13 @@ endif
endif
if HAVE_LOG4CXX
libmrwlog4cxxconfiguration_la_SOURCES = log4cxxconfiguration.cxx version.cxx
libmrwlog4cxxconfiguration_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwlog4cxxconfiguration_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwlog4cxxconfiguration_la_LIBADD = -llog4cxx
if HAVE_THREADS
libmrwlog4cxxconfiguration_mt_la_SOURCES = log4cxxconfiguration.cxx \
version.cxx
libmrwlog4cxxconfiguration_mt_la_CXXFLAGS = @THREADS@
libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_VERSION@ \
libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@ \
@THREADS@
libmrwlog4cxxconfiguration_mt_la_LIBADD = -llog4cxx
endif

30
src/mrw/mrw.hxx.in
View File

@@ -7,7 +7,7 @@
Minimalpaket (f&uuml;r den VideoreKorder):
- <a href="/downloads/@PACKAGENAME@-minimal-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm">@PACKAGENAME@-minimal-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</a>
- <a href="/downloads/@PACKAGE_NAME@-minimal-@PACKAGE_VERSION@-1.i586.rpm">@PACKAGE_NAME@-minimal-@PACKAGE_VERSION@-1.i586.rpm</a>
More downloads see @ref downloads.
@@ -61,19 +61,19 @@
/** @page downloads Download and Installation of the MRW-C++ Library
Download this documentation in PDF:
- <a href="/downloads/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf">@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf</a>
- <a href="/downloads/@PACKAGE_NAME@-@PACKAGE_VERSION@.pdf">@PACKAGE_NAME@-@PACKAGE_VERSION@.pdf</a>
Download this version from here:
- Source
- Source TAR-Ball:
- <a href="/downloads/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz">@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz</a>
- <a href="/downloads/@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz">@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz</a>
- Installation:
-# <code>tar xzf @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz</code>
-# <code>cd @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@</code>
-# <code>tar xzf @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz</code>
-# <code>cd @PACKAGE_NAME@-@PACKAGE_VERSION@</code>
-# <code>./configure && make all install</code>
- Source RPM Packages:
- <a href="/downloads/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.src.rpm">@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.src.rpm</a>
- Installation:@n <code>sudo rpmbuild --rebuild @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.src.rpm</code>
- <a href="/downloads/@PACKAGE_NAME@-@PACKAGE_VERSION@-1.src.rpm">@PACKAGE_NAME@-@PACKAGE_VERSION@-1.src.rpm</a>
- Installation:@n <code>sudo rpmbuild --rebuild @PACKAGE_NAME@-@PACKAGE_VERSION@-1.src.rpm</code>
- Requirements to build from source:
- boost: http://boost.org
- cppunit: http://cppunit.sf.net
@@ -84,18 +84,18 @@
- GNU g++, GNU make, GNU autotools: http://gnu.org
- Binary
- 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/@PACKAGE_NAME@-minimal-@PACKAGE_VERSION@-1.i586.rpm">@PACKAGE_NAME@-minimal-@PACKAGE_VERSION@-1.i586.rpm</a>
- 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:@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>
- Installation:@n <code>rpm -Uvh @PACKAGE_NAME@-minimal-@PACKAGE_VERSION@-1.i586.rpm</code>
- <a href="/downloads/@PACKAGE_NAME@-@PACKAGE_VERSION@-1.i586.rpm">@PACKAGE_NAME@-@PACKAGE_VERSION@-1.i586.rpm</a>
- Full runtime library, no multithreading.
- 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>
- Installation:@n <code>rpm -Uvh @PACKAGE_NAME@-@PACKAGE_VERSION@-1.i586.rpm</code>
- <a href="/downloads/@PACKAGE_NAME@-mt-@PACKAGE_VERSION@-1.i586.rpm">@PACKAGE_NAME@-mt-@PACKAGE_VERSION@-1.i586.rpm</a>
- Full runtime library, with multithreading support.
- 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>
- Installation:@n <code>rpm -Uvh @PACKAGE_NAME@-mt-@PACKAGE_VERSION@-1.i586.rpm</code>
- <a href="/downloads/@PACKAGE_NAME@-devel-@PACKAGE_VERSION@-1.i586.rpm">@PACKAGE_NAME@-devel-@PACKAGE_VERSION@-1.i586.rpm</a>
- The package for developers.
- Installation:@n <code>rpm -Uvh @PACKAGENAME@-devel-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm</code>
- Installation:@n <code>rpm -Uvh @PACKAGE_NAME@-devel-@PACKAGE_VERSION@-1.i586.rpm</code>
- Requirements:
- Boost thread library for multi threading:@n http://boost.org
- log4cxx for automated tracing and function traces:

6
src/version.cxx.in
View File

@@ -9,8 +9,8 @@
namespace mrw {
std::string version() {
return "@PACKAGENAME@-@VERSION@";
return "@PACKAGE_NAME@-@PACKAGE_VERSION@";
}
const std::string WHAT("#(@) @PACKAGENAME@-@VERSION@");
const std::string IDENT("$Id: @PACKAGENAME@-@VERSION@ $");
const std::string WHAT("#(@) @PACKAGE_NAME@-@PACKAGE_VERSION@");
const std::string IDENT("$Id: @PACKAGE_NAME@-@PACKAGE_VERSION@ $");
}