From 9eb4c95a8dcd95f55902c3a6cd3ad1c7c1d080d5 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Tue, 20 Mar 2012 11:00:18 -0700 Subject: [PATCH] trying to run configure on windows --- config.h | 126 ------------ config.h.in | 7 - config.win32.h | 186 ------------------ qmake.inc.in | 117 +++++++++++ qmake2.inc | 126 ------------ src/libfwbuilder/qmake.inc.in | 64 +++++- src/libfwbuilder/qmake2.inc | 58 ------ .../src/fwbuilder/libfwbuilder-config.h | 114 ----------- .../src/fwbuilder/libfwbuilder-config.h.in | 58 +----- 9 files changed, 177 insertions(+), 679 deletions(-) delete mode 100644 config.h delete mode 100644 config.win32.h delete mode 100644 qmake2.inc delete mode 100644 src/libfwbuilder/qmake2.inc delete mode 100644 src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h diff --git a/config.h b/config.h deleted file mode 100644 index 8e87f7ff8..000000000 --- a/config.h +++ /dev/null @@ -1,126 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ - -#include "VERSION.h" - -#if defined(_WIN32) -# include "config.win32.h" -#else - -#define BUILD_NUM "3598" - -/* #undef PACKAGE_LOCALE_DIR */ -/* #undef PACKAGE_DATA_DIR */ -/* #undef PACKAGE_SOURCE_DIR */ - -/* #undef RCS_DIR */ -#define RCS_FILE_NAME "/usr/bin/rcs" -#define RCSDIFF_FILE_NAME "/usr/bin/rcsdiff" -#define RLOG_FILE_NAME "/usr/bin/rlog" -#define CI_FILE_NAME "/usr/bin/ci" -#define CO_FILE_NAME "/usr/bin/co" - -/* Define if you have the header file. */ -/* #undef HAVE_X11_SM_SMLIB_H */ - -/* Name of package */ -#define PACKAGE "fwbuilder" - -/* OS */ -#define OS "Linux" - -/* OS */ -/* #undef OS_CYGWIN */ -/* #undef OS_MINGW */ -/* #undef OS_MACOSX */ -/* #undef OS_SOLARIS */ -/* #undef OS_FREEBSD */ -/* #undef OS_OPENBSD */ -#define OS_LINUX "1" -/* #undef OS_UNKNOWN */ - -#if defined(OS_SOLARIS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_LINUX) || defined(OS_MACOSX) -#define OS_UNIX 1 -#endif - -#if defined(_WIN32) -#define OS_WIN32 1 -#endif - -/* distribution (for Linux) */ -#define DISTRO "Debian" - -/* prefix dir */ -#define PREFIX "/usr/local" - -#define MANIFEST_MARKER "# files: " - -/* #undef HAVE_LOCALE_H */ -#define HAVE_GETOPT_H 1 -/* #undef HAVE_SETLOCALE */ -/* #undef HAVE_SETENV */ -/* #undef HAVE_PUTENV */ -#define HAVE_SIGNAL 1 -#define HAVE_SIGNAL_H 1 - -#define HAVE_PTY_H 1 -/* #undef HAVE_LIBUTIL_H */ -/* #undef HAVE_UTIL_H */ -#define HAVE_UNISTD_H 1 - -#ifdef HAVE_GETOPT_H -# define HAVE_DECL_GETOPT HAVE_GETOPT_H -#endif - -#define HAVE_STRUCT_TM_TM_ZONE 1 -/* #undef TM_IN_SYS_TIME */ - -#define HAVE_FORKPTY 1 -#define HAVE_CFMAKERAW 1 - -/* - * This is needed for Solaris - */ -/* #undef __PRAGMA_REDEFINE_EXTNAME */ - - - -/* #undef HAVE_CATGETS */ -/* #undef HAVE_GETTEXT */ -/* #undef HAVE_LC_MESSAGES */ -/* #undef HAVE_STPCPY */ -/* #undef HAVE_LIBSM */ -/* #undef HAVE_MEMPCPY */ -#define HAVE_STRCHR 1 - -/* #undef HAVE_ANTLR_RUNTIME */ - -/* #undef HAVE_QTDBUS */ - -#define HAVE_CPPUNIT 1 - -/* - * on some platforms (OpenBSD) the second parameter to dlopen is different - */ -/* #undef DLOPEN_MODE */ - -#if 0 -#ifdef __cplusplus -using namespace std; -/* - #ifndef __STD - #define __STD std - #endif -*/ -#endif -#endif - -#ifndef _WIN32 -# define SNPRINTF snprintf -# define VSNPRINTF vsnprintf -#else -# define SNPRINTF _snprintf -# define VSNPRINTF _vsnprintf -#endif - -#endif - diff --git a/config.h.in b/config.h.in index a90b6c82a..a64f68856 100644 --- a/config.h.in +++ b/config.h.in @@ -1,10 +1,6 @@ #include "VERSION.h" -#if defined(_WIN32) -# include "config.win32.h" -#else - #undef BUILD_NUM #undef PACKAGE_LOCALE_DIR @@ -81,8 +77,6 @@ */ #undef __PRAGMA_REDEFINE_EXTNAME - - #undef HAVE_CATGETS #undef HAVE_GETTEXT #undef HAVE_LC_MESSAGES @@ -121,5 +115,4 @@ using namespace std; # define VSNPRINTF _vsnprintf #endif -#endif diff --git a/config.win32.h b/config.win32.h deleted file mode 100644 index 9aee6f826..000000000 --- a/config.win32.h +++ /dev/null @@ -1,186 +0,0 @@ - -#include "VERSION.h" - -#ifdef _WIN32 - -#ifndef __GNUC__ -/***************** MSVC ****************/ - -/* define constants for access that are missing on windows */ - -/* Values for the second argument to access. - These may be OR'd together. */ -#define R_OK 4 /* Test for read permission. */ -#define W_OK 2 /* Test for write permission. */ -#define X_OK 1 /* Test for execute permission. */ -#define F_OK 0 /* Test for existence. */ - -/****************************************/ -#endif - -#define _WIN32_WINNT 0x0501 - -#undef PACKAGE_LOCALE_DIR -#undef PACKAGE_DATA_DIR -#undef PACKAGE_SOURCE_DIR - -#define RCS_FILE_NAME "rcs.exe" -#define RCSDIFF_FILE_NAME "rcsdiff.exe" -#define RLOG_FILE_NAME "rlog.exe" -#define CI_FILE_NAME "ci.exe" -#define CO_FILE_NAME "co.exe" - -/* - * Normally this macro defines directory where system-wide QT - * translations are installed. We do not use it on win32 since - * we can't assume user has QT installed on their machine. - */ -#define QTTRANSLATIONSDIR "." - -/* Define if you have the header file. */ -#undef HAVE_X11_SM_SMLIB_H - -/* Name of package */ -#define PACKAGE fwbuilder2 - -/* init dir */ -#define RES_DIR "resources" - -/* OS */ -#undef OS - -/* OS */ -#define OS_WIN32 1 - -/* distribution (for Linux) */ -#define DISTRO "Unknown" - -/* prefix dir */ -/* #define PREFIX Z: */ - -#define MANIFEST_MARKER "# files: " - -#undef HAVE_LOCALE_H -#undef HAVE_GETOPT_H -#undef HAVE_SETLOCALE -#undef HAVE_SETENV -#undef HAVE_PUTENV - -#ifdef HAVE_GETOPT_H -# define HAVE_DECL_GETOPT HAVE_GETOPT_H -#endif - -#undef HAVE_STRUCT_TM_TM_ZONE -#undef TM_IN_SYS_TIME - -/* - * This is needed for Solaris - */ -#undef __PRAGMA_REDEFINE_EXTNAME - - - -#undef HAVE_CATGETS -#undef HAVE_GETTEXT -#undef HAVE_LC_MESSAGES -#undef HAVE_STPCPY -#undef HAVE_LIBSM -#undef HAVE_MEMPCPY -#undef HAVE_STRCHR - -/* #undef HAVE_LIBSNMP */ -#define HAVE_ANTLR_RUNTIME 1 - -#define SNPRINTF _snprintf -#define VSNPRINTF _vsnprintf - - - -#endif /* End of _WIN32 */ - -/* **************************************************************** */ -#ifdef Q_OS_MACX - -#define RCS_FILE_NAME "/usr/bin/rcs" -#define RCSDIFF_FILE_NAME "/usr/bin/rcsdiff" -#define RLOG_FILE_NAME "/usr/bin/rlog" -#define CI_FILE_NAME "/usr/bin/ci" -#define CO_FILE_NAME "/usr/bin/co" - -/* Define if you have the header file. */ -/* #undef HAVE_X11_SM_SMLIB_H */ - -/* Name of package */ -#define PACKAGE "fwbuilder" - -/* OS */ -#define OS "MacOSX" - -/* OS */ -/* #undef OS_CYGWIN */ -/* #undef OS_MINGW */ -#define OS_MACOSX "1" -/* #undef OS_SOLARIS */ -/* #undef OS_FREEBSD */ -/* #undef OS_OPENBSD */ -/* #undef OS_LINUX */ -/* #undef OS_UNKNOWN */ - -#if defined(OS_SOLARIS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_LINUX) || defined(OS_MACOSX) -#define OS_UNIX 1 -#endif - -/* distribution (for Linux) */ -#define DISTRO "" - -/* prefix dir */ -/* #undef PREFIX */ - -/* init dir */ -#define RES_DIR "../Resources" - -#define MANIFEST_MARKER "# files: " - -/* #undef HAVE_LOCALE_H */ -#define HAVE_GETOPT_H 1 -/* #undef HAVE_SETLOCALE */ -/* #undef HAVE_SETENV */ -/* #undef HAVE_PUTENV */ -#define HAVE_SIGNAL 1 -#define HAVE_SIGNAL_H 1 - -/* #undef HAVE_PTY_H */ -/* #undef HAVE_LIBUTIL_H */ -#define HAVE_UTIL_H 1 - -#ifdef HAVE_GETOPT_H -# define HAVE_DECL_GETOPT HAVE_GETOPT_H -#endif - -#define HAVE_STRUCT_TM_TM_ZONE 1 -/* #undef TM_IN_SYS_TIME */ - -#define HAVE_FORKPTY 1 -#define HAVE_CFMAKERAW 1 - -/* #undef HAVE_CATGETS */ -/* #undef HAVE_GETTEXT */ -/* #undef HAVE_LC_MESSAGES */ -/* #undef HAVE_STPCPY */ -/* #undef HAVE_LIBSM */ -/* #undef HAVE_MEMPCPY */ -#define HAVE_STRCHR 1 - - -/* - * on some platforms (OpenBSD) the second parameter to dlopen is different - */ -/* #undef DLOPEN_MODE */ - -#define SNPRINTF snprintf -#define VSNPRINTF vsnprintf - -#define HAVE_LIBSNMP 1 -#define HAVE_ANTLR_RUNTIME 1 - -#endif diff --git a/qmake.inc.in b/qmake.inc.in index c3212a3b3..dc7ada177 100644 --- a/qmake.inc.in +++ b/qmake.inc.in @@ -72,9 +72,126 @@ unix { } win32 { + # Keep this as a absolute full path. For some reason, when + # I leave it is up to qmake to define this variable, and it + # makes it "xcopy /i /y /s /q", I get an error "Invalid number of parameters" + # even though command line looks correct. Chances are, there is another + # xcopy somewhere on the system that gets used, but I could not find it. + # Setting this variable using full path works. + QMAKE_COPY_DIR = C:\\Windows\\System32\\xcopy /I /Y /S /Q + + PREFIX = "c:/tmp/build_root" + DOCDIR = "$$PREFIX/doc/fwbuilder" + exec_prefix = "$$PREFIX" + MANDIR = "$$PREFIX/man/" + DESTDIR = "" + + doc.path = $$DOCDIR + + target.path = $$PREFIX/ + res.path = $$PREFIX/resources + res_os.path = $$res.path/os + res_platform.path = $$res.path/platform + res_help_C.path = $$res.path/help/C + res_help_en_US.path = $$res.path/help/en_US + res_configlets.path = $$res.path/configlets + + PKGLOCALEDIR = $$res.path/locale + + CONFIG += qt thread rtti stl warn_on release CONFIG -= debug + + BINARY_SUBDIR = release + + DEFINES += LIBXML_STATIC LIBXSLT_STATIC + DEFINES += LIBEXSLT_STATIC XMLSEC_STATIC + + INCLUDEPATH += "../.." + + INCLUDEPATH += c:/local/include c:/local/include/libxml2 c:/MinGW/include + + LIBS += -L "c:/local/lib" + LIBS += -l xslt -l xml2 -l iconv -l pthread -l netsnmp -l ws2_32 + +# workaround for QT += dbus not working atm +# Standard QT binary Windows distribution does not include QtDBus library +# Checked with 4.4.1 and 4.4.3 06/12/2009 +# LIBS += -lQtDBus + + target.path = $$PREFIX/bin + +# on windows we use antlr DLL + HAVE_ANTLR_RUNTIME = 1 + HAVE_EXTERNAL_ANTLR = 0 + antlr.path = $$PREFIX/lib + +# Qt on windows does not have DBus framework support, turn parts of .pro files off +# HAVE_QTDBUS = + + ANTLR_INCLUDEPATH = .. + ANTLR_LIBS = ../antlr/release/libantlr.a + +# our parsers are linked as a library (code is in src/parsers) + FWBPARSER_LIB = ../parsers/release/libfwbparser.a + +# fwtransfer library for secuwall (and possibly other os/platform) +# override the name for windows +# FWTRANSFER_LIB = ../fwtransfer/release/libfwtransfer.a } +macx { + +// PREFIX = "$$DESTDIR" + DOCDIR = "$$PREFIX/doc/" + MANDIR = "$$PREFIX/share/man" + + # These do not really matter because we never run make install on Mac OS X + target.path = $$PREFIX/ + res.path = $$PREFIX/resources/ + res_os.path = $$res.path/os + res_platform.path = $$res.path/platform + res_help_C.path = $$res.path/help/C + res_help_en_US.path = $$res.path/help/en_US + res_configlets.path = $$res.path/configlets + + icns.files = fwbuilder.icns + icns.path = $$PREFIX/ + + PKGLOCALEDIR = $$res.path/locale + +# If I build on 10.6 without these, generated binary depends on +# /usr/lib/libxml2.2.dynlib that has compatibility version 10.0.0 +# which does not work on 10.5 where its compatibility version is +# 9.0.0. Chances are, the same thing may be happening with other +# dependency libraries. Building on 10.6 with deployment target 10.5 +# should solve the problem + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 + QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk + + CONFIG += qt thread rtti stl warn_on debug # release + +# not compiling for PPC because of problems on Snow Leopard + CONFIG += x86 + +# See http://trolltech.com/developer/task-tracker/index_html?method=entry&id=211852 +# for why ppc architecture is commented out. +# If Trolltech does not fix it by the time of release v3.0, will have +# to figure out workaround (turn off precompiled headers ?) +# CONFIG += ppc + + INCLUDEPATH += $(INSTALL_ROOT)/$$PREFIX/include/ + INCLUDEPATH += /usr/include/libxml2 /usr/include + + QMAKE_LIBS_QT = + QMAKE_LIBS_QT_THREAD = + + # LIBS += $$LIBS_FWBUILDER + LIBS += -lxml2 -lz + LIBS += -lpthread -lssl -lcrypto + +} + + FWB_SIG = $$(FWB_SIG) if (isEmpty(FWB_SIG)) { FWB_SIG=26932 } DEFINES += FWB_SIG=$$FWB_SIG diff --git a/qmake2.inc b/qmake2.inc deleted file mode 100644 index 3eaa55a9e..000000000 --- a/qmake2.inc +++ /dev/null @@ -1,126 +0,0 @@ -#-*- mode: makefile; tab-width: 4; -*- -# -######### fwbuilder/files/qmake2.inc -# - - -win32 { - # Keep this as a absolute full path. For some reason, when - # I leave it is up to qmake to define this variable, and it - # makes it "xcopy /i /y /s /q", I get an error "Invalid number of parameters" - # even though command line looks correct. Chances are, there is another - # xcopy somewhere on the system that gets used, but I could not find it. - # Setting this variable using full path works. - QMAKE_COPY_DIR = C:\\Windows\\System32\\xcopy /I /Y /S /Q - - PREFIX = "c:/tmp/build_root" - DOCDIR = "$$PREFIX/doc/fwbuilder" - exec_prefix = "$$PREFIX" - MANDIR = "$$PREFIX/man/" - DESTDIR = "" - - doc.path = $$DOCDIR - - target.path = $$PREFIX/ - res.path = $$PREFIX/resources - res_os.path = $$res.path/os - res_platform.path = $$res.path/platform - res_help_C.path = $$res.path/help/C - res_help_en_US.path = $$res.path/help/en_US - res_configlets.path = $$res.path/configlets - - PKGLOCALEDIR = $$res.path/locale - - CONFIG += qt thread rtti stl warn_on release - CONFIG -= debug - - BINARY_SUBDIR = release - - DEFINES += LIBXML_STATIC LIBXSLT_STATIC - DEFINES += LIBEXSLT_STATIC XMLSEC_STATIC - - INCLUDEPATH += "../.." - - INCLUDEPATH += c:/local/include c:/local/include/libxml2 c:/MinGW/include - - LIBS += -L "c:/local/lib" - LIBS += -l xslt -l xml2 -l iconv -l pthread -l netsnmp -l ws2_32 - -# workaround for QT += dbus not working atm -# Standard QT binary Windows distribution does not include QtDBus library -# Checked with 4.4.1 and 4.4.3 06/12/2009 -# LIBS += -lQtDBus - - target.path = $$PREFIX/bin - -# on windows we use antlr DLL - HAVE_ANTLR_RUNTIME = 1 - HAVE_EXTERNAL_ANTLR = 0 - antlr.path = $$PREFIX/lib - -# Qt on windows does not have DBus framework support, turn parts of .pro files off -# HAVE_QTDBUS = - - ANTLR_INCLUDEPATH = .. - ANTLR_LIBS = ../antlr/release/libantlr.a - -# our parsers are linked as a library (code is in src/parsers) - FWBPARSER_LIB = ../parsers/release/libfwbparser.a - -# fwtransfer library for secuwall (and possibly other os/platform) -# override the name for windows -# FWTRANSFER_LIB = ../fwtransfer/release/libfwtransfer.a -} - -macx { - -// PREFIX = "$$DESTDIR" - DOCDIR = "$$PREFIX/doc/" - MANDIR = "$$PREFIX/share/man" - - # These do not really matter because we never run make install on Mac OS X - target.path = $$PREFIX/ - res.path = $$PREFIX/resources/ - res_os.path = $$res.path/os - res_platform.path = $$res.path/platform - res_help_C.path = $$res.path/help/C - res_help_en_US.path = $$res.path/help/en_US - res_configlets.path = $$res.path/configlets - - icns.files = fwbuilder.icns - icns.path = $$PREFIX/ - - PKGLOCALEDIR = $$res.path/locale - -# If I build on 10.6 without these, generated binary depends on -# /usr/lib/libxml2.2.dynlib that has compatibility version 10.0.0 -# which does not work on 10.5 where its compatibility version is -# 9.0.0. Chances are, the same thing may be happening with other -# dependency libraries. Building on 10.6 with deployment target 10.5 -# should solve the problem - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 - QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk - - CONFIG += qt thread rtti stl warn_on debug # release - -# not compiling for PPC because of problems on Snow Leopard - CONFIG += x86 - -# See http://trolltech.com/developer/task-tracker/index_html?method=entry&id=211852 -# for why ppc architecture is commented out. -# If Trolltech does not fix it by the time of release v3.0, will have -# to figure out workaround (turn off precompiled headers ?) -# CONFIG += ppc - - INCLUDEPATH += $(INSTALL_ROOT)/$$PREFIX/include/ - INCLUDEPATH += /usr/include/libxml2 /usr/include - - QMAKE_LIBS_QT = - QMAKE_LIBS_QT_THREAD = - - # LIBS += $$LIBS_FWBUILDER - LIBS += -lxml2 -lz - LIBS += -lpthread -lssl -lcrypto - -} - diff --git a/src/libfwbuilder/qmake.inc.in b/src/libfwbuilder/qmake.inc.in index a73207ce1..25b5e3265 100644 --- a/src/libfwbuilder/qmake.inc.in +++ b/src/libfwbuilder/qmake.inc.in @@ -13,6 +13,12 @@ HAVE_CPPUNIT = @HAVE_CPPUNIT@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ +CONFIG -= qt + +QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS +QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS + + unix { CONFIG += warn_on debug @@ -24,8 +30,8 @@ unix { QMAKE_CXX = @CCACHE@ @DISTCC@ $$QMAKE_CXX - # We put /usr/include into INCLUDEPATH to fix a problem compiling - # fwbuilder/snmp.cpp on freebsd. + # We put /usr/include into INCLUDEPATH to fix a problem compiling + # fwbuilder/snmp.cpp on freebsd. INCLUDEPATH += /usr/include @XML_CFLAGS_Q@ @XSLT_CFLAGS_Q@ LIBS += @PTHREAD_LIBS@ @XML_LIBS@ @XSLT_LIBS@ @LIBSNMP_LIBS@ @LIB_RESOLV@ @LIBS@ @@ -43,13 +49,57 @@ unix { doc.path = @DOCDIR@ } -QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS -QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS +win32 { + prefix = "c:/tmp/build_root" + DOCDIR = "$$prefix/doc/" + exec_prefix = "$$prefix" + DESTDIR = "" -exists(qmake2.inc) { - include( qmake2.inc) + target.path = "$$prefix/lib" + dtd.path = "$$prefix/resources" + migration.path = "$$prefix/resources/migration" + doc.path = "$$prefix/doc/libfwbuilder" + + CONFIG -= debug + CONFIG += thread rtti stl warn_on release + CONFIG += staticlib + + DEFINES += LIBXML_STATIC LIBXSLT_STATIC + INCLUDEPATH += ../../../fwb-lm/include + INCLUDEPATH += c:/local/include c:/local/include/libxml2 c:/MinGW/include + LIBS += -LC:\local\lib +# LIBS += ws2_32.lib pthreadVC.lib + LIBS += pthreadVC.lib + LIBS += libxml2.lib libxslt_a.lib libz.a # zlib.lib +} + +macx { + prefix = "$$prefix" + DOCDIR = "$$prefix/doc/" + exec_prefix = "$$prefix" + DESTDIR = + +# these path definitions are not used since we do not run make install on Mac +# (see fwbuilder.def file where it is defined that we don't do that) +# But I need to assign these variables some value to make qmake happy. + target.path = "$$prefix/lib" + dtd.path = "$$prefix/" + migration.path = "$$prefix/migration" + doc.path = "$$prefix/doc/" + + CONFIG += x86 + +# If I build on 10.6 without these, generated binary depends on +# /usr/lib/libxml2.2.dynlib that has compatibility version 10.0.0 +# which does not work on 10.5 where its compatibility version is +# 9.0.0. Chances are, the same thing may be happening with other +# dependency libraries. Building on 10.6 with deployment target 10.5 +# should solve the problem + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 + QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk + + QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Frameworks/ } -CONFIG -= qt INSTALLS += target diff --git a/src/libfwbuilder/qmake2.inc b/src/libfwbuilder/qmake2.inc deleted file mode 100644 index 34ccb53ad..000000000 --- a/src/libfwbuilder/qmake2.inc +++ /dev/null @@ -1,58 +0,0 @@ -#-*- mode: makefile; tab-width: 4; -*- -# -######### libfwbuilder/files/qmake2.inc -# - - -win32 { - prefix = "c:/tmp/build_root" - DOCDIR = "$$prefix/doc/" - exec_prefix = "$$prefix" - DESTDIR = "" - - target.path = "$$prefix/lib" - dtd.path = "$$prefix/resources" - migration.path = "$$prefix/resources/migration" - doc.path = "$$prefix/doc/libfwbuilder" - - CONFIG -= debug - CONFIG += thread rtti stl warn_on release - CONFIG += staticlib - - DEFINES += LIBXML_STATIC LIBXSLT_STATIC - INCLUDEPATH += ../../../fwb-lm/include - INCLUDEPATH += c:/local/include c:/local/include/libxml2 c:/MinGW/include - LIBS += -LC:\local\lib -# LIBS += ws2_32.lib pthreadVC.lib - LIBS += pthreadVC.lib - LIBS += libxml2.lib libxslt_a.lib libz.a # zlib.lib -} - -macx { - prefix = "$$prefix" - DOCDIR = "$$prefix/doc/" - exec_prefix = "$$prefix" - DESTDIR = - -# these path definitions are not used since we do not run make install on Mac -# (see fwbuilder.def file where it is defined that we don't do that) -# But I need to assign these variables some value to make qmake happy. - target.path = "$$prefix/lib" - dtd.path = "$$prefix/" - migration.path = "$$prefix/migration" - doc.path = "$$prefix/doc/" - - CONFIG += x86 - -# If I build on 10.6 without these, generated binary depends on -# /usr/lib/libxml2.2.dynlib that has compatibility version 10.0.0 -# which does not work on 10.5 where its compatibility version is -# 9.0.0. Chances are, the same thing may be happening with other -# dependency libraries. Building on 10.6 with deployment target 10.5 -# should solve the problem - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 - QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk - - QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Frameworks/ -} - diff --git a/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h b/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h deleted file mode 100644 index d91a5f82a..000000000 --- a/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h +++ /dev/null @@ -1,114 +0,0 @@ -/* src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h. Generated from libfwbuilder-config.h.in by configure. */ - -#define FWBUILDER_XML_VERSION "22" - -#define FREEXMLBUFF(x) xmlFree((void*)(x)) - - -#ifdef _WIN32 -/* # pragma warning(disable:4786) */ -# define _WIN32_WINNT 0x0501 - -/* - * Template files directory dir - * DO NOT USE THIS CONSTANT DIRECTLY - USE Constants class instead! -# define RES_DIR "/usr/local/share/fwbuilder-5.1.0.3598" - */ - -/* #undef UCD_SNMP */ -/* #undef HAVE_LIBSNMP 1 */ -/* #unde NET_SNMP 1 */ - -/* - * stdint.h must be installed on windows to satisfy uint128.h - */ -# define HAVE_STDINT_H 1 - -/* xmlSaveFile */ -# define HAVE_XMLSAVEFORMATFILEENC 1 - -/* #undef HAVE_LIBXSLT_XSLTCONFIG_H */ - -/* strtok_s on windows */ -# define HAVE_STRTOK_S 1 - -/* net-snmp lib checks HAVE_STRTOK_R on windows. This function - * exists both on windows and mac - */ -# define HAVE_STRTOK_R 1 -# define WORDS_LITTLEENDIAN 1 - -/* - * newer versions of UCD-SNMP use this function. This should be preferred way, - * but Mandrake 8.2 comes with ucd-snmp v.4.2.3 which does not have it. - */ -# define HAVE_SNPRINT_OBJID 1 - -/* - * always need this for openssl - */ -# define OPENSSL_NO_KRB5 - -# define SNPRINTF _snprintf -# define VSNPRINTF _vsnprintf -# define FS_SEPARATOR "\\" - -#else - -/* - * Template files directory dir - * DO NOT USE THIS CONSTANT DIRECTLY - USE Constants class instead! - */ -#define RES_DIR "/usr/local/share/fwbuilder-5.1.0.3598" - -#define HAVE_LIBSNMP 1 -/* #undef UCD_SNMP */ -#define NET_SNMP 1 - -/* #undef HAVE_INET_NET_NTOP */ - -/* #undef HAVE_GOODLIBRESOLV */ - -/* #undef HAVE_LWRES */ - -/* #undef HAVE_LWRES_GETIPNODE */ - -#define HAVE_GETOPT_H 1 - -/* gethostbyname_r */ -/* #undef HAVE_FUNC_GETHOSTBYNAME_R_6 */ -/* #undef HAVE_FUNC_GETHOSTBYNAME_R_5 */ -/* #undef HAVE_FUNC_GETHOSTBYNAME_R_3 */ - -/* gethostbyaddr_r */ -/* #undef HAVE_GETHOSTBYADDR_R_5 */ -/* #undef HAVE_GETHOSTBYADDR_R_7 */ -/* #undef HAVE_GETHOSTBYADDR_R_8 */ - -/* first argument of gethostbyaddr_r may be char* or void* */ -/* #undef GETHOSTBYADDR_FIRST_ARG_CHARPTR */ -/* #undef GETHOSTBYADDR_FIRST_ARG_VOIDPTR */ - -/* xmlSaveFile */ -#define HAVE_XMLSAVEFORMATFILEENC 1 - -#define HAVE_LIBXSLT_XSLTCONFIG_H 1 - -/* strtok_r */ -#define HAVE_STRTOK_R 1 - -#define WORDS_LITTLEENDIAN 1 -/* #undef WORDS_BIGENDIAN */ - -/* - * newer versions of UCD-SNMP use this function. This should be preferred way, - * but Mandrake 8.2 comes with ucd-snmp v.4.2.3 which does not have it. - */ -#define HAVE_SNPRINT_OBJID 1 - -# define SNPRINTF snprintf -# define VSNPRINTF vsnprintf -# define FS_SEPARATOR "/" - -#endif - diff --git a/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h.in b/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h.in index f1a304073..cd7bb1abe 100644 --- a/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h.in +++ b/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h.in @@ -3,57 +3,6 @@ #define FREEXMLBUFF(x) xmlFree((void*)(x)) - -#ifdef _WIN32 -/* # pragma warning(disable:4786) */ -# define _WIN32_WINNT 0x0501 - -/* - * Template files directory dir - * DO NOT USE THIS CONSTANT DIRECTLY - USE Constants class instead! -# define RES_DIR "resources" - */ - -/* #undef UCD_SNMP */ -/* #undef HAVE_LIBSNMP 1 */ -/* #unde NET_SNMP 1 */ - -/* - * stdint.h must be installed on windows to satisfy uint128.h - */ -# define HAVE_STDINT_H 1 - -/* xmlSaveFile */ -# define HAVE_XMLSAVEFORMATFILEENC 1 - -/* #undef HAVE_LIBXSLT_XSLTCONFIG_H */ - -/* strtok_s on windows */ -# define HAVE_STRTOK_S 1 - -/* net-snmp lib checks HAVE_STRTOK_R on windows. This function - * exists both on windows and mac - */ -# define HAVE_STRTOK_R 1 -# define WORDS_LITTLEENDIAN - -/* - * newer versions of UCD-SNMP use this function. This should be preferred way, - * but Mandrake 8.2 comes with ucd-snmp v.4.2.3 which does not have it. - */ -# define HAVE_SNPRINT_OBJID 1 - -/* - * always need this for openssl - */ -# define OPENSSL_NO_KRB5 - -# define SNPRINTF _snprintf -# define VSNPRINTF _vsnprintf -# define FS_SEPARATOR "\\" - -#else - /* * Template files directory dir * DO NOT USE THIS CONSTANT DIRECTLY - USE Constants class instead! @@ -105,9 +54,8 @@ */ #undef HAVE_SNPRINT_OBJID -# define SNPRINTF snprintf -# define VSNPRINTF vsnprintf -# define FS_SEPARATOR "/" +#define SNPRINTF snprintf +#define VSNPRINTF vsnprintf +#define FS_SEPARATOR "/" -#endif