Index: config.nmake =================================================================== --- config.nmake (revision 8147) +++ config.nmake (working copy) @@ -3,6 +3,18 @@ # # +LIBSMI_MAJOR=0 +LIBSMI_MINOR=4 +LIBSMI_PATCHLEVEL=8 +LIBTOOL_VERSION=2 +LIBTOOL_REVISION=27 +VERSION_LIBTOOL=0 + +LIBTOOL_AGE=0 + +VERSION_STRING=$(LIBSMI_MAJOR).$(LIBSMI_MINOR).$(LIBSMI_PATCHLEVEL) +VERSION_LIBTOOL=$(LIBTOOL_VERSION):$(LIBTOOL_REVISION):$(LIBTOOL_AGE) + ##### Microsoft Visual C / Studio Variant ##### # for the different Studios, see: # http://en.wikipedia.org/wiki/Microsoft_Visual_Studio @@ -121,7 +133,34 @@ INCLUDES = -I$(ROOT)\lib -I$(ROOT)\win -I$(TOOLS32)\include DEFINES = $(DEBUG) -D_CRT_SECURE_NO_DEPRECATE=1 +##### Tools ##### +# Set the following mandatory commands to find the tools. +# The easiest way is to use the corresponding packages from cygwin. + +# Set up the path to the cygwin binaries +CYGWIN_PATH=c:\cygwin\bin + +# command for a shell (cygwin's bash package recommended) +SH_PROG=bash + +# bash versions after 3.1.6 need the 'igncr' shell option to be able to +# process scripts in windows 'native format' (dos crlf format). +# The following !IF results in the option being used only if it is available +# since using it on bash version 3.1.6 (or earlier) is not required and +# will cause an error message. +!if "$(SH_PROG)"=="bash" && [$(CYGWIN_PATH)\bash -c "set -o igncr" 2>nul: ] == 0 +SH_FLAGS=-o igncr +!endif + +SH=$(SH_PROG) $(SH_FLAGS) + +# command for lex/flexx (cygwin's flex recommended) +LEX=flex + +# command for yacc/bison (cygwin's bison recommended) +YACC=bison + # # If you want to build libsmi.dll, you should uncomment the # following line. Index: config.h =================================================================== --- config.h (revision 8147) +++ config.h (working copy) @@ -1,89 +1,94 @@ -/* - * config.h. Generated manually for windows / vc++ 6.0 - * - * @(#) $Id$ - */ - -/* Define if the SMIv1/v2 parser shall be active. */ -#define BACKEND_SMI - -/* Define if the SMIng parser shall be active. */ -#define BACKEND_SMING - -/* The default error level at libsmi initialization. */ -#define DEFAULT_ERRORLEVEL 3 - -/* The maximum module import recursion depth. */ -#define MAX_LEX_DEPTH 30 - -/* The full pathname of the global configuration file. */ -#define DEFAULT_GLOBALCONFIG "c:/smi/smi.conf" - -/* The basename of the per-user configuration file searched in $HOME. */ -#define DEFAULT_USERCONFIG ".smirc" - -/* The default search path to lookup SMI module files. */ -#define DEFAULT_SMIPATH "c:/smi/mibs/ietf;c:/smi/mibs/iana;c:/smi/mibs/irtf;c:/smi/mibs/s ite;c:/smi/mibs/tubs" - -/* The default path separator character. */ -#define PATH_SEPARATOR ';' - -/* The default path separator character. */ -#define DIR_SEPARATOR '\\' - -/* The 64 bit integer types, their formats, and their min/max values. */ -#ifdef _MSC_VER /* msvc: max/min are defined in include/limits.h */ -#define UINT64_FORMAT "%I64u" -#define INT64_FORMAT "%I64d" -#define LIBSMI_UINT64_MAX _UI64_MAX -#define LIBSMI_INT64_MIN _I64_MIN -#define LIBSMI_INT64_MAX _I64_MAX -#else -#define UINT64_FORMAT "%llu" -#define INT64_FORMAT "%lld" -#define LIBSMI_UINT64_MAX 18446744073709551615ULL -#define LIBSMI_INT64_MIN -9223372036854775808LL -#define LIBSMI_INT64_MAX 9223372036854775807LL -#endif - -/* Define if dmalloc.h is present and shall be used. */ -#undef HAVE_DMALLOC_H - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define if getopt.h (argv[] option parser) is present. */ -#undef HAVE_GETOPT_H - -/* Define if pwd.h (/etc/passwd database) is present. */ -#undef HAVE_PWD_H - -/* Define if the string-to-long-long function is present in libc. */ -#undef HAVE_STRTOLL - -/* Define if the string-to-quad function (BSD) is present in libc. */ -#undef HAVE_STRTOQ - -/* Define if the string-to-unsigned-long-long function is present in libc. */ -#undef HAVE_STRTOULL - -/* Define if the string-to-unsigned-quad function (BSD) is present in libc. */ -#undef HAVE_STRTOUQ - -/* Define if the timegm() function is present in libc. */ -#undef HAVE_TIMEGM - -/* Define if you have the snprintf function. */ -#define HAVE_SNPRINTF 1 - -/* Define if you have the vsnprintf function. */ -#undef HAVE_VSNPRINTF - -/* Define if the win.h header file is present. */ -#define HAVE_WIN_H 1 - -/* Name of package */ -#define PACKAGE "libsmi" - -/* Version number of package */ -#define VERSION "0.4.8" +/* + * config.h. Generated manually for windows / vc++ 6.0 + * + * @(#) $Id$ + */ + +/* Define if the SMIv1/v2 parser shall be active. */ +#define BACKEND_SMI + +/* Define if the SMIng parser shall be active. */ +#define BACKEND_SMING + +/* The default error level at libsmi initialization. */ +#define DEFAULT_ERRORLEVEL 3 + +/* The maximum module import recursion depth. */ +#define MAX_LEX_DEPTH 30 + +/* The full pathname of the global configuration file. */ +#define DEFAULT_GLOBALCONFIG "c:/smi/smi.conf" + +/* The basename of the per-user configuration file searched in $HOME. */ +#define DEFAULT_USERCONFIG ".smirc" + +/* The default search path to lookup SMI module files. */ +#define DEFAULT_SMIPATH "c:/smi/mibs/ietf;c:/smi/mibs/iana;c:/smi/mibs/irtf;c:/smi/mibs/s ite;c:/smi/mibs/tubs" + +/* The default path separator character. */ +#define PATH_SEPARATOR ';' + +/* The default path separator character. */ +#define DIR_SEPARATOR '\\' + +/* The 64 bit integer types, their formats, and their min/max values. */ +#ifdef _MSC_VER /* msvc: max/min are defined in include/limits.h */ +#define UINT64_FORMAT "%I64u" +#define INT64_FORMAT "%I64d" +#define LIBSMI_UINT64_MAX _UI64_MAX +#define LIBSMI_INT64_MIN _I64_MIN +#define LIBSMI_INT64_MAX _I64_MAX +#else +#define UINT64_FORMAT "%llu" +#define INT64_FORMAT "%lld" +#define LIBSMI_UINT64_MAX 18446744073709551615ULL +#define LIBSMI_INT64_MIN -9223372036854775808LL +#define LIBSMI_INT64_MAX 9223372036854775807LL +#endif + +/* Define if dmalloc.h is present and shall be used. */ +#undef HAVE_DMALLOC_H + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define if getopt.h (argv[] option parser) is present. */ +#undef HAVE_GETOPT_H + +/* Define if pwd.h (/etc/passwd database) is present. */ +#undef HAVE_PWD_H + +/* Define if the string-to-long-long function is present in libc. */ +#undef HAVE_STRTOLL + +/* Define if the string-to-quad function (BSD) is present in libc. */ +#undef HAVE_STRTOQ + +/* Define if the string-to-unsigned-long-long function is present in libc. */ +#undef HAVE_STRTOULL + +/* Define if the string-to-unsigned-quad function (BSD) is present in libc. */ +#undef HAVE_STRTOUQ + +/* Define if the timegm() function is present in libc. */ +#undef HAVE_TIMEGM + +/* Define if you have the snprintf function. */ +#define HAVE_SNPRINTF 1 + +/* Define if you have the vsnprintf function. */ +#undef HAVE_VSNPRINTF + +/* Define if the win.h header file is present. */ +#define HAVE_WIN_H 1 + +/* Name of package */ +#define PACKAGE "libsmi" + +/* + * Flex (v 2.5.35) uses this symbol to "exclude" unistd.h + */ +#define YY_NO_UNISTD_H + +/* Version number of package */ +#define VERSION "0.4.8"