diff --git a/configure.in b/configure.in index b4a27e9..001146d 100644 --- a/configure.in +++ b/configure.in @@ -67,6 +67,7 @@ AC_PROG_MAKE_SET PKG_PROG_PKG_CONFIG dnl ========================================================================== +AM_CONDITIONAL(ENABLE_SHARED, test "$enable_shared" = "yes") case "$host" in *-*-mingw*) @@ -76,11 +77,13 @@ case "$host" in os_win32=no esac AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes") +AM_CONDITIONAL(BUILD_WIN32_DLL, test "$os_win32" = "yes" -a "$enable_shared" = "yes") if test "$os_win32" = "yes"; then AC_CHECK_PROG(ms_librarian, lib.exe, yes, no) fi AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes) +AM_CONDITIONAL(BUILD_MS_IMPORT_LIB, test x$ms_librarian = xyes -a "$enable_shared" = "yes") WARN_CFLAGS="" if test "x$GCC" = "xyes"; then diff --git a/src/Makefile.am b/src/Makefile.am index 406e85e..9110cde 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -if OS_WIN32 +if BUILD_WIN32_DLL export_symbols = -export-symbols fontconfig.def @@ -45,7 +45,7 @@ fontconfig_def_dependency = endif -if MS_LIB_AVAILABLE +if BUILD_MS_IMPORT_LIB # Microsoft import library install/uninstall