From b192455b273b6231b204ec5bf2850186cd6c3897 Mon Sep 17 00:00:00 2001 From: Marco Eichelberg Date: Fri, 13 Dec 2024 10:11:56 +0100 Subject: [PATCH] Updated version information for 3.6.9+ development. --- config/configure | 32 ++++++++++++++++++++++---------- config/configure.in | 4 ++-- config/confmod | 26 +++++++++++++++++++------- 3 files changed, 43 insertions(+), 19 deletions(-) diff --git a/config/configure b/config/configure index 4eb6d0715..bccca04a1 100755 --- a/config/configure +++ b/config/configure @@ -695,6 +695,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -804,13 +805,14 @@ bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' datarootdir='${prefix}/share' -datadir='${datarootdir}/dcmtk-3.6.9' -sysconfdir='${prefix}/etc/dcmtk-3.6.9' +datadir='${datarootdir}/dcmtk-3.6.9-DEV' +sysconfdir='${prefix}/etc/dcmtk-3.6.9-DEV' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' -docdir='${datarootdir}/doc/dcmtk-3.6.9' +docdir='${datarootdir}/doc/dcmtk-3.6.9-DEV' infodir='${datarootdir}/info' htmldir='${docdir}/html' dvidir='${docdir}' @@ -1060,6 +1062,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1197,7 +1208,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1347,18 +1358,19 @@ Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc/dcmtk-3.6.9] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc/dcmtk-3.6.9-DEV] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only arch.-independent data [DATAROOTDIR/dcmtk-3.6.9] + --datadir=DIR read-only arch.-independent data [DATAROOTDIR/dcmtk-3.6.9-DEV] --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/dcmtk-3.6.9] + --docdir=DIR documentation root [DATAROOTDIR/doc/dcmtk-3.6.9-DEV] --htmldir=DIR html documentation [DOCDIR/html] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -2846,8 +2858,8 @@ ac_config_headers="$ac_config_headers include/dcmtk/config/osconfig.h" PACKAGE_VERSION_NUMBER=369 -PACKAGE_VERSION_SUFFIX="" -PACKAGE_DATE="2024-12-11" +PACKAGE_VERSION_SUFFIX="+" +PACKAGE_DATE="DEV" cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_NUMBER ${PACKAGE_VERSION_NUMBER} @@ -10418,7 +10430,7 @@ if ${ac_cv_check_std_namespace+:} false; then : else ac_link_o='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.o $LIBS 1>&5' cat > conftest.$ac_ext < diff --git a/config/configure.in b/config/configure.in index 08cd6a2af..974bc94ad 100644 --- a/config/configure.in +++ b/config/configure.in @@ -11,8 +11,8 @@ dnl Additional Package Information dnl ------------------------------------------------------- PACKAGE_VERSION_NUMBER=369 -PACKAGE_VERSION_SUFFIX="" -PACKAGE_DATE="2024-12-11" +PACKAGE_VERSION_SUFFIX="+" +PACKAGE_DATE="DEV" AC_DEFINE_UNQUOTED(PACKAGE_VERSION_NUMBER,${PACKAGE_VERSION_NUMBER},[Define to the version number of this package.]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION_SUFFIX,"${PACKAGE_VERSION_SUFFIX}",[Define to the version suffix of this package.]) AC_DEFINE_UNQUOTED(PACKAGE_DATE,"${PACKAGE_DATE}",[Define to the release date of this package.]) diff --git a/config/confmod b/config/confmod index 531d4be75..4f45c314f 100755 --- a/config/confmod +++ b/config/confmod @@ -608,6 +608,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -668,13 +669,14 @@ bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' datarootdir='${prefix}/share' -datadir='${datarootdir}/dcmtk-3.6.9' -sysconfdir='${prefix}/etc/dcmtk-3.6.9' +datadir='${datarootdir}/dcmtk-3.6.9-DEV' +sysconfdir='${prefix}/etc/dcmtk-3.6.9-DEV' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' -docdir='${datarootdir}/doc/dcmtk-3.6.9' +docdir='${datarootdir}/doc/dcmtk-3.6.9-DEV' infodir='${datarootdir}/info' htmldir='${docdir}/html' dvidir='${docdir}' @@ -924,6 +926,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1061,7 +1072,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1211,18 +1222,19 @@ Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc/dcmtk-3.6.9] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc/dcmtk-3.6.9-DEV] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only arch.-independent data [DATAROOTDIR/dcmtk-3.6.9] + --datadir=DIR read-only arch.-independent data [DATAROOTDIR/dcmtk-3.6.9-DEV] --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/dcmtk-3.6.9] + --docdir=DIR documentation root [DATAROOTDIR/doc/dcmtk-3.6.9-DEV] --htmldir=DIR html documentation [DOCDIR/html] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR]