Take #2 on reversioning: decouple version and build from autoconf version

(which is used for the tar.gz name).  Also clean up Mkfiles/config.h

* configure.ac: Change autoconf version back to HEAD, add new PACKAGE_INTVER
and PACKAGE_BUILD config.h defines.
* cv-symline.c, yasm.c: Use PACKAGE_INTVER and PACKAGE_BUILD instead of
PACKAGE_STRING.
* genversion.c: Likewise.

* Mkfiles: Clean up and add PACKAGE_INTVER and PACKAGE_BUILD.

svn path=/trunk/yasm/; revision=1468

diff --git a/Mkfiles/dj/config.h b/Mkfiles/dj/config.h
index 0108dd8874a71cb0fb47cd89960b19cca8180ad4..0cf6bed7ab7305dcde7304502c787a26f88a148b 100644 (file)
--- a/Mkfiles/dj/config.h
+++ b/Mkfiles/dj/config.h
@@ -10,79 +10,18 @@
 /* Define if you have the `abort' function. */\r
 #define HAVE_ABORT 1\r
 \r
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */\r
-/* #undef HAVE_ALLOCA_H */\r
-\r
-/* Define to 1 if you have the `argz_append' function. */\r
-/* #undef HAVE_ARGZ_APPEND */\r
-\r
-/* Define to 1 if you have the `argz_create_sep' function. */\r
-/* #undef HAVE_ARGZ_CREATE_SEP */\r
-\r
-/* Define if you have the <argz.h> header file. */\r
-/* #undef HAVE_ARGZ_H */\r
-\r
-/* Define to 1 if you have the `argz_insert' function. */\r
-/* #undef HAVE_ARGZ_INSERT */\r
-\r
-/* Define to 1 if you have the `argz_next' function. */\r
-/* #undef HAVE_ARGZ_NEXT */\r
-\r
-/* Define to 1 if you have the `argz_stringify' function. */\r
-/* #undef HAVE_ARGZ_STRINGIFY */\r
-\r
-/* Define to 1 if you have the <assert.h> header file. */\r
-/* #undef HAVE_ASSERT_H */\r
-\r
-/* Define to 1 if you have the `basename' function. */\r
-#define HAVE_BASENAME 1\r
-\r
-/* Define to 1 if you have the `bcopy' function. */\r
-/* #undef HAVE_BCOPY */\r
-\r
 /* */\r
 /* #undef HAVE_CATGETS */\r
 \r
-/* Define to 1 if you have the `closedir' function. */\r
-/* #undef HAVE_CLOSEDIR */\r
-\r
-/* Define to 1 if you have the <ctype.h> header file. */\r
-#define HAVE_CTYPE_H 1\r
-\r
 /* Define if the GNU dcgettext() function is already present or preinstalled.\r
    */\r
 /* #undef HAVE_DCGETTEXT */\r
 \r
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.\r
-   */\r
-/* #undef HAVE_DIRENT_H */\r
-\r
-/* Define if you have the GNU dld library. */\r
-/* #undef HAVE_DLD */\r
-\r
-/* Define to 1 if you have the <dld.h> header file. */\r
-/* #undef HAVE_DLD_H */\r
-\r
-/* Define to 1 if you have the `dlerror' function. */\r
-/* #undef HAVE_DLERROR */\r
-\r
-/* Define to 1 if you have the <dlfcn.h> header file. */\r
-/* #undef HAVE_DLFCN_H */\r
-\r
-/* Define to 1 if you have the <dl.h> header file. */\r
-/* #undef HAVE_DL_H */\r
-\r
 /* Define if you don't have `vprintf' but do have `_doprnt'. */\r
 /* #undef HAVE_DOPRNT */\r
 \r
-/* Define to 1 if you have the <errno.h> header file. */\r
-#define HAVE_ERRNO_H 1\r
-\r
-/* Define to 1 if the system has the type `error_t'. */\r
-/* #undef HAVE_ERROR_T */\r
-\r
-/* Define if you have the `fork' function. */\r
-/* #undef HAVE_FORK */\r
+/* Define to 1 if you have the `getcwd' function. */\r
+#define HAVE_GETCWD 1\r
 \r
 /* */\r
 /* #undef HAVE_GETTEXT */\r
@@ -93,28 +32,18 @@
 /* Define if you have the iconv() function. */\r
 /* #undef HAVE_ICONV */\r
 \r
-/* Define to 1 if you have the `index' function. */\r
-/* #undef HAVE_INDEX */\r
-\r
 /* Define if you have the <inttypes.h> header file. */\r
 /* #undef HAVE_INTTYPES_H */\r
 \r
 /* */\r
 /* #undef HAVE_LC_MESSAGES */\r
 \r
-/* Define if you have the libdl library or equivalent. */\r
-/* #undef HAVE_LIBDL */\r
+/* Define to 1 if you have the <libgen.h> header file. */\r
+/* #undef HAVE_LIBGEN_H */\r
 \r
 /* Define if you have the <limits.h> header file. */\r
 #define HAVE_LIMITS_H 1\r
 \r
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and\r
-   to 0 otherwise. */\r
-#define HAVE_MALLOC 1\r
-\r
-/* Define if you have the <malloc.h> header file. */\r
-#define HAVE_MALLOC_H 1\r
-\r
 /* Define if you have the `memcpy' function. */\r
 #define HAVE_MEMCPY 1\r
 \r
@@ -127,45 +56,9 @@
 /* Define if you have the `mergesort function. */\r
 /* #undef HAVE_MERGESORT */\r
 \r
-/* Define if you have the `msgctl' function. */\r
-/* #undef HAVE_MSGCTL */\r
-\r
-/* Define if you have the `msgget' function. */\r
-/* #undef HAVE_MSGGET */\r
-\r
-/* Define if you have the `msgrcv' function. */\r
-/* #undef HAVE_MSGRCV */\r
-\r
-/* Define if you have the `msgsnd' function. */\r
-/* #undef HAVE_MSGSND */\r
-\r
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */\r
-/* #undef HAVE_NDIR_H */\r
-\r
-/* Define to 1 if you have the `opendir' function. */\r
-/* #undef HAVE_OPENDIR */\r
-\r
-/* Define if libtool can extract symbol lists from object files. */\r
-/* #undef HAVE_PRELOADED_SYMBOLS */\r
-\r
-/* Define to 1 if you have the `readdir' function. */\r
-/* #undefine HAVE_READDIR */\r
-\r
-/* Define to 1 if you have the `rindex' function. */\r
-/* #undef HAVE_RINDEX */\r
-\r
-/* Define if you have the shl_load function. */\r
-/* #undef HAVE_SHL_LOAD */\r
-\r
-/* Define if you have the `snprintf' function. */\r
-/* #undef HAVE_SNPRINTF */\r
-\r
 /* Define if you have the <stdint.h> header file. */\r
 #define HAVE_STDINT_H 1\r
 \r
-/* Define to 1 if you have the <stdio.h> header file. */\r
-#define HAVE_STDIO_H 1\r
-\r
 /* Define if you have the <stdlib.h> header file. */\r
 #define HAVE_STDLIB_H 1\r
 \r
@@ -175,18 +68,9 @@
 /* Define if you have the `strcasecmp' function. */\r
 #define HAVE_STRCASECMP 1\r
 \r
-/* Define if you have the `strchr' function. */\r
-#define HAVE_STRCHR 1\r
-\r
-/* Define to 1 if you have the `strcmp' function. */\r
-#define HAVE_STRCMP 1\r
-\r
 /* Define if you have the `strcmpi' function. */\r
 /* #undef HAVE_STRCMPI */\r
 \r
-/* Define if you have the `strerror' function. */\r
-#define HAVE_STRERROR 1\r
-\r
 /* Define if you have the `stricmp' function. */\r
 /* #undef HAVE_STRICMP */\r
 \r
@@ -205,32 +89,9 @@
 /* Define if you have the `strsep' function. */\r
 #define HAVE_STRSEP 1\r
 \r
-/* Define if you have the <sys/cdefs.h> header file. */\r
-#define HAVE_SYS_CDEFS_H 1\r
-\r
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.\r
-   */\r
-/* #undef HAVE_SYS_DIR_H */\r
-\r
-/* Define to 1 if you have the <sys/dl.h> header file. */\r
-/* #undef HAVE_SYS_DL_H */\r
-\r
-/* Define if you have the <sys/ipc.h> header file. */\r
-/* #undef HAVE_SYS_IPC_H */\r
-\r
-/* Define if you have the <sys/msg.h> header file. */\r
-/* #undef HAVE_SYS_MSG_H */\r
-\r
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.\r
-   */\r
-/* #undef HAVE_SYS_NDIR_H */\r
-\r
 /* Define if you have the <sys/param.h> header file. */\r
 #define HAVE_SYS_PARAM_H 1\r
 \r
-/* Define if you have the <sys/queue.h> header file. */\r
-/* #undef HAVE_SYS_QUEUE_H */\r
-\r
 /* Define if you have the <sys/stat.h> header file. */\r
 #define HAVE_SYS_STAT_H 1\r
 \r
@@ -246,107 +107,74 @@
 /* Define if you have the <unistd.h> header file. */\r
 #define HAVE_UNISTD_H 1\r
 \r
-/* Define if you have the `vfork' function. */\r
-/* #undef HAVE_VFORK */\r
-\r
-/* Define if you have the <vfork.h> header file. */\r
-/* #undef HAVE_VFORK_H */\r
-\r
 /* Define if you have the vprintf function. */\r
 #define HAVE_VPRINTF 1\r
 \r
 /* Define to 1 if you have the `vsnprintf' function. */\r
 /* #undef HAVE_VSNPRINTF */\r
 \r
-/* Define if you have the `wait' function. */\r
-#define HAVE_WAIT 1\r
-\r
-/* Define if `fork' works. */\r
-/* #undef HAVE_WORKING_FORK */\r
-\r
-/* Define if `vfork' works. */\r
-/* #undef HAVE_WORKING_VFORK */\r
-\r
-/* Define if the OS needs help to load dependent libraries for dlopen(). */\r
-#define LTDL_DLOPEN_DEPLIBS 1\r
-\r
-/* Define to the sub-directory in which libtool stores uninstalled libraries.\r
-   */\r
-#define LTDL_OBJDIR ".libs/"\r
-\r
-/* Define to the name of the environment variable that determines the dynamic\r
-   library search path. */\r
-#define LTDL_SHLIBPATH_VAR "PATH"\r
-\r
-/* Define to the extension used for shared libraries, say, ".so". */\r
-#define LTDL_SHLIB_EXT ".dll"\r
-\r
-/* Define to the system default library search path. */\r
-#define LTDL_SYSSEARCHPATH "/lib:/usr/lib"\r
-\r
-/* Define if dlsym() requires a leading underscode in symbol names. */\r
-/* #undef NEED_USCORE */\r
-\r
 /* Name of package */\r
 #define PACKAGE "yasm"\r
 \r
 /* Define to the address where bug reports for this package should be sent. */\r
 #define PACKAGE_BUGREPORT "bug-yasm@tortall.net"\r
 \r
+/* Define to build version of this package. */\r
+#define PACKAGE_BUILD "HEAD"\r
+\r
+/* Define to internal version of this package. */\r
+#define PACKAGE_INTVER "0.4.99"\r
+\r
 /* Define to the full name of this package. */\r
 #define PACKAGE_NAME "yasm"\r
 \r
 /* Define to the full name and version of this package. */\r
-#define PACKAGE_STRING "yasm 0.4.99.HEAD"\r
+#define PACKAGE_STRING "yasm HEAD"\r
 \r
 /* Define to the one symbol short name of this package. */\r
 #define PACKAGE_TARNAME "yasm"\r
 \r
 /* Define to the version of this package. */\r
-#define PACKAGE_VERSION "0.4.99.HEAD"\r
+#define PACKAGE_VERSION "HEAD"\r
 \r
 /* Define if the C compiler supports function prototypes. */\r
 #define PROTOTYPES 1\r
 \r
+/* The size of a `char', as computed by sizeof. */\r
+/* #undef SIZEOF_CHAR */\r
+\r
+/* The size of a `int', as computed by sizeof. */\r
+/* #undef SIZEOF_INT */\r
+\r
+/* The size of a `long', as computed by sizeof. */\r
+/* #undef SIZEOF_LONG */\r
+\r
+/* The size of a `short', as computed by sizeof. */\r
+/* #undef SIZEOF_SHORT */\r
+\r
+/* The size of a `void*', as computed by sizeof. */\r
+/* #undef SIZEOF_VOIDP */\r
+\r
 /* Define if you have the ANSI C header files. */\r
 #define STDC_HEADERS 1\r
 \r
-/* Combined test for fork/wait/msg* */\r
-/* #undef USE_FORKWAITMSG */\r
-\r
 /* Version number of package */\r
 #define VERSION "HEAD"\r
 \r
 /* Define if using the dmalloc debugging malloc package */\r
 /* #undef WITH_DMALLOC */\r
 \r
-/* Make sure we see all GNU extensions. */\r
-/* #undef _GNU_SOURCE */\r
-\r
-/* Make sure we see all SVID extensions. */\r
-/* #undef _SVID_SOURCE */\r
-\r
 /* Define like PROTOTYPES; this can be used by system headers. */\r
 #define __PROTOTYPES 1\r
 \r
 /* Define to empty if `const' does not conform to ANSI C. */\r
 /* #undef const */\r
 \r
-/* Define to a type to use for `error_t' if it is not otherwise available. */\r
-#define error_t int\r
-\r
 /* Define as `__inline' if that's what the C compiler calls it, or to nothing\r
    if it is not supported. */\r
+#ifndef __cplusplus\r
 /* #undef inline */\r
-\r
-/* Define to rpl_malloc if the replacement function should be used. */\r
-/* #undef malloc */\r
-\r
-/* Define to `int' if <sys/types.h> doesn't define. */\r
-/* #undef pid_t */\r
+#endif\r
 \r
 /* Define to `unsigned' if <sys/types.h> doesn't define. */\r
 /* #undef size_t */\r
-\r
-/* Define as `fork' if `vfork' does not work. */\r
-/* #undef vfork */\r

diff --git a/Mkfiles/vc/config.h b/Mkfiles/vc/config.h
index baeb5aae2a810cb99f759e0583a128f5e2400fe5..3374f35247a1b1328c7ca3f61ef8fdfdf2c7e0ee 100644 (file)
--- a/Mkfiles/vc/config.h
+++ b/Mkfiles/vc/config.h
@@ -10,79 +10,18 @@
 /* Define if you have the `abort' function. */\r
 #define HAVE_ABORT 1\r
 \r
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */\r
-/* #undef HAVE_ALLOCA_H */\r
-\r
-/* Define to 1 if you have the `argz_append' function. */\r
-/* #undef HAVE_ARGZ_APPEND */\r
-\r
-/* Define to 1 if you have the `argz_create_sep' function. */\r
-/* #undef HAVE_ARGZ_CREATE_SEP */\r
-\r
-/* Define if you have the <argz.h> header file. */\r
-/* #undef HAVE_ARGZ_H */\r
-\r
-/* Define to 1 if you have the `argz_insert' function. */\r
-/* #undef HAVE_ARGZ_INSERT */\r
-\r
-/* Define to 1 if you have the `argz_next' function. */\r
-/* #undef HAVE_ARGZ_NEXT */\r
-\r
-/* Define to 1 if you have the `argz_stringify' function. */\r
-/* #undef HAVE_ARGZ_STRINGIFY */\r
-\r
-/* Define to 1 if you have the <assert.h> header file. */\r
-/* #undef HAVE_ASSERT_H */\r
-\r
-/* Define to 1 if you have the `basename' function. */\r
-#define HAVE_BASENAME 1\r
-\r
-/* Define to 1 if you have the `bcopy' function. */\r
-/* #undef HAVE_BCOPY */\r
-\r
 /* */\r
 /* #undef HAVE_CATGETS */\r
 \r
-/* Define to 1 if you have the `closedir' function. */\r
-/* #undef HAVE_CLOSEDIR */\r
-\r
-/* Define to 1 if you have the <ctype.h> header file. */\r
-#define HAVE_CTYPE_H 1\r
-\r
 /* Define if the GNU dcgettext() function is already present or preinstalled.\r
    */\r
 /* #undef HAVE_DCGETTEXT */\r
 \r
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.\r
-   */\r
-/* #undef HAVE_DIRENT_H */\r
-\r
-/* Define if you have the GNU dld library. */\r
-/* #undef HAVE_DLD */\r
-\r
-/* Define to 1 if you have the <dld.h> header file. */\r
-/* #undef HAVE_DLD_H */\r
-\r
-/* Define to 1 if you have the `dlerror' function. */\r
-/* #undef HAVE_DLERROR */\r
-\r
-/* Define to 1 if you have the <dlfcn.h> header file. */\r
-/* #undef HAVE_DLFCN_H */\r
-\r
-/* Define to 1 if you have the <dl.h> header file. */\r
-/* #undef HAVE_DL_H */\r
-\r
 /* Define if you don't have `vprintf' but do have `_doprnt'. */\r
 /* #undef HAVE_DOPRNT */\r
 \r
-/* Define to 1 if you have the <errno.h> header file. */\r
-#define HAVE_ERRNO_H 1\r
-\r
-/* Define to 1 if the system has the type `error_t'. */\r
-/* #undef HAVE_ERROR_T */\r
-\r
-/* Define if you have the `fork' function. */\r
-/* #undef HAVE_FORK */\r
+/* Define to 1 if you have the `getcwd' function. */\r
+#define HAVE_GETCWD 1\r
 \r
 /* */\r
 /* #undef HAVE_GETTEXT */\r
@@ -93,28 +32,18 @@
 /* Define if you have the iconv() function. */\r
 /* #undef HAVE_ICONV */\r
 \r
-/* Define to 1 if you have the `index' function. */\r
-/* #undef HAVE_INDEX */\r
-\r
 /* Define if you have the <inttypes.h> header file. */\r
 /* #undef HAVE_INTTYPES_H */\r
 \r
 /* */\r
 /* #undef HAVE_LC_MESSAGES */\r
 \r
-/* Define if you have the libdl library or equivalent. */\r
-/* #undef HAVE_LIBDL */\r
+/* Define to 1 if you have the <libgen.h> header file. */\r
+/* #undef HAVE_LIBGEN_H */\r
 \r
 /* Define if you have the <limits.h> header file. */\r
 #define HAVE_LIMITS_H 1\r
 \r
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and\r
-   to 0 otherwise. */\r
-#define HAVE_MALLOC 1\r
-\r
-/* Define if you have the <malloc.h> header file. */\r
-#define HAVE_MALLOC_H 1\r
-\r
 /* Define if you have the `memcpy' function. */\r
 #define HAVE_MEMCPY 1\r
 \r
@@ -127,46 +56,9 @@
 /* Define if you have the `mergesort function. */\r
 /* #undef HAVE_MERGESORT */\r
 \r
-/* Define if you have the `msgctl' function. */\r
-/* #undef HAVE_MSGCTL */\r
-\r
-/* Define if you have the `msgget' function. */\r
-/* #undef HAVE_MSGGET */\r
-\r
-/* Define if you have the `msgrcv' function. */\r
-/* #undef HAVE_MSGRCV */\r
-\r
-/* Define if you have the `msgsnd' function. */\r
-/* #undef HAVE_MSGSND */\r
-\r
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */\r
-/* #undef HAVE_NDIR_H */\r
-\r
-/* Define to 1 if you have the `opendir' function. */\r
-/* #undef HAVE_OPENDIR */\r
-\r
-/* Define if libtool can extract symbol lists from object files. */\r
-/* #undef HAVE_PRELOADED_SYMBOLS */\r
-\r
-/* Define to 1 if you have the `readdir' function. */\r
-/* #undefine HAVE_READDIR */\r
-\r
-/* Define to 1 if you have the `rindex' function. */\r
-/* #undef HAVE_RINDEX */\r
-\r
-/* Define if you have the shl_load function. */\r
-/* #undef HAVE_SHL_LOAD */\r
-\r
-/* Define if you have the `snprintf' function. */\r
-#define HAVE_SNPRINTF 1\r
-#define snprintf _snprintf\r
-\r
 /* Define if you have the <stdint.h> header file. */\r
 /* #undef HAVE_STDINT_H */\r
 \r
-/* Define to 1 if you have the <stdio.h> header file. */\r
-#define HAVE_STDIO_H 1\r
-\r
 /* Define if you have the <stdlib.h> header file. */\r
 #define HAVE_STDLIB_H 1\r
 \r
@@ -176,22 +68,11 @@
 /* Define if you have the `strcasecmp' function. */\r
 /* #undef HAVE_STRCASECMP */\r
 \r
-/* Define if you have the `strchr' function. */\r
-#define HAVE_STRCHR 1\r
-\r
-/* Define to 1 if you have the `strcmp' function. */\r
-#define HAVE_STRCMP 1\r
-\r
 /* Define if you have the `strcmpi' function. */\r
-#define HAVE_STRCMPI 1\r
-#define strcmpi _strcmpi\r
-\r
-/* Define if you have the `strerror' function. */\r
-#define HAVE_STRERROR 1\r
+/* #undefine HAVE_STRCMPI */\r
 \r
 /* Define if you have the `stricmp' function. */\r
-#define HAVE_STRICMP 1\r
-#define stricmp _stricmp\r
+#define HAVE__STRICMP 1\r
 \r
 /* Define if you have the <strings.h> header file. */\r
 /* #undef HAVE_STRINGS_H */\r
@@ -208,32 +89,9 @@
 /* Define if you have the `strsep' function. */\r
 /* #undef HAVE_STRSEP */\r
 \r
-/* Define if you have the <sys/cdefs.h> header file. */\r
-/* #undef HAVE_SYS_CDEFS_H */\r
-\r
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.\r
-   */\r
-/* #undef HAVE_SYS_DIR_H */\r
-\r
-/* Define to 1 if you have the <sys/dl.h> header file. */\r
-/* #undef HAVE_SYS_DL_H */\r
-\r
-/* Define if you have the <sys/ipc.h> header file. */\r
-/* #undef HAVE_SYS_IPC_H */\r
-\r
-/* Define if you have the <sys/msg.h> header file. */\r
-/* #undef HAVE_SYS_MSG_H */\r
-\r
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.\r
-   */\r
-/* #undef HAVE_SYS_NDIR_H */\r
-\r
 /* Define if you have the <sys/param.h> header file. */\r
 /* #undef HAVE_SYS_PARAM_H */\r
 \r
-/* Define if you have the <sys/queue.h> header file. */\r
-/* #undef HAVE_SYS_QUEUE_H */\r
-\r
 /* Define if you have the <sys/stat.h> header file. */\r
 /* #undef HAVE_SYS_STAT_H */\r
 \r
@@ -250,107 +108,74 @@
 /* Define if you have the <unistd.h> header file. */\r
 /* #undef HAVE_UNISTD_H */\r
 \r
-/* Define if you have the `vfork' function. */\r
-/* #undef HAVE_VFORK */\r
-\r
-/* Define if you have the <vfork.h> header file. */\r
-/* #undef HAVE_VFORK_H */\r
-\r
 /* Define if you have the vprintf function. */\r
 #define HAVE_VPRINTF 1\r
 \r
 /* Define to 1 if you have the `vsnprintf' function. */\r
 /* #undef HAVE_VSNPRINTF */\r
 \r
-/* Define if you have the `wait' function. */\r
-/* #undef HAVE_WAIT */\r
-\r
-/* Define if `fork' works. */\r
-/* #undef HAVE_WORKING_FORK */\r
-\r
-/* Define if `vfork' works. */\r
-/* #undef HAVE_WORKING_VFORK */\r
-\r
-/* Define if the OS needs help to load dependent libraries for dlopen(). */\r
-#define LTDL_DLOPEN_DEPLIBS 1\r
-\r
-/* Define to the sub-directory in which libtool stores uninstalled libraries.\r
-   */\r
-#define LTDL_OBJDIR ".libs/"\r
-\r
-/* Define to the name of the environment variable that determines the dynamic\r
-   library search path. */\r
-#define LTDL_SHLIBPATH_VAR "PATH"\r
-\r
-/* Define to the extension used for shared libraries, say, ".so". */\r
-#define LTDL_SHLIB_EXT ".dll"\r
-\r
-/* Define to the system default library search path. */\r
-#define LTDL_SYSSEARCHPATH "/lib:/usr/lib"\r
-\r
-/* Define if dlsym() requires a leading underscode in symbol names. */\r
-/* #undef NEED_USCORE */\r
-\r
 /* Name of package */\r
 #define PACKAGE "yasm"\r
 \r
 /* Define to the address where bug reports for this package should be sent. */\r
 #define PACKAGE_BUGREPORT "bug-yasm@tortall.net"\r
 \r
+/* Define to build version of this package. */\r
+#define PACKAGE_BUILD "HEAD"\r
+\r
+/* Define to internal version of this package. */\r
+#define PACKAGE_INTVER "0.4.99"\r
+\r
 /* Define to the full name of this package. */\r
 #define PACKAGE_NAME "yasm"\r
 \r
 /* Define to the full name and version of this package. */\r
-#define PACKAGE_STRING "yasm 0.4.99.HEAD"\r
+#define PACKAGE_STRING "yasm HEAD"\r
 \r
 /* Define to the one symbol short name of this package. */\r
 #define PACKAGE_TARNAME "yasm"\r
 \r
 /* Define to the version of this package. */\r
-#define PACKAGE_VERSION "0.4.99.HEAD"\r
+#define PACKAGE_VERSION "HEAD"\r
 \r
 /* Define if the C compiler supports function prototypes. */\r
 #define PROTOTYPES 1\r
 \r
+/* The size of a `char', as computed by sizeof. */\r
+/* #undef SIZEOF_CHAR */\r
+\r
+/* The size of a `int', as computed by sizeof. */\r
+/* #undef SIZEOF_INT */\r
+\r
+/* The size of a `long', as computed by sizeof. */\r
+/* #undef SIZEOF_LONG */\r
+\r
+/* The size of a `short', as computed by sizeof. */\r
+/* #undef SIZEOF_SHORT */\r
+\r
+/* The size of a `void*', as computed by sizeof. */\r
+/* #undef SIZEOF_VOIDP */\r
+\r
 /* Define if you have the ANSI C header files. */\r
 #define STDC_HEADERS 1\r
 \r
-/* Combined test for fork/wait/msg* */\r
-/* #undef USE_FORKWAITMSG */\r
-\r
 /* Version number of package */\r
 #define VERSION "HEAD"\r
 \r
 /* Define if using the dmalloc debugging malloc package */\r
 /* #undef WITH_DMALLOC */\r
 \r
-/* Make sure we see all GNU extensions. */\r
-/* #undef _GNU_SOURCE */\r
-\r
-/* Make sure we see all SVID extensions. */\r
-/* #undef _SVID_SOURCE */\r
-\r
 /* Define like PROTOTYPES; this can be used by system headers. */\r
 #define __PROTOTYPES 1\r
 \r
 /* Define to empty if `const' does not conform to ANSI C. */\r
 /* #undef const */\r
 \r
-/* Define to a type to use for `error_t' if it is not otherwise available. */\r
-#define error_t int\r
-\r
 /* Define as `__inline' if that's what the C compiler calls it, or to nothing\r
    if it is not supported. */\r
+#ifndef __cplusplus\r
 /* #undef inline */\r
-\r
-/* Define to rpl_malloc if the replacement function should be used. */\r
-/* #undef malloc */\r
-\r
-/* Define to `int' if <sys/types.h> doesn't define. */\r
-#define pid_t int\r
+#endif\r
 \r
 /* Define to `unsigned' if <sys/types.h> doesn't define. */\r
 /* #undef size_t */\r
-\r
-/* Define as `fork' if `vfork' does not work. */\r
-/* #undef vfork */\r

diff --git a/Mkfiles/vc8/config.h b/Mkfiles/vc8/config.h
index 316a933ecbd3f3945db5d800eb7fca0dce0c9631..8c4caf808b309905deea55c9f67f524df429e4c6 100644 (file)
--- a/Mkfiles/vc8/config.h
+++ b/Mkfiles/vc8/config.h
@@ -12,79 +12,18 @@
 /* Define if you have the `abort' function. */\r
 #define HAVE_ABORT 1\r
 \r
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */\r
-/* #undef HAVE_ALLOCA_H */\r
-\r
-/* Define to 1 if you have the `argz_append' function. */\r
-/* #undef HAVE_ARGZ_APPEND */\r
-\r
-/* Define to 1 if you have the `argz_create_sep' function. */\r
-/* #undef HAVE_ARGZ_CREATE_SEP */\r
-\r
-/* Define if you have the <argz.h> header file. */\r
-/* #undef HAVE_ARGZ_H */\r
-\r
-/* Define to 1 if you have the `argz_insert' function. */\r
-/* #undef HAVE_ARGZ_INSERT */\r
-\r
-/* Define to 1 if you have the `argz_next' function. */\r
-/* #undef HAVE_ARGZ_NEXT */\r
-\r
-/* Define to 1 if you have the `argz_stringify' function. */\r
-/* #undef HAVE_ARGZ_STRINGIFY */\r
-\r
-/* Define to 1 if you have the <assert.h> header file. */\r
-/* #undef HAVE_ASSERT_H */\r
-\r
-/* Define to 1 if you have the `basename' function. */\r
-#define HAVE_BASENAME 1\r
-\r
-/* Define to 1 if you have the `bcopy' function. */\r
-/* #undef HAVE_BCOPY */\r
-\r
 /* */\r
 /* #undef HAVE_CATGETS */\r
 \r
-/* Define to 1 if you have the `closedir' function. */\r
-/* #undef HAVE_CLOSEDIR */\r
-\r
-/* Define to 1 if you have the <ctype.h> header file. */\r
-#define HAVE_CTYPE_H 1\r
-\r
 /* Define if the GNU dcgettext() function is already present or preinstalled.\r
    */\r
 /* #undef HAVE_DCGETTEXT */\r
 \r
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.\r
-   */\r
-/* #undef HAVE_DIRENT_H */\r
-\r
-/* Define if you have the GNU dld library. */\r
-/* #undef HAVE_DLD */\r
-\r
-/* Define to 1 if you have the <dld.h> header file. */\r
-/* #undef HAVE_DLD_H */\r
-\r
-/* Define to 1 if you have the `dlerror' function. */\r
-/* #undef HAVE_DLERROR */\r
-\r
-/* Define to 1 if you have the <dlfcn.h> header file. */\r
-/* #undef HAVE_DLFCN_H */\r
-\r
-/* Define to 1 if you have the <dl.h> header file. */\r
-/* #undef HAVE_DL_H */\r
-\r
 /* Define if you don't have `vprintf' but do have `_doprnt'. */\r
 /* #undef HAVE_DOPRNT */\r
 \r
-/* Define to 1 if you have the <errno.h> header file. */\r
-#define HAVE_ERRNO_H 1\r
-\r
-/* Define to 1 if the system has the type `error_t'. */\r
-/* #undef HAVE_ERROR_T */\r
-\r
-/* Define if you have the `fork' function. */\r
-/* #undef HAVE_FORK */\r
+/* Define to 1 if you have the `getcwd' function. */\r
+#define HAVE_GETCWD 1\r
 \r
 /* */\r
 /* #undef HAVE_GETTEXT */\r
@@ -95,28 +34,18 @@
 /* Define if you have the iconv() function. */\r
 /* #undef HAVE_ICONV */\r
 \r
-/* Define to 1 if you have the `index' function. */\r
-/* #undef HAVE_INDEX */\r
-\r
 /* Define if you have the <inttypes.h> header file. */\r
 /* #undef HAVE_INTTYPES_H */\r
 \r
 /* */\r
 /* #undef HAVE_LC_MESSAGES */\r
 \r
-/* Define if you have the libdl library or equivalent. */\r
-/* #undef HAVE_LIBDL */\r
+/* Define to 1 if you have the <libgen.h> header file. */\r
+/* #undef HAVE_LIBGEN_H */\r
 \r
 /* Define if you have the <limits.h> header file. */\r
 #define HAVE_LIMITS_H 1\r
 \r
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and\r
-   to 0 otherwise. */\r
-#define HAVE_MALLOC 1\r
-\r
-/* Define if you have the <malloc.h> header file. */\r
-#define HAVE_MALLOC_H 1\r
-\r
 /* Define if you have the `memcpy' function. */\r
 #define HAVE_MEMCPY 1\r
 \r
@@ -129,46 +58,9 @@
 /* Define if you have the `mergesort function. */\r
 /* #undef HAVE_MERGESORT */\r
 \r
-/* Define if you have the `msgctl' function. */\r
-/* #undef HAVE_MSGCTL */\r
-\r
-/* Define if you have the `msgget' function. */\r
-/* #undef HAVE_MSGGET */\r
-\r
-/* Define if you have the `msgrcv' function. */\r
-/* #undef HAVE_MSGRCV */\r
-\r
-/* Define if you have the `msgsnd' function. */\r
-/* #undef HAVE_MSGSND */\r
-\r
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */\r
-/* #undef HAVE_NDIR_H */\r
-\r
-/* Define to 1 if you have the `opendir' function. */\r
-/* #undef HAVE_OPENDIR */\r
-\r
-/* Define if libtool can extract symbol lists from object files. */\r
-/* #undef HAVE_PRELOADED_SYMBOLS */\r
-\r
-/* Define to 1 if you have the `readdir' function. */\r
-/* #undefine HAVE_READDIR */\r
-\r
-/* Define to 1 if you have the `rindex' function. */\r
-/* #undef HAVE_RINDEX */\r
-\r
-/* Define if you have the shl_load function. */\r
-/* #undef HAVE_SHL_LOAD */\r
-\r
-/* Define if you have the `snprintf' function. */\r
-#define HAVE_SNPRINTF 1\r
-#define snprintf _snprintf\r
-\r
 /* Define if you have the <stdint.h> header file. */\r
 /* #undef HAVE_STDINT_H */\r
 \r
-/* Define to 1 if you have the <stdio.h> header file. */\r
-#define HAVE_STDIO_H 1\r
-\r
 /* Define if you have the <stdlib.h> header file. */\r
 #define HAVE_STDLIB_H 1\r
 \r
@@ -178,18 +70,9 @@
 /* Define if you have the `strcasecmp' function. */\r
 /* #undef HAVE_STRCASECMP */\r
 \r
-/* Define if you have the `strchr' function. */\r
-#define HAVE_STRCHR 1\r
-\r
-/* Define to 1 if you have the `strcmp' function. */\r
-#define HAVE_STRCMP 1\r
-\r
 /* Define if you have the `strcmpi' function. */\r
 /* #undef HAVE_STRCMPI */\r
 \r
-/* Define if you have the `strerror' function. */\r
-#define HAVE_STRERROR 1\r
-\r
 /* Define if you have the `stricmp' function. */\r
 #define HAVE__STRICMP 1\r
 \r
@@ -208,32 +91,9 @@
 /* Define if you have the `strsep' function. */\r
 /* #undef HAVE_STRSEP */\r
 \r
-/* Define if you have the <sys/cdefs.h> header file. */\r
-/* #undef HAVE_SYS_CDEFS_H */\r
-\r
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.\r
-   */\r
-/* #undef HAVE_SYS_DIR_H */\r
-\r
-/* Define to 1 if you have the <sys/dl.h> header file. */\r
-/* #undef HAVE_SYS_DL_H */\r
-\r
-/* Define if you have the <sys/ipc.h> header file. */\r
-/* #undef HAVE_SYS_IPC_H */\r
-\r
-/* Define if you have the <sys/msg.h> header file. */\r
-/* #undef HAVE_SYS_MSG_H */\r
-\r
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.\r
-   */\r
-/* #undef HAVE_SYS_NDIR_H */\r
-\r
 /* Define if you have the <sys/param.h> header file. */\r
 /* #undef HAVE_SYS_PARAM_H */\r
 \r
-/* Define if you have the <sys/queue.h> header file. */\r
-/* #undef HAVE_SYS_QUEUE_H */\r
-\r
 /* Define if you have the <sys/stat.h> header file. */\r
 /* #undef HAVE_SYS_STAT_H */\r
 \r
@@ -250,107 +110,74 @@
 /* Define if you have the <unistd.h> header file. */\r
 /* #undef HAVE_UNISTD_H */\r
 \r
-/* Define if you have the `vfork' function. */\r
-/* #undef HAVE_VFORK */\r
-\r
-/* Define if you have the <vfork.h> header file. */\r
-/* #undef HAVE_VFORK_H */\r
-\r
 /* Define if you have the vprintf function. */\r
 #define HAVE_VPRINTF 1\r
 \r
 /* Define to 1 if you have the `vsnprintf' function. */\r
 /* #undef HAVE_VSNPRINTF */\r
 \r
-/* Define if you have the `wait' function. */\r
-/* #undef HAVE_WAIT */\r
-\r
-/* Define if `fork' works. */\r
-/* #undef HAVE_WORKING_FORK */\r
-\r
-/* Define if `vfork' works. */\r
-/* #undef HAVE_WORKING_VFORK */\r
-\r
-/* Define if the OS needs help to load dependent libraries for dlopen(). */\r
-#define LTDL_DLOPEN_DEPLIBS 1\r
-\r
-/* Define to the sub-directory in which libtool stores uninstalled libraries.\r
-   */\r
-#define LTDL_OBJDIR ".libs/"\r
-\r
-/* Define to the name of the environment variable that determines the dynamic\r
-   library search path. */\r
-#define LTDL_SHLIBPATH_VAR "PATH"\r
-\r
-/* Define to the extension used for shared libraries, say, ".so". */\r
-#define LTDL_SHLIB_EXT ".dll"\r
-\r
-/* Define to the system default library search path. */\r
-#define LTDL_SYSSEARCHPATH "/lib:/usr/lib"\r
-\r
-/* Define if dlsym() requires a leading underscode in symbol names. */\r
-/* #undef NEED_USCORE */\r
-\r
 /* Name of package */\r
 #define PACKAGE "yasm"\r
 \r
 /* Define to the address where bug reports for this package should be sent. */\r
 #define PACKAGE_BUGREPORT "bug-yasm@tortall.net"\r
 \r
+/* Define to build version of this package. */\r
+#define PACKAGE_BUILD "HEAD"\r
+\r
+/* Define to internal version of this package. */\r
+#define PACKAGE_INTVER "0.4.99"\r
+\r
 /* Define to the full name of this package. */\r
 #define PACKAGE_NAME "yasm"\r
 \r
 /* Define to the full name and version of this package. */\r
-#define PACKAGE_STRING "yasm 0.4.99.HEAD"\r
+#define PACKAGE_STRING "yasm HEAD"\r
 \r
 /* Define to the one symbol short name of this package. */\r
 #define PACKAGE_TARNAME "yasm"\r
 \r
 /* Define to the version of this package. */\r
-#define PACKAGE_VERSION "0.4.99.HEAD"\r
+#define PACKAGE_VERSION "HEAD"\r
 \r
 /* Define if the C compiler supports function prototypes. */\r
 #define PROTOTYPES 1\r
 \r
+/* The size of a `char', as computed by sizeof. */\r
+/* #undef SIZEOF_CHAR */\r
+\r
+/* The size of a `int', as computed by sizeof. */\r
+/* #undef SIZEOF_INT */\r
+\r
+/* The size of a `long', as computed by sizeof. */\r
+/* #undef SIZEOF_LONG */\r
+\r
+/* The size of a `short', as computed by sizeof. */\r
+/* #undef SIZEOF_SHORT */\r
+\r
+/* The size of a `void*', as computed by sizeof. */\r
+/* #undef SIZEOF_VOIDP */\r
+\r
 /* Define if you have the ANSI C header files. */\r
 #define STDC_HEADERS 1\r
 \r
-/* Combined test for fork/wait/msg* */\r
-/* #undef USE_FORKWAITMSG */\r
-\r
 /* Version number of package */\r
 #define VERSION "HEAD"\r
 \r
 /* Define if using the dmalloc debugging malloc package */\r
 /* #undef WITH_DMALLOC */\r
 \r
-/* Make sure we see all GNU extensions. */\r
-/* #undef _GNU_SOURCE */\r
-\r
-/* Make sure we see all SVID extensions. */\r
-/* #undef _SVID_SOURCE */\r
-\r
 /* Define like PROTOTYPES; this can be used by system headers. */\r
 #define __PROTOTYPES 1\r
 \r
 /* Define to empty if `const' does not conform to ANSI C. */\r
 /* #undef const */\r
 \r
-/* Define to a type to use for `error_t' if it is not otherwise available. */\r
-#define error_t int\r
-\r
 /* Define as `__inline' if that's what the C compiler calls it, or to nothing\r
    if it is not supported. */\r
+#ifndef __cplusplus\r
 /* #undef inline */\r
-\r
-/* Define to rpl_malloc if the replacement function should be used. */\r
-/* #undef malloc */\r
-\r
-/* Define to `int' if <sys/types.h> doesn't define. */\r
-#define pid_t int\r
+#endif\r
 \r
 /* Define to `unsigned' if <sys/types.h> doesn't define. */\r
 /* #undef size_t */\r
-\r
-/* Define as `fork' if `vfork' does not work. */\r
-/* #undef vfork */\r

diff --git a/configure.ac b/configure.ac
index 70ef04b6aafc4e3e60ec306c12cb2c018567ce6e..259f4c10498bae8da56d891652b42f9f5b90f73f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,14 +5,18 @@
 # autoconf setup
 #
 AC_PREREQ(2.53)
-AC_INIT([yasm], [0.4.99.HEAD], [bug-yasm@tortall.net])
+AC_INIT([yasm], [HEAD], [bug-yasm@tortall.net])
 #AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER([config.h])
 
-AM_INIT_AUTOMAKE(yasm, [0.4.99.HEAD])
+AM_INIT_AUTOMAKE(yasm, [HEAD])
 AM_MAINTAINER_MODE
 
+AC_DEFINE(PACKAGE_INTVER, ["0.4.99"],
+         [Define to internal version of this package.])
+AC_DEFINE(PACKAGE_BUILD, ["HEAD"], [Define to build version of this package.])
+
 #
 # autoconf command-line options
 #

diff --git a/frontends/yasm/yasm.c b/frontends/yasm/yasm.c
index 1d28b3320db17bf47de94db1c74167862c655584..b7bc7e413a01bef5e90da241651733276072871c 100644 (file)
--- a/frontends/yasm/yasm.c
+++ b/frontends/yasm/yasm.c
@@ -173,7 +173,7 @@ static opt_option options[] =
 
 /* version message */
 /*@observer@*/ static const char *version_msg[] = {
-    PACKAGE_STRING,
+    PACKAGE_NAME " " PACKAGE_INTVER "." PACKAGE_BUILD,
     "Compiled on " __DATE__ ".",
     "Copyright (c) 2001-2006 Peter Johnson and other Yasm developers.",
     "Run yasm --license for licensing overview and summary."

diff --git a/modules/dbgfmts/codeview/cv-symline.c b/modules/dbgfmts/codeview/cv-symline.c
index 1640a47c45a2800045a3fb74207b5cdb10be2d2d..3d7ce69391add010b22b5e75c251cc255e03e507 100644 (file)
--- a/modules/dbgfmts/codeview/cv-symline.c
+++ b/modules/dbgfmts/codeview/cv-symline.c
@@ -631,7 +631,8 @@ yasm_cv__generate_symline(yasm_dbgfmt_cv *dbgfmt_cv)
     cv8_add_sym_objname(dbgfmt_cv, info.debug_symline,
        yasm__abspath(yasm_object_get_object_fn(dbgfmt_cv->object)));
     cv8_add_sym_compile(dbgfmt_cv, info.debug_symline,
-                       yasm__xstrdup(PACKAGE_STRING));
+                       yasm__xstrdup(PACKAGE_NAME " " PACKAGE_INTVER "."
+                                     PACKAGE_BUILD));
     /* then iterate through symbol table */
     yasm_symtab_traverse(dbgfmt_cv->symtab, &info, cv_generate_sym);
     cv8_set_symhead_end(head, yasm_section_bcs_last(info.debug_symline));

diff --git a/modules/preprocs/nasm/genversion.c b/modules/preprocs/nasm/genversion.c
index cd6493f28414d463ef95fd6eaeaa1fea8727c202..db28def5a657cf90df68d57aa25941f906f230d4 100644 (file)
--- a/modules/preprocs/nasm/genversion.c
+++ b/modules/preprocs/nasm/genversion.c
@@ -35,7 +35,6 @@ int
 main(int argc, char *argv[])
 {
     FILE *out;
-    char *str, *tok, *strp;
     int major, minor, subminor;
 
     if (argc != 2) {
@@ -50,45 +49,10 @@ main(int argc, char *argv[])
        return EXIT_FAILURE;
     }
 
-    str = malloc(strlen(PACKAGE_VERSION)+1);
-    strcpy(str, PACKAGE_VERSION);
-
     fprintf(out, "; This file auto-generated by genversion.c"
                 " - don't edit it\n");
 
-    /* Major */
-    tok = strtok(str, ".");
-    if (!tok) {
-       fprintf(stderr, "Version tokenizing error\n");
-       fclose(out);
-       remove(argv[1]);
-       return EXIT_FAILURE;
-    }
-    major = atoi(tok);
-
-    /* Minor */
-    tok = strtok(NULL, ".");
-    if (!tok) {
-       fprintf(stderr, "Version tokenizing error\n");
-       fclose(out);
-       remove(argv[1]);
-       return EXIT_FAILURE;
-    }
-    minor = atoi(tok);
-
-    /* Subminor */
-    tok = strtok(NULL, ".");
-    if (!tok) {
-       fprintf(stderr, "Version tokenizing error\n");
-       fclose(out);
-       remove(argv[1]);
-       return EXIT_FAILURE;
-    }
-    subminor = atoi(tok);
-
-    /* Build */
-    tok = strtok(NULL, ".");
-    if (!tok) {
+    if (sscanf(PACKAGE_INTVER, "%d.%d.%d", &major, &minor, &subminor) != 3) {
        fprintf(stderr, "Version tokenizing error\n");
        fclose(out);
        remove(argv[1]);
@@ -98,23 +62,18 @@ main(int argc, char *argv[])
     fprintf(out, "%%define __YASM_MAJOR__ %d\n", major);
     fprintf(out, "%%define __YASM_MINOR__ %d\n", minor);
     fprintf(out, "%%define __YASM_SUBMINOR__ %d\n", subminor);
-    if (!isdigit(tok[0]))
+    if (!isdigit(PACKAGE_BUILD[0]))
        fprintf(out, "%%define __YASM_BUILD__ 0\n");
     else
-       fprintf(out, "%%define __YASM_BUILD__ %d\n", atoi(tok));
+       fprintf(out, "%%define __YASM_BUILD__ %d\n", atoi(PACKAGE_BUILD));
 
     /* Version id (hex number) */
     fprintf(out, "%%define __YASM_VERSION_ID__ 0%02x%02x%02x00h\n", major,
            minor, subminor);
 
     /* Version string - version sans build */
-    strcpy(str, PACKAGE_VERSION);
-    strp = strrchr(str, '.');
-    *strp = '\0';
-    fprintf(out, "%%define __YASM_VER__ \"%s\"\n", str);
+    fprintf(out, "%%define __YASM_VER__ \"%s\"\n", PACKAGE_INTVER);
     fclose(out);
 
-    free(str);
-
     return EXIT_SUCCESS;
 }