mingw/windows-build works
This commit is contained in:
@@ -108,6 +108,15 @@ AC_DEFUN([AX_SUBST], [
|
||||
#
|
||||
# configures the basic environment
|
||||
AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
|
||||
MINGW=no
|
||||
MAC=no
|
||||
case $host in
|
||||
*mingw*) MINGW=yes;;
|
||||
*darwin* | *rhapsody* | *macosx*) MAC=yes;;
|
||||
esac
|
||||
AM_CONDITIONAL(MINGW, test "$MINGW" = "yes")
|
||||
AM_CONDITIONAL(MAC, test "$MAC" = "yes")
|
||||
|
||||
AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_NAME//-/_}'"
|
||||
AX_SUBST(NUMBERS)
|
||||
AX_SUBST(HOME)
|
||||
@@ -189,14 +198,6 @@ AC_DEFUN([AX_USE_CXX], [
|
||||
AM_DISTCHECK_CONFIGURE_FLAGS="CXXFLAGS='${CXXFLAGS}' CPPFLAGS='${CPPFLAGS}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
|
||||
AC_SUBST(AM_DISTCHECK_CONFIGURE_FLAGS)
|
||||
|
||||
MINGW=no
|
||||
MAC=no
|
||||
case $host_os in
|
||||
*mingw*) MINGW=yes;;
|
||||
*darwin* | *rhapsody* | *macosx*) MAC=yes;;
|
||||
esac
|
||||
AM_CONDITIONAL(MINGW, test "$MINGW" = "yes")
|
||||
AM_CONDITIONAL(MAC, test "$MAC" = "yes")
|
||||
|
||||
AC_SUBST(AM_CXXFLAGS)
|
||||
AC_SUBST(AM_CPPFLAGS)
|
||||
|
@@ -40,11 +40,14 @@ CPPFLAGS="${CPPFLAGS} -DQT_NO_KEYWORDS"
|
||||
|
||||
# libraries used
|
||||
if test "$MINGW" = "no"; then
|
||||
AC_MSG_ERROR([SCHEISSE: $host_os → $MINGW])
|
||||
AX_PKG_REQUIRE([pcsc], [libpcsclite], [pcsclite.h])
|
||||
fi
|
||||
AX_PKG_REQUIRE([ssl], [libssl], [openssl/crypto.h], [openssl])
|
||||
AX_PKG_REQUIRE([mrwcxx], [mrw-c++], [mrw/checkcxx11.hxx])
|
||||
AX_PKG_REQUIRE([pkcs11], [p11-kit-1], [pkcs11.h], [libpkcs11-helper-1])
|
||||
AX_PKG_REQUIRE([ssl], [libssl], [openssl/crypto.h], [openssl])
|
||||
else
|
||||
LDFLAGS+=" -lwinscard -lssl -lcrypto"
|
||||
fi
|
||||
AX_PKG_REQUIRE([mrwcxx], [mrw-c++], [mrw/checkcxx11.hxx])
|
||||
|
||||
# create output
|
||||
AC_OUTPUT
|
||||
|
Reference in New Issue
Block a user