diff options
| author | Romain Chantereay <rchantereau@entrouvert.com> | 2004-07-23 18:19:09 +0000 |
|---|---|---|
| committer | Romain Chantereay <rchantereau@entrouvert.com> | 2004-07-23 18:19:09 +0000 |
| commit | 96830ea888519f5582d00e34b4a6f7d2d2260bed (patch) | |
| tree | f1e9c4debbdb5e7a3bcb676361f3fa3cbe2154b6 /configure.ac | |
| parent | e1d4bd8f50a04b352a9c4296d84e1ce2bc1e52dd (diff) | |
| download | lasso-96830ea888519f5582d00e34b4a6f7d2d2260bed.tar.gz lasso-96830ea888519f5582d00e34b4a6f7d2d2260bed.tar.xz lasso-96830ea888519f5582d00e34b4a6f7d2d2260bed.zip | |
Added some windows specifics considerations.
Cleaned the Hard, badly, sadly, dirty constant definitions. These definitions
are kept dirt, but a little less.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index ef80fead..785bcf9c 100644 --- a/configure.ac +++ b/configure.ac @@ -38,12 +38,17 @@ case "${host}" in CFLAGS="${CFLAGS} -D_ALL_SOURCE" ;; *-pc-*gw*) +dnl mno-cygwin to produce purely win32 DLL. CC="gcc -mno-cygwin" - CFLAGS="-I/usr/local/include -D_MSC_VER=1 -DIN_LASSO=1" -# CFLAGS="-I/usr/local/include" - LDFLAGS="-L/usr/local/lib" -dnl CFLAGS="${CFLAGS} -mno-cygwin" -dnl LDFLAGS="${LDFLAGS} -mno-cygwin" +dnl _MSC_VER to emulate a MSVC compilation and active secret room with +dnl correct dllexport/import export definitions. +dnl IN_LASSO to active special import/export mechanisms. +dnl G_OS_WIN32 is already defined, so we do not do it. With this +dnl definition, Microsoft C library will be used (msvcrt.dll). +dnl WIN32 and _WIN32 used to be sure. Some header test against it (ie: +dnl jni.h), then it do not cost to add this def... + CFLAGS="-I/usr/local/include -DWIN32 -D_WIN32 -D_MSC_VER -DIN_LASSO" + LDFLAGS="-L/usr/local/lib" GLIB_CFLAGS="-I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include" GLIB_LIBS="-lgobject-2.0 -lglib-2.0" XMLSEC1_CFLAGS="-DXMLSEC_CRYPTO=\"openssl\" -DXMLSEC_LIBXML_260=1 -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_XKMS=1 -DXMLSEC_NO_CRYPTO_DYNAMIC_LOADING=1 -DXMLSEC_CRYPTO_OPENSSL=1" @@ -92,7 +97,9 @@ if test "$ac_cv_sizeof_size_t" -ne "4" ; then fi -PKG_CHECK_MODULES(LASSO, glib-2.0 gobject-2.0 libxml-2.0 libxslt xmlsec1 xmlsec1-openssl) +if test "$CWINDOWS" = "yes" ; then + PKG_CHECK_MODULES(LASSO, glib-2.0 gobject-2.0 libxml-2.0 libxslt xmlsec1 xmlsec1-openssl) +fi AC_SUBST(LASSO_LIBS) AC_SUBST(LASSO_CFLAGS) |