From 53c98cce937b3a29b6e2b4fefb4b729299e391a0 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Wed, 22 Aug 2012 02:53:15 +0000 Subject: [PATCH] touched up configure.ac to produce substituable PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCH --- qse/Makefile.in | 3 +++ qse/cmd/Makefile.in | 3 +++ qse/cmd/awk/Makefile.in | 3 +++ qse/cmd/sed/Makefile.in | 3 +++ qse/cmd/stx/Makefile.in | 3 +++ qse/configure | 21 +++++++++++++++++---- qse/configure.ac | 18 ++++++++++++++---- qse/doc/Makefile.in | 3 +++ qse/doc/image/Makefile.in | 3 +++ qse/doc/page/Makefile.in | 3 +++ qse/include/Makefile.in | 3 +++ qse/include/qse/Makefile.am | 2 +- qse/include/qse/Makefile.in | 12 ++++++++---- qse/include/qse/awk/Makefile.in | 3 +++ qse/include/qse/cmn/Makefile.in | 3 +++ qse/include/qse/{conf_dos.h => conf-dos.h} | 8 +------- qse/include/qse/conf-inf.h | 12 ++++++++++++ qse/include/qse/{conf_msw.h => conf-msw.h} | 7 +------ qse/include/qse/{conf_os2.h => conf-os2.h} | 8 +------- qse/include/qse/{conf_vms.h => conf-vms.h} | 7 +------ qse/include/qse/net/Makefile.in | 3 +++ qse/include/qse/sed/Makefile.in | 3 +++ qse/include/qse/stx/Makefile.in | 3 +++ qse/include/qse/types.h | 8 ++++---- qse/lib/Makefile.in | 3 +++ qse/lib/awk/Makefile.in | 3 +++ qse/lib/cmn/Makefile.in | 3 +++ qse/lib/net/Makefile.in | 3 +++ qse/lib/sed/Makefile.in | 3 +++ qse/lib/stx/Makefile.in | 3 +++ qse/regress/Makefile.in | 3 +++ qse/regress/awk/Makefile.in | 3 +++ qse/regress/sed/Makefile.in | 3 +++ qse/samples/Makefile.in | 3 +++ qse/samples/awk/Makefile.in | 3 +++ qse/samples/cmn/Makefile.in | 3 +++ qse/samples/net/Makefile.in | 3 +++ qse/samples/sed/Makefile.in | 3 +++ qse/tools/Makefile.in | 3 +++ 39 files changed, 147 insertions(+), 43 deletions(-) rename qse/include/qse/{conf_dos.h => conf-dos.h} (91%) create mode 100644 qse/include/qse/conf-inf.h rename qse/include/qse/{conf_msw.h => conf-msw.h} (94%) rename qse/include/qse/{conf_os2.h => conf-os2.h} (89%) rename qse/include/qse/{conf_vms.h => conf-vms.h} (93%) diff --git a/qse/Makefile.in b/qse/Makefile.in index 4272a00f..3a3bc6f7 100644 --- a/qse/Makefile.in +++ b/qse/Makefile.in @@ -171,6 +171,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/cmd/Makefile.in b/qse/cmd/Makefile.in index 42c42ada..f9f9e188 100644 --- a/qse/cmd/Makefile.in +++ b/qse/cmd/Makefile.in @@ -156,6 +156,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/cmd/awk/Makefile.in b/qse/cmd/awk/Makefile.in index 666f801c..3e10711b 100644 --- a/qse/cmd/awk/Makefile.in +++ b/qse/cmd/awk/Makefile.in @@ -159,6 +159,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/cmd/sed/Makefile.in b/qse/cmd/sed/Makefile.in index 6e3331c5..6cdefb3f 100644 --- a/qse/cmd/sed/Makefile.in +++ b/qse/cmd/sed/Makefile.in @@ -145,6 +145,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/cmd/stx/Makefile.in b/qse/cmd/stx/Makefile.in index a424e624..0a5c7582 100644 --- a/qse/cmd/stx/Makefile.in +++ b/qse/cmd/stx/Makefile.in @@ -145,6 +145,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/configure b/qse/configure index 8ed99941..33b266ba 100755 --- a/qse/configure +++ b/qse/configure @@ -637,6 +637,9 @@ BUILD_MODE WCHAR_FALSE WCHAR_TRUE CHAR_MODE +PACKAGE_VERSION_PATCH +PACKAGE_VERSION_MINOR +PACKAGE_VERSION_MAJOR HAVE_C_MPI_FALSE HAVE_C_MPI_TRUE MPI_CLDFLAGS @@ -18153,24 +18156,34 @@ cat >>confdefs.h <<_ACEOF _ACEOF +qse_package_version_major="`echo ${PACKAGE_VERSION} | cut -d. -f1`" +qse_package_version_minor="`echo ${PACKAGE_VERSION} | cut -d. -f2`" +qse_package_version_patch="`echo ${PACKAGE_VERSION} | cut -d. -f3`" +PACKAGE_VERSION_MAJOR=${qse_package_version_major} + +PACKAGE_VERSION_MINOR=${qse_package_version_minor} + +PACKAGE_VERSION_PATCH=${qse_package_version_patch} + + cat >>confdefs.h <<_ACEOF -#define QSE_PACKAGE_VERSION "${VERSION}" +#define QSE_PACKAGE_VERSION "${PACKAGE_VERSION}" _ACEOF cat >>confdefs.h <<_ACEOF -#define QSE_PACKAGE_VERSION_MAJOR $(echo ${VERSION} | cut -d. -f1) +#define QSE_PACKAGE_VERSION_MAJOR ${qse_package_version_major} _ACEOF cat >>confdefs.h <<_ACEOF -#define QSE_PACKAGE_VERSION_MINOR $(echo ${VERSION} | cut -d. -f2) +#define QSE_PACKAGE_VERSION_MINOR ${qse_package_version_minor} _ACEOF cat >>confdefs.h <<_ACEOF -#define QSE_PACKAGE_VERSION_PATCH $(echo ${VERSION} | cut -d. -f3) +#define QSE_PACKAGE_VERSION_PATCH ${qse_package_version_patch} _ACEOF diff --git a/qse/configure.ac b/qse/configure.ac index 1cdd59b7..2f64d0a7 100644 --- a/qse/configure.ac +++ b/qse/configure.ac @@ -256,10 +256,20 @@ AC_DEFINE_UNQUOTED(QSE_SIZEOF_OFF64_T, ${ac_cv_sizeof_off64_t}, [sizeof(off64_t) AC_DEFINE_UNQUOTED(QSE_SIZEOF_MBSTATE_T, ${ac_cv_sizeof_mbstate_t}, [sizeof(mbstate_t)]) AC_DEFINE_UNQUOTED(QSE_MBLEN_MAX, ${ax_cv_numvalof_MB_LEN_MAX}, [MB_LEN_MAX]) -AC_DEFINE_UNQUOTED(QSE_PACKAGE_VERSION, "${VERSION}", [Package version]) -AC_DEFINE_UNQUOTED(QSE_PACKAGE_VERSION_MAJOR, $(echo ${VERSION} | cut -d. -f1), [Major version number]) -AC_DEFINE_UNQUOTED(QSE_PACKAGE_VERSION_MINOR, $(echo ${VERSION} | cut -d. -f2), [Minor version number]) -AC_DEFINE_UNQUOTED(QSE_PACKAGE_VERSION_PATCH, $(echo ${VERSION} | cut -d. -f3), [Patch level]) +qse_package_version_major="`echo ${PACKAGE_VERSION} | cut -d. -f1`" +qse_package_version_minor="`echo ${PACKAGE_VERSION} | cut -d. -f2`" +qse_package_version_patch="`echo ${PACKAGE_VERSION} | cut -d. -f3`" +AC_SUBST(PACKAGE_VERSION_MAJOR, ${qse_package_version_major}) +AC_SUBST(PACKAGE_VERSION_MINOR, ${qse_package_version_minor}) +AC_SUBST(PACKAGE_VERSION_PATCH, ${qse_package_version_patch}) + +AC_DEFINE_UNQUOTED(QSE_PACKAGE_VERSION, "${PACKAGE_VERSION}", [Package version]) +dnl AC_DEFINE_UNQUOTED(QSE_PACKAGE_VERSION_MAJOR, $(echo ${VERSION} | cut -d. -f1), [Major version number]) +dnl AC_DEFINE_UNQUOTED(QSE_PACKAGE_VERSION_MINOR, $(echo ${VERSION} | cut -d. -f2), [Minor version number]) +dnl AC_DEFINE_UNQUOTED(QSE_PACKAGE_VERSION_PATCH, $(echo ${VERSION} | cut -d. -f3), [Patch level]) +AC_DEFINE_UNQUOTED(QSE_PACKAGE_VERSION_MAJOR, ${qse_package_version_major}, [Major version number]) +AC_DEFINE_UNQUOTED(QSE_PACKAGE_VERSION_MINOR, ${qse_package_version_minor}, [Minor version number]) +AC_DEFINE_UNQUOTED(QSE_PACKAGE_VERSION_PATCH, ${qse_package_version_patch}, [Patch level]) AC_DEFINE_UNQUOTED(QSE_PACKAGE_AUTHOR,"${PACKAGE_BUGREPORT}", [Author]) AC_DEFINE_UNQUOTED(QSE_PACKAGE_NAME,"${PACKAGE_NAME}", [package name]) diff --git a/qse/doc/Makefile.in b/qse/doc/Makefile.in index bd7a0417..81a2c08b 100644 --- a/qse/doc/Makefile.in +++ b/qse/doc/Makefile.in @@ -160,6 +160,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/doc/image/Makefile.in b/qse/doc/image/Makefile.in index 2907e4cf..986a95b8 100644 --- a/qse/doc/image/Makefile.in +++ b/qse/doc/image/Makefile.in @@ -119,6 +119,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/doc/page/Makefile.in b/qse/doc/page/Makefile.in index 5b002e25..a1fc55b0 100644 --- a/qse/doc/page/Makefile.in +++ b/qse/doc/page/Makefile.in @@ -119,6 +119,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/include/Makefile.in b/qse/include/Makefile.in index 8c6125bf..3f86645c 100644 --- a/qse/include/Makefile.in +++ b/qse/include/Makefile.in @@ -157,6 +157,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/include/qse/Makefile.am b/qse/include/qse/Makefile.am index ba825ace..14f9b45d 100644 --- a/qse/include/qse/Makefile.am +++ b/qse/include/qse/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = cmn awk sed net stx pkgincludedir = $(includedir)/qse pkginclude_HEADERS = \ - conf_msw.h conf_os2.h conf_dos.h conf_vms.h \ + conf-msw.h conf-os2.h conf-dos.h conf-vms.h conf-inf.h \ types.h macros.h pack1.h unpack.h if ENABLE_CXX diff --git a/qse/include/qse/Makefile.in b/qse/include/qse/Makefile.in index a58ae3c4..0e89ba60 100644 --- a/qse/include/qse/Makefile.in +++ b/qse/include/qse/Makefile.in @@ -58,8 +58,9 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__pkginclude_HEADERS_DIST = conf_msw.h conf_os2.h conf_dos.h \ - conf_vms.h types.h macros.h pack1.h unpack.h Types.hpp +am__pkginclude_HEADERS_DIST = conf-msw.h conf-os2.h conf-dos.h \ + conf-vms.h conf-inf.h types.h macros.h pack1.h unpack.h \ + Types.hpp am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -185,6 +186,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -268,8 +272,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = cmn awk sed net stx -pkginclude_HEADERS = conf_msw.h conf_os2.h conf_dos.h conf_vms.h \ - types.h macros.h pack1.h unpack.h $(am__append_1) +pkginclude_HEADERS = conf-msw.h conf-os2.h conf-dos.h conf-vms.h \ + conf-inf.h types.h macros.h pack1.h unpack.h $(am__append_1) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/qse/include/qse/awk/Makefile.in b/qse/include/qse/awk/Makefile.in index 8f56d72f..61afbde2 100644 --- a/qse/include/qse/awk/Makefile.in +++ b/qse/include/qse/awk/Makefile.in @@ -146,6 +146,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/include/qse/cmn/Makefile.in b/qse/include/qse/cmn/Makefile.in index de6ab9e7..3ea301bf 100644 --- a/qse/include/qse/cmn/Makefile.in +++ b/qse/include/qse/cmn/Makefile.in @@ -150,6 +150,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/include/qse/conf_dos.h b/qse/include/qse/conf-dos.h similarity index 91% rename from qse/include/qse/conf_dos.h rename to qse/include/qse/conf-dos.h index 14acd4d7..961b5d93 100644 --- a/qse/include/qse/conf_dos.h +++ b/qse/include/qse/conf-dos.h @@ -86,10 +86,4 @@ # error Define the size of various data types. #endif -/* make sure you change these when you change - * the version in configure.ac */ -#define QSE_PACKAGE_VERSION "0.5.6" -#define QSE_PACKAGE_VERSION_MAJOR 0 -#define QSE_PACKAGE_VERSION_MINOR 5 -#define QSE_PACKAGE_VERSION_PATCH 6 - +#include "conf-inf.h" diff --git a/qse/include/qse/conf-inf.h b/qse/include/qse/conf-inf.h new file mode 100644 index 00000000..dc499143 --- /dev/null +++ b/qse/include/qse/conf-inf.h @@ -0,0 +1,12 @@ +#ifndef _QSE_CONF_INF_H_ +#define _QSE_CONF_INF_H_ + +/* change this information whenever you update + * package version in configure.ac */ + +#define QSE_PACKAGE_VERSION "0.5.7" +#define QSE_PACKAGE_VERSION_MAJOR 0 +#define QSE_PACKAGE_VERSION_MINOR 5 +#define QSE_PACKAGE_VERSION_PATCH 7 + +#endif diff --git a/qse/include/qse/conf_msw.h b/qse/include/qse/conf-msw.h similarity index 94% rename from qse/include/qse/conf_msw.h rename to qse/include/qse/conf-msw.h index d4b6edde..b5baa587 100644 --- a/qse/include/qse/conf_msw.h +++ b/qse/include/qse/conf-msw.h @@ -142,9 +142,4 @@ _M_X64 x64 platform # error Define the size of various data types. #endif -/* make sure you change these when you change - * the version in configure.ac */ -#define QSE_PACKAGE_VERSION "0.5.6" -#define QSE_PACKAGE_VERSION_MAJOR 0 -#define QSE_PACKAGE_VERSION_MINOR 5 -#define QSE_PACKAGE_VERSION_PATCH 6 +#include "conf-inf.h" diff --git a/qse/include/qse/conf_os2.h b/qse/include/qse/conf-os2.h similarity index 89% rename from qse/include/qse/conf_os2.h rename to qse/include/qse/conf-os2.h index d52e2883..31e3a081 100644 --- a/qse/include/qse/conf_os2.h +++ b/qse/include/qse/conf-os2.h @@ -63,10 +63,4 @@ # error Define the size of various data types. #endif -/* make sure you change these when you change - * the version in configure.ac */ -#define QSE_PACKAGE_VERSION "0.5.6" -#define QSE_PACKAGE_VERSION_MAJOR 0 -#define QSE_PACKAGE_VERSION_MINOR 5 -#define QSE_PACKAGE_VERSION_PATCH 6 - +#include "conf-inf.h" diff --git a/qse/include/qse/conf_vms.h b/qse/include/qse/conf-vms.h similarity index 93% rename from qse/include/qse/conf_vms.h rename to qse/include/qse/conf-vms.h index 0337f564..82673ec9 100644 --- a/qse/include/qse/conf_vms.h +++ b/qse/include/qse/conf-vms.h @@ -115,10 +115,5 @@ #define QSE_SIZEOF_MBSTATE_T 24 #define QSE_MBLEN_MAX 8 -/* make sure you change these when you change - * the version in configure.ac */ -#define QSE_PACKAGE_VERSION "0.5.6" -#define QSE_PACKAGE_VERSION_MAJOR 0 -#define QSE_PACKAGE_VERSION_MINOR 5 -#define QSE_PACKAGE_VERSION_PATCH 6 +#include "conf-inf.h" diff --git a/qse/include/qse/net/Makefile.in b/qse/include/qse/net/Makefile.in index fe967d08..14b6beab 100644 --- a/qse/include/qse/net/Makefile.in +++ b/qse/include/qse/net/Makefile.in @@ -144,6 +144,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/include/qse/sed/Makefile.in b/qse/include/qse/sed/Makefile.in index d269fcab..fca435ee 100644 --- a/qse/include/qse/sed/Makefile.in +++ b/qse/include/qse/sed/Makefile.in @@ -146,6 +146,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/include/qse/stx/Makefile.in b/qse/include/qse/stx/Makefile.in index 2291ff0f..fa3a26e2 100644 --- a/qse/include/qse/stx/Makefile.in +++ b/qse/include/qse/stx/Makefile.in @@ -144,6 +144,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/include/qse/types.h b/qse/include/qse/types.h index 4f291b3a..2553dc26 100644 --- a/qse/include/qse/types.h +++ b/qse/include/qse/types.h @@ -33,13 +33,13 @@ #if defined(QSE_HAVE_CONFIG_H) # include #elif defined(_WIN32) -# include +# include #elif defined(__OS2__) -# include +# include #elif defined(__DOS__) -# include +# include #elif defined(vms) || defined(__vms) -# include +# include #else # error Unsupported operating system #endif diff --git a/qse/lib/Makefile.in b/qse/lib/Makefile.in index 81aab7c6..a6a6bcd7 100644 --- a/qse/lib/Makefile.in +++ b/qse/lib/Makefile.in @@ -156,6 +156,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/lib/awk/Makefile.in b/qse/lib/awk/Makefile.in index b5dd95c8..a736d468 100644 --- a/qse/lib/awk/Makefile.in +++ b/qse/lib/awk/Makefile.in @@ -194,6 +194,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/lib/cmn/Makefile.in b/qse/lib/cmn/Makefile.in index be2bcec4..8eb6e31f 100644 --- a/qse/lib/cmn/Makefile.in +++ b/qse/lib/cmn/Makefile.in @@ -198,6 +198,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/lib/net/Makefile.in b/qse/lib/net/Makefile.in index 5e94087d..545608db 100644 --- a/qse/lib/net/Makefile.in +++ b/qse/lib/net/Makefile.in @@ -164,6 +164,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/lib/sed/Makefile.in b/qse/lib/sed/Makefile.in index c9876c77..adb9100e 100644 --- a/qse/lib/sed/Makefile.in +++ b/qse/lib/sed/Makefile.in @@ -181,6 +181,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/lib/stx/Makefile.in b/qse/lib/stx/Makefile.in index 4c894b8a..12ce988f 100644 --- a/qse/lib/stx/Makefile.in +++ b/qse/lib/stx/Makefile.in @@ -163,6 +163,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/regress/Makefile.in b/qse/regress/Makefile.in index bf0fb125..cba0121b 100644 --- a/qse/regress/Makefile.in +++ b/qse/regress/Makefile.in @@ -157,6 +157,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/regress/awk/Makefile.in b/qse/regress/awk/Makefile.in index 13649ef3..d9119021 100644 --- a/qse/regress/awk/Makefile.in +++ b/qse/regress/awk/Makefile.in @@ -120,6 +120,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/regress/sed/Makefile.in b/qse/regress/sed/Makefile.in index 181cb33f..264dac81 100644 --- a/qse/regress/sed/Makefile.in +++ b/qse/regress/sed/Makefile.in @@ -122,6 +122,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/samples/Makefile.in b/qse/samples/Makefile.in index 6e3cb6d0..d28a406b 100644 --- a/qse/samples/Makefile.in +++ b/qse/samples/Makefile.in @@ -157,6 +157,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/samples/awk/Makefile.in b/qse/samples/awk/Makefile.in index caef5dc9..24af5a88 100644 --- a/qse/samples/awk/Makefile.in +++ b/qse/samples/awk/Makefile.in @@ -227,6 +227,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/samples/cmn/Makefile.in b/qse/samples/cmn/Makefile.in index 0321a3d5..dea4e2be 100644 --- a/qse/samples/cmn/Makefile.in +++ b/qse/samples/cmn/Makefile.in @@ -295,6 +295,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/samples/net/Makefile.in b/qse/samples/net/Makefile.in index 63f84d5d..fa109d6d 100644 --- a/qse/samples/net/Makefile.in +++ b/qse/samples/net/Makefile.in @@ -149,6 +149,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/samples/sed/Makefile.in b/qse/samples/sed/Makefile.in index fae079f9..01508180 100644 --- a/qse/samples/sed/Makefile.in +++ b/qse/samples/sed/Makefile.in @@ -165,6 +165,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/qse/tools/Makefile.in b/qse/tools/Makefile.in index 937714a1..dfdad7c2 100644 --- a/qse/tools/Makefile.in +++ b/qse/tools/Makefile.in @@ -119,6 +119,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@