summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-10 03:59:19 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-10 03:59:19 +0300
commitdc0383ea1c14db56cbdbde5f1d38eb6c1f6d672d (patch)
tree155f7b3f9e2bd927677acf5fba6b32d2087dcf02
parent91960993dcb07c3362dbce3f2c28f279152c7627 (diff)
downloadmv-dc0383ea1c14db56cbdbde5f1d38eb6c1f6d672d.tar.gz
mv-dc0383ea1c14db56cbdbde5f1d38eb6c1f6d672d.tar.bz2
mv-dc0383ea1c14db56cbdbde5f1d38eb6c1f6d672d.tar.xz
mv-dc0383ea1c14db56cbdbde5f1d38eb6c1f6d672d.zip
Fix compilation with mingw and gettext.
-rwxr-xr-xconfigure.ac26
1 files changed, 14 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index f68adfb59..c33635f4a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -177,10 +177,24 @@ AC_TYPE_UINT32_T
AC_TYPE_INT64_T
AC_TYPE_SSIZE_T
+# Search for *-config
+AC_PATH_PROG(PKG_CONFIG, pkg-config)
+AC_PATH_PROG(CURL_CONFIG, curl-config)
+
+LIBS="$LIBS `$PKG_CONFIG --libs zlib`"
+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags zlib`"
+LIBS="$LIBS `$PKG_CONFIG --libs libpng`"
+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libpng`"
+
+# Checks for internationalization support
+AM_GNU_GETTEXT([external],[need-ngettext])
+AM_GNU_GETTEXT_VERSION([0.16.1])
+
case $host in
(*mingw*)
skip_check_lib="yes"
mingw=true
+ LIBS="$LIBS -lintl"
;;
(*)
skip_check_lib="no"
@@ -190,18 +204,6 @@ esac
AM_CONDITIONAL(MINGW, test x$mingw = xtrue)
-# Search for *-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config)
-AC_PATH_PROG(CURL_CONFIG, curl-config)
-
-LIBS="$LIBS `$PKG_CONFIG --libs zlib`"
-CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags zlib`"
-LIBS="$LIBS `$PKG_CONFIG --libs libpng`"
-CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libpng`"
-
-# Checks for internationalization support
-AM_GNU_GETTEXT([external],[need-ngettext])
-AM_GNU_GETTEXT_VERSION([0.16.1])
AC_DEFUN([AC_CHECK_SDL],
[