Commit 77150723 authored by Cristian Greco's avatar Cristian Greco

Imported Upstream version 20091003

parent 6e64ea77
......@@ -204,6 +204,29 @@ Next stable release:
* check into resume write error for 32-bit compile
* check make distclean
20091003
* several fixes for Debian integration based on patches by Cristian Greco
* corrected license in list and array type and several of the pfftool handles
* updated libuna, libbfio
* updated several manpages
* changes to autoconf/make scripts to not link libcrypto and libuuid to libewf
* renamed debian to dpkg
* remove ZLIB_WINAPI from msvscpp configuration
* several fixes to configure scripts
20091001
* small changes in common
* made libewf a little more tollerant in allowing the data section not
to contain values, the values must be 0 otherwise libewf still enforces
validity checks
20090929
* worked on CodeGear project files
- disabled creation of pre compiled headers
20090928
* small changes
20090927
* worked on secondary image output
* added open resume signal handling in ewfacquire
......
......@@ -17,50 +17,50 @@ SUBDIRS = \
borlandc \
msvscpp
DEBIAN_FILES = \
debian/changelog \
debian/changelog.in \
debian/compat \
debian/control \
debian/copyright \
debian/cron.d.ex \
debian/emacsen-install.ex \
debian/emacsen-startup.ex \
debian/emacsen-remove.ex \
debian/init.d.ex \
debian/libewf.install \
debian/libewf.dirs \
debian/libewf.docs \
debian/libewf.postinst.debhelper \
debian/libewf.postrm.debhelper \
debian/libewf-default.ex \
debian/libewf-dev.dirs \
debian/libewf-dev.docs \
debian/libewf-dev.install \
debian/libewf-tools.dirs \
debian/libewf-tools.docs \
debian/libewf-tools.install \
debian/libewf.doc-base.EX \
debian/manpage.1.ex \
debian/manpage.sgml.ex \
debian/manpage.xml.ex \
debian/menu.ex \
debian/rules \
debian/postinst.ex \
debian/postrm.ex \
debian/preinst.ex \
debian/prerm.ex \
debian/shlibs.local.ex \
debian/shlibs.local.ex.in \
debian/watch.ex
DPKG_FILES = \
dpkg/changelog \
dpkg/changelog.in \
dpkg/compat \
dpkg/control \
dpkg/copyright \
dpkg/cron.d.ex \
dpkg/emacsen-install.ex \
dpkg/emacsen-startup.ex \
dpkg/emacsen-remove.ex \
dpkg/init.d.ex \
dpkg/libewf.install \
dpkg/libewf.dirs \
dpkg/libewf.docs \
dpkg/libewf.postinst.debhelper \
dpkg/libewf.postrm.debhelper \
dpkg/libewf-default.ex \
dpkg/libewf-dev.dirs \
dpkg/libewf-dev.docs \
dpkg/libewf-dev.install \
dpkg/libewf-tools.dirs \
dpkg/libewf-tools.docs \
dpkg/libewf-tools.install \
dpkg/libewf.doc-base.EX \
dpkg/manpage.1.ex \
dpkg/manpage.sgml.ex \
dpkg/manpage.xml.ex \
dpkg/menu.ex \
dpkg/rules \
dpkg/postinst.ex \
dpkg/postrm.ex \
dpkg/preinst.ex \
dpkg/prerm.ex \
dpkg/shlibs.local.ex \
dpkg/shlibs.local.ex.in \
dpkg/watch.ex
REDHAT_FILES = \
SPEC_FILES = \
libewf.spec \
libewf.spec.in
EXTRA_DIST = \
$(DEBIAN_FILES) \
$(REDHAT_FILES) \
$(DPKG_FILES) \
$(SPEC_FILES) \
libewf.pc \
libewf.pc.in
......@@ -89,8 +89,8 @@ distclean: clean
/bin/rm -f config.log
/bin/rm -f libewf.pc
/bin/rm -f libewf.spec
/bin/rm -f debian/changelog
/bin/rm -f debian/shlibs.local.ex
/bin/rm -f dpkg/changelog
/bin/rm -f dpkg/shlibs.local.ex
@for dir in ${subdirs}; do \
(cd $$dir && $(MAKE) distclean) \
|| case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
......
......@@ -38,8 +38,8 @@ subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/libewf.pc.in \
$(srcdir)/libewf.spec.in $(top_srcdir)/configure \
$(top_srcdir)/debian/changelog.in \
$(top_srcdir)/debian/shlibs.local.ex.in \
$(top_srcdir)/dpkg/changelog.in \
$(top_srcdir)/dpkg/shlibs.local.ex.in \
$(top_srcdir)/include/libewf/definitions.h.in \
$(top_srcdir)/include/libewf/features.h.in \
$(top_srcdir)/include/libewf/types.h.in AUTHORS COPYING \
......@@ -58,7 +58,7 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/common/config.h
CONFIG_CLEAN_FILES = include/libewf/definitions.h \
include/libewf/features.h include/libewf/types.h \
debian/changelog debian/shlibs.local.ex libewf.pc libewf.spec
dpkg/changelog dpkg/shlibs.local.ex libewf.pc libewf.spec
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
......@@ -187,6 +187,7 @@ LD = @LD@
LDFLAGS = @LDFLAGS@
LIBBFIO_CPPFLAGS = @LIBBFIO_CPPFLAGS@
LIBBFIO_LIBADD = @LIBBFIO_LIBADD@
LIBCRYPTO_LIBADD = @LIBCRYPTO_LIBADD@
LIBEWF_DLL_IMPORT = @LIBEWF_DLL_IMPORT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
......@@ -194,6 +195,7 @@ LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIBUNA_CPPFLAGS = @LIBUNA_CPPFLAGS@
LIBUNA_LIBADD = @LIBUNA_LIBADD@
LIBUUID_LIBADD = @LIBUUID_LIBADD@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
......@@ -312,50 +314,50 @@ SUBDIRS = \
borlandc \
msvscpp
DEBIAN_FILES = \
debian/changelog \
debian/changelog.in \
debian/compat \
debian/control \
debian/copyright \
debian/cron.d.ex \
debian/emacsen-install.ex \
debian/emacsen-startup.ex \
debian/emacsen-remove.ex \
debian/init.d.ex \
debian/libewf.install \
debian/libewf.dirs \
debian/libewf.docs \
debian/libewf.postinst.debhelper \
debian/libewf.postrm.debhelper \
debian/libewf-default.ex \
debian/libewf-dev.dirs \
debian/libewf-dev.docs \
debian/libewf-dev.install \
debian/libewf-tools.dirs \
debian/libewf-tools.docs \
debian/libewf-tools.install \
debian/libewf.doc-base.EX \
debian/manpage.1.ex \
debian/manpage.sgml.ex \
debian/manpage.xml.ex \
debian/menu.ex \
debian/rules \
debian/postinst.ex \
debian/postrm.ex \
debian/preinst.ex \
debian/prerm.ex \
debian/shlibs.local.ex \
debian/shlibs.local.ex.in \
debian/watch.ex
REDHAT_FILES = \
DPKG_FILES = \
dpkg/changelog \
dpkg/changelog.in \
dpkg/compat \
dpkg/control \
dpkg/copyright \
dpkg/cron.d.ex \
dpkg/emacsen-install.ex \
dpkg/emacsen-startup.ex \
dpkg/emacsen-remove.ex \
dpkg/init.d.ex \
dpkg/libewf.install \
dpkg/libewf.dirs \
dpkg/libewf.docs \
dpkg/libewf.postinst.debhelper \
dpkg/libewf.postrm.debhelper \
dpkg/libewf-default.ex \
dpkg/libewf-dev.dirs \
dpkg/libewf-dev.docs \
dpkg/libewf-dev.install \
dpkg/libewf-tools.dirs \
dpkg/libewf-tools.docs \
dpkg/libewf-tools.install \
dpkg/libewf.doc-base.EX \
dpkg/manpage.1.ex \
dpkg/manpage.sgml.ex \
dpkg/manpage.xml.ex \
dpkg/menu.ex \
dpkg/rules \
dpkg/postinst.ex \
dpkg/postrm.ex \
dpkg/preinst.ex \
dpkg/prerm.ex \
dpkg/shlibs.local.ex \
dpkg/shlibs.local.ex.in \
dpkg/watch.ex
SPEC_FILES = \
libewf.spec \
libewf.spec.in
EXTRA_DIST = \
$(DEBIAN_FILES) \
$(REDHAT_FILES) \
$(DPKG_FILES) \
$(SPEC_FILES) \
libewf.pc \
libewf.pc.in
......@@ -406,9 +408,9 @@ include/libewf/features.h: $(top_builddir)/config.status $(top_srcdir)/include/l
cd $(top_builddir) && $(SHELL) ./config.status $@
include/libewf/types.h: $(top_builddir)/config.status $(top_srcdir)/include/libewf/types.h.in
cd $(top_builddir) && $(SHELL) ./config.status $@
debian/changelog: $(top_builddir)/config.status $(top_srcdir)/debian/changelog.in
dpkg/changelog: $(top_builddir)/config.status $(top_srcdir)/dpkg/changelog.in
cd $(top_builddir) && $(SHELL) ./config.status $@
debian/shlibs.local.ex: $(top_builddir)/config.status $(top_srcdir)/debian/shlibs.local.ex.in
dpkg/shlibs.local.ex: $(top_builddir)/config.status $(top_srcdir)/dpkg/shlibs.local.ex.in
cd $(top_builddir) && $(SHELL) ./config.status $@
libewf.pc: $(top_builddir)/config.status $(srcdir)/libewf.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
......@@ -894,8 +896,8 @@ distclean: clean
/bin/rm -f config.log
/bin/rm -f libewf.pc
/bin/rm -f libewf.spec
/bin/rm -f debian/changelog
/bin/rm -f debian/shlibs.local.ex
/bin/rm -f dpkg/changelog
/bin/rm -f dpkg/shlibs.local.ex
@for dir in ${subdirs}; do \
(cd $$dir && $(MAKE) distclean) \
|| case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
......
......@@ -176,13 +176,13 @@ AC_DEFUN([LIBEWF_CHECK_FUNC_CTIME],
[1]) ]) ])
])
])
AC_LANG_POP(C) ]) ],
AC_LANG_POP(C) ],
[AC_CHECK_FUNCS(
[ctime],
[],
[AC_MSG_FAILURE(
[Missing function: ctime_r and ctime],
[1]) ])
[1]) ]) ])
])
dnl Function to determine the operating system
......
......@@ -100,6 +100,7 @@ LD = @LD@
LDFLAGS = @LDFLAGS@
LIBBFIO_CPPFLAGS = @LIBBFIO_CPPFLAGS@
LIBBFIO_LIBADD = @LIBBFIO_LIBADD@
LIBCRYPTO_LIBADD = @LIBCRYPTO_LIBADD@
LIBEWF_DLL_IMPORT = @LIBEWF_DLL_IMPORT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
......@@ -107,6 +108,7 @@ LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIBUNA_CPPFLAGS = @LIBUNA_CPPFLAGS@
LIBUNA_LIBADD = @LIBUNA_LIBADD@
LIBUUID_LIBADD = @LIBUUID_LIBADD@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
......
......@@ -13,6 +13,8 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<BCC_SmartPCHCache>false</BCC_SmartPCHCache>
<BCC_PCHUsage>None</BCC_PCHUsage>
<_TCHARMapping>wchar_t</_TCHARMapping>
<FinalOutputDir>..\Release</FinalOutputDir>
<LinkPackageStatics>rtl.lib</LinkPackageStatics>
......
......@@ -13,6 +13,8 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<BCC_SmartPCHCache>false</BCC_SmartPCHCache>
<BCC_PCHUsage>None</BCC_PCHUsage>
<_TCHARMapping>wchar_t</_TCHARMapping>
<FinalOutputDir>..\Release</FinalOutputDir>
<LinkPackageStatics>rtl.lib</LinkPackageStatics>
......
......@@ -13,6 +13,8 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<BCC_SmartPCHCache>false</BCC_SmartPCHCache>
<BCC_PCHUsage>None</BCC_PCHUsage>
<_TCHARMapping>wchar_t</_TCHARMapping>
<FinalOutputDir>..\Release</FinalOutputDir>
<LinkPackageStatics>rtl.lib</LinkPackageStatics>
......
......@@ -13,6 +13,8 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<BCC_SmartPCHCache>false</BCC_SmartPCHCache>
<BCC_PCHUsage>None</BCC_PCHUsage>
<_TCHARMapping>wchar_t</_TCHARMapping>
<FinalOutputDir>..\Release</FinalOutputDir>
<LinkPackageStatics>rtl.lib</LinkPackageStatics>
......
......@@ -13,6 +13,8 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<BCC_SmartPCHCache>false</BCC_SmartPCHCache>
<BCC_PCHUsage>None</BCC_PCHUsage>
<_TCHARMapping>wchar_t</_TCHARMapping>
<FinalOutputDir>..\Release</FinalOutputDir>
<LinkPackageStatics>rtl.lib</LinkPackageStatics>
......
......@@ -13,6 +13,8 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<BCC_SmartPCHCache>false</BCC_SmartPCHCache>
<BCC_PCHUsage>None</BCC_PCHUsage>
<FinalOutputDir>..\Release</FinalOutputDir>
<BCC_waus>false</BCC_waus>
<BCC_IncludePath>..\..\..\include;..\..\..\common;..\..\..\liberror;..\..\..\libuna;$(CG_BOOST_ROOT)\boost\tr1\tr1;$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;$(CG_BOOST_ROOT);$(BCC_IncludePath)</BCC_IncludePath>
......
......@@ -13,6 +13,8 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<BCC_SmartPCHCache>false</BCC_SmartPCHCache>
<BCC_PCHUsage>None</BCC_PCHUsage>
<FinalOutputDir>..\Release</FinalOutputDir>
<BCC_waus>false</BCC_waus>
<BCC_IncludePath>..\..\..\include;..\..\..\common;$(CG_BOOST_ROOT)\boost\tr1\tr1;$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;$(CG_BOOST_ROOT);$(BCC_IncludePath)</BCC_IncludePath>
......
......@@ -13,6 +13,8 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<BCC_SmartPCHCache>false</BCC_SmartPCHCache>
<BCC_PCHUsage>None</BCC_PCHUsage>
<FinalOutputDir>..\Release</FinalOutputDir>
<PackageImports>vcl.bpi;rtl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;vcldbx.bpi;bdertl.bpi;dsnap.bpi;dsnapcon.bpi;TeeUI.bpi;TeeDB.bpi;Tee.bpi;adortl.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;dbexpress.bpi;DbxCommonDriver.bpi;DataSnapIndy10ServerTransport.bpi;DataSnapProviderClient.bpi;DataSnapServer.bpi;DbxClientDriver.bpi;DBXInterBaseDriver.bpi;DBXMySQLDriver.bpi;dbxcds.bpi;DBXSybaseASEDriver.bpi;DBXSybaseASADriver.bpi;DBXOracleDriver.bpi;DBXMSSQLDriver.bpi;DBXInformixDriver.bpi;DBXDb2Driver.bpi</PackageImports>
<NoVCL>true</NoVCL>
......
......@@ -13,6 +13,8 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<BCC_SmartPCHCache>false</BCC_SmartPCHCache>
<BCC_PCHUsage>None</BCC_PCHUsage>
<FinalOutputDir>..\Release</FinalOutputDir>
<BCC_waus>false</BCC_waus>
<BCC_IncludePath>..\..\..\include;..\..\..\common;..\..\..\liberror;$(CG_BOOST_ROOT)\boost\tr1\tr1;$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;$(CG_BOOST_ROOT);$(BCC_IncludePath)</BCC_IncludePath>
......
......@@ -13,6 +13,8 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<BCC_SmartPCHCache>false</BCC_SmartPCHCache>
<BCC_PCHUsage>None</BCC_PCHUsage>
<_TCHARMapping>wchar_t</_TCHARMapping>
<FinalOutputDir>..\Release</FinalOutputDir>
<BCC_waus>false</BCC_waus>
......
This diff is collapsed.
......@@ -13,6 +13,8 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<BCC_SmartPCHCache>false</BCC_SmartPCHCache>
<BCC_PCHUsage>None</BCC_PCHUsage>
<FinalOutputDir>..\Release</FinalOutputDir>
<PackageImports>vcl.bpi;rtl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;vcldbx.bpi;bdertl.bpi;dsnap.bpi;dsnapcon.bpi;TeeUI.bpi;TeeDB.bpi;Tee.bpi;adortl.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;dbexpress.bpi;DbxCommonDriver.bpi;DataSnapIndy10ServerTransport.bpi;DataSnapProviderClient.bpi;DataSnapServer.bpi;DbxClientDriver.bpi;DBXInterBaseDriver.bpi;DBXMySQLDriver.bpi;dbxcds.bpi;DBXSybaseASEDriver.bpi;DBXSybaseASADriver.bpi;DBXOracleDriver.bpi;DBXMSSQLDriver.bpi;DBXInformixDriver.bpi;DBXDb2Driver.bpi</PackageImports>
<NoVCL>true</NoVCL>
......
......@@ -123,6 +123,7 @@ LD = @LD@
LDFLAGS = @LDFLAGS@
LIBBFIO_CPPFLAGS = @LIBBFIO_CPPFLAGS@
LIBBFIO_LIBADD = @LIBBFIO_LIBADD@
LIBCRYPTO_LIBADD = @LIBCRYPTO_LIBADD@
LIBEWF_DLL_IMPORT = @LIBEWF_DLL_IMPORT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
......@@ -130,6 +131,7 @@ LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIBUNA_CPPFLAGS = @LIBUNA_CPPFLAGS@
LIBUNA_LIBADD = @LIBUNA_LIBADD@
LIBUUID_LIBADD = @LIBUUID_LIBADD@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
......
......@@ -10,7 +10,7 @@
/* Define to 1 if you have the `close' function. */
#define HAVE_CLOSE 1
/* Defines if compressBound funtion is present in zlib. */
/* Define to 1 if compressBound funtion is available in zlib. */
#define HAVE_COMPRESS_BOUND 1
/* Define to 1 if you have the `ctime' function. */
......@@ -28,7 +28,7 @@
/* Define to 1 if you have the <cygwin/hdreg.h> header file. */
/* #undef HAVE_CYGWIN_HDREG_H */
/* Defines if debug output should be used */
/* Define to 1 if debug output should be used. */
/* #undef HAVE_DEBUG_OUTPUT */
/* Define to 1 if you have the declaration of `memrchr', and to 0 if you
......@@ -108,7 +108,7 @@
/* Define to 1 if you have the <libbfio.h> header file. */
/* #undef HAVE_LIBBFIO_H */
/* Define to 1 if you have the `crypto' library (-lcrypto). */
/* Define to 1 if you have the 'crypto' library (-lcrypto). */
#define HAVE_LIBCRYPTO 1
/* Define to 1 if you have the `una' library (-luna). */
......@@ -117,7 +117,7 @@
/* Define to 1 if you have the <libuna.h> header file. */
/* #undef HAVE_LIBUNA_H */
/* Define to 1 if you have the `uuid' library (-luuid). */
/* Define to 1 if you have the 'uuid' library (-luuid). */
#define HAVE_LIBUUID 1
/* Define to 1 if you have the `z' library (-lz). */
......@@ -156,8 +156,8 @@
/* Define to 1 if the local version of libuna is used. */
#define HAVE_LOCAL_LIBUNA 1
/* Defines if libewf's low level read and write functions should be used in
the ewf tools */
/* Define to 1 if libewfs low level read and write functions should be used in
the ewf tools. */
/* #undef HAVE_LOW_LEVEL_FUNCTIONS */
/* Define to 1 if you have the `lseek' function. */
......@@ -331,25 +331,25 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Defines if uuid_generate_random funtion is present. */
/* Define to 1 if uuid_generate_random funtion is available. */
#define HAVE_UUID_GENERATE_RANDOM 1
/* Defines if uuid_generate_time funtion is present. */
/* Define to 1 if uuid_generate_time funtion is available. */
#define HAVE_UUID_GENERATE_TIME 1
/* Define to 1 if you have the <uuid/uuid.h> header file. */
#define HAVE_UUID_UUID_H 1
/* Defines if experimental version 1 API should be used */
/* Define to 1 if experimental version 1 API should be used. */
#define HAVE_V1_API 1
/* Defines if experimental version 2 API should be used */
/* Define to 1 if experimental version 2 API should be used. */
/* #undef HAVE_V2_API */
/* Define to 1 if you have the <varargs.h> header file. */
/* #undef HAVE_VARARGS_H */
/* Defines if verbose output should be used */
/* Define to 1 if verbose output should be used. */
/* #undef HAVE_VERBOSE_OUTPUT */
/* Define to 1 if you have the `vfprintf' function. */
......@@ -394,7 +394,7 @@
/* Define to 1 if you have the `wcstoull' function. */
/* #undef HAVE_WCSTOULL */
/* Defines if wide character type should be used */
/* Define to 1 if wide character type should be used. */
/* #undef HAVE_WIDE_CHARACTER_TYPE */
/* Define to 1 if you have the `wmemchr' function. */
......@@ -432,13 +432,13 @@
#define PACKAGE_NAME "libewf"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "libewf 20090927"
#define PACKAGE_STRING "libewf 20091003"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libewf"
/* Define to the version of this package. */
#define PACKAGE_VERSION "20090927"
#define PACKAGE_VERSION "20091003"
/* The size of `off_t', as computed by sizeof. */
#define SIZEOF_OFF_T 8
......@@ -462,7 +462,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
#define VERSION "20090927"
#define VERSION "20091003"
/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
......
......@@ -9,7 +9,7 @@
/* Define to 1 if you have the `close' function. */
#undef HAVE_CLOSE
/* Defines if compressBound funtion is present in zlib. */
/* Define to 1 if compressBound funtion is available in zlib. */
#undef HAVE_COMPRESS_BOUND
/* Define to 1 if you have the `ctime' function. */
......@@ -27,7 +27,7 @@
/* Define to 1 if you have the <cygwin/hdreg.h> header file. */
#undef HAVE_CYGWIN_HDREG_H
/* Defines if debug output should be used */
/* Define to 1 if debug output should be used. */
#undef HAVE_DEBUG_OUTPUT
/* Define to 1 if you have the declaration of `memrchr', and to 0 if you
......@@ -107,7 +107,7 @@
/* Define to 1 if you have the <libbfio.h> header file. */
#undef HAVE_LIBBFIO_H
/* Define to 1 if you have the `crypto' library (-lcrypto). */
/* Define to 1 if you have the 'crypto' library (-lcrypto). */
#undef HAVE_LIBCRYPTO
/* Define to 1 if you have the `una' library (-luna). */
......@@ -116,7 +116,7 @@
/* Define to 1 if you have the <libuna.h> header file. */
#undef HAVE_LIBUNA_H
/* Define to 1 if you have the `uuid' library (-luuid). */
/* Define to 1 if you have the 'uuid' library (-luuid). */
#undef HAVE_LIBUUID
/* Define to 1 if you have the `z' library (-lz). */
......@@ -155,8 +155,8 @@
/* Define to 1 if the local version of libuna is used. */
#undef HAVE_LOCAL_LIBUNA
/* Defines if libewf's low level read and write functions should be used in
the ewf tools */
/* Define to 1 if libewfs low level read and write functions should be used in
the ewf tools. */
#undef HAVE_LOW_LEVEL_FUNCTIONS
/* Define to 1 if you have the `lseek' function. */
......@@ -330,25 +330,25 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Defines if uuid_generate_random funtion is present. */
/* Define to 1 if uuid_generate_random funtion is available. */
#undef HAVE_UUID_GENERATE_RANDOM
/* Defines if uuid_generate_time funtion is present. */
/* Define to 1 if uuid_generate_time funtion is available. */
#undef HAVE_UUID_GENERATE_TIME
/* Define to 1 if you have the <uuid/uuid.h> header file. */
#undef HAVE_UUID_UUID_H
/* Defines if experimental version 1 API should be used */
/* Define to 1 if experimental version 1 API should be used. */
#undef HAVE_V1_API
/* Defines if experimental version 2 API should be used */
/* Define to 1 if experimental version 2 API should be used. */
#undef HAVE_V2_API
/* Define to 1 if you have the <varargs.h> header file. */
#undef HAVE_VARARGS_H
/* Defines if verbose output should be used */
/* Define to 1 if verbose output should be used. */
#undef HAVE_VERBOSE_OUTPUT
/* Define to 1 if you have the `vfprintf' function. */
......@@ -393,7 +393,7 @@
/* Define to 1 if you have the `wcstoull' function. */
#undef HAVE_WCSTOULL
/* Defines if wide character type should be used */
/* Define to 1 if wide character type should be used. */
#undef HAVE_WIDE_CHARACTER_TYPE
/* Define to 1 if you have the `wmemchr' function. */
......
......@@ -194,9 +194,11 @@ extern "C" {
#define narrow_string_vsnprintf( string, size, format, ... ) \
g_vsnprintf( string, size, format, __VA_ARGS__ )
/* This definition causes problems
#elif defined( _MSC_VER )
#define narrow_string_vsnprintf( string, size, format, ... ) \
_vsnprintf( string, size, format, __VA_ARGS__ )
_vsnprintf_s( string, size, size, format, __VA_ARGS__ )
*/
#elif defined( HAVE_VSNPRINTF ) || defined( WINAPI )
#define narrow_string_vsnprintf( string, size, format, ... ) \
......
This diff is collapsed.
......@@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )
AC_INIT(
[libewf],
[20090927],
[20091003],
[forensics@hoffmannbv.nl])
AC_CONFIG_SRCDIR(
......@@ -10,7 +10,7 @@ AC_CONFIG_SRCDIR(
AM_INIT_AUTOMAKE(
[libewf],
[20090927])
[20091003])
AC_CONFIG_MACRO_DIR([m4])
......@@ -609,7 +609,7 @@ AC_CHECK_LIB(
[AC_DEFINE(
[HAVE_COMPRESS_BOUND],
[1],
[Defines if compressBound funtion is present in zlib.])])
[Define to 1 if compressBound funtion is available in zlib.])])
AC_CHECK_LIB(
z,
......@@ -1165,7 +1165,13 @@ AS_IF(
AC_CHECK_LIB(
crypto,
EVP_md5,
[],
[AC_SUBST(
[LIBCRYPTO_LIBADD],
[-lcrypto])
AC_DEFINE(
[HAVE_LIBCRYPTO],
[1],
[Define to 1 if you have the 'crypto' library (-lcrypto).]) ],
[ac_libewf_have_libcrypto_evp=no])
AC_CHECK_LIB(
crypto,
......@@ -1203,7 +1209,7 @@ AS_IF(
[test "x$ac_libewf_have_libcrypto_evp" = xno],
[AC_SUBST(
[HAVE_OPENSSL_EVP_H],
[0])] )
[0]) ])
AS_IF(
[test "x$ac_libewf_have_libcrypto_evp" = xyes],
......@@ -1224,7 +1230,13 @@ AS_IF(
AC_CHECK_LIB(
crypto,
MD5_Init,
[],
[AC_SUBST(
[LIBCRYPTO_LIBADD],
[-lcrypto])
AC_DEFINE(
[HAVE_LIBCRYPTO],
[1],
[Define to 1 if you have the 'crypto' library (-lcrypto).]) ],
[ac_libewf_have_libcrypto_md5=no])
AC_CHECK_LIB(
crypto,
......@@ -1294,7 +1306,13 @@ AS_IF(
AC_CHECK_LIB(
[uuid],
[uuid_generate],
[],
[AC_SUBST(
[LIBUUID_LIBADD],
[-luuid])
AC_DEFINE(
[HAVE_LIBUUID],
[1],
[Define to 1 if you have the 'uuid' library (-luuid).]) ],
[ac_libewf_have_guid_support=no])
])
])
......@@ -1315,7 +1333,7 @@ AS_IF(
[AC_DEFINE(
[HAVE_UUID_GENERATE_RANDOM],
[1],
[Defines if uuid_generate_random funtion is present in libuuid.])
[Define to 1 if uuid_generate_random funtion is available in libuuid.])
])
AC_CHECK_LIB(
[uuid],
......@@ -1323,7 +1341,7 @@ AS_IF(
[AC_DEFINE(
[HAVE_UUID_GENERATE_TIME],
[1],