mcatan 2004/04/24 00:12:27
Modified: msvc Makefile.am
. configure.in
Added: include/log4cxx config.h config_msvc.h
Removed: msvc config.h.msvc.in
Log:
configuration for msvc is now automatic
Revision Changes Path
1.1 logging-log4cxx/include/log4cxx/config.h
Index: config.h
===================================================================
#ifndef _LOG4CXX_CONFIG_H
#define _LOG4CXX_CONFIG_H
#ifdef _MSC_VER
#include <log4cxx/config_msvc.h>
#else
#include <log4cxx/config_auto.h>
#endif
#endif //_LOG4CXX_CONFIG_H
1.1 logging-log4cxx/include/log4cxx/config_msvc.h
Index: config_msvc.h
===================================================================
/* Name of package */
#define PACKAGE "log4cxx"
/* Version number of package */
#define VERSION "0.9.6"
/* Define to 1 if you have the `ftime' function. */
#define HAVE_FTIME 1
/* ODBC support through Microsoft ODBC. */
#define HAVE_MS_ODBC 1
/* thread support through Microsoft threads. */
#define HAVE_MS_THREAD 1
/* XML support through Microsoft XML. */
#define HAVE_MS_XML 1
/* ODBC support */
#define HAVE_ODBC 1
/* thread support */
#define HAVE_THREAD 1
/* XML support */
#define HAVE_XML 1
typedef __int64 int64_t;
#ifdef WIN32
#pragma warning(disable : 4250 4251 4786 4290)
#endif
#ifdef LOG4CXX
#define LOG4CXX_EXPORT __declspec(dllexport)
#else
#define LOG4CXX_EXPORT __declspec(dllimport)
#endif
#define _WIN32_WINNT 0x0400
1.8 +1 -1 logging-log4cxx/msvc/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/logging-log4cxx/msvc/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am 18 Jan 2004 16:45:07 -0000 1.7
+++ Makefile.am 24 Apr 2004 07:12:27 -0000 1.8
@@ -1,2 +1,2 @@
SUBDIRS = dll simplesocketserver static tests performance examples
-EXTRA_DIST = log4cxx.dsw log4cxx.sln config.h.msvc
+EXTRA_DIST = log4cxx.dsw log4cxx.sln
1.32 +1 -2 logging-log4cxx/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/logging-log4cxx/configure.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- configure.in 24 Apr 2004 06:59:12 -0000 1.31
+++ configure.in 24 Apr 2004 07:12:27 -0000 1.32
@@ -18,7 +18,7 @@
AC_SUBST(LT_VERSION)
-AM_CONFIG_HEADER(include/log4cxx/config.h)
+AM_CONFIG_HEADER(include/log4cxx/config_auto.h)
AH_VERBATIM([HAVE_NO_EXPLICIT_EXPORTS],
[/* no explicit exports */
@@ -357,7 +357,6 @@
performance/Makefile
performance/xml/Makefile
examples/Makefile
-msvc/config.h.msvc
msvc/Makefile
msvc/dll/Makefile
msvc/examples/Makefile
