[librsvg: 1/2] configure: Unify OS checks
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 1/2] configure: Unify OS checks
- Date: Sat, 11 Sep 2021 00:54:14 +0000 (UTC)
commit dffe88af1a715138f33f7124ac3fc8da5b2301d7
Author: Ismael Luceno <ismael iodev co uk>
Date: Sat Aug 28 18:32:04 2021 +0200
configure: Unify OS checks
Also simplify GIO backend check.
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/584>
configure.ac | 61 ++++++++++++++----------------------------------------------
1 file changed, 14 insertions(+), 47 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3fc9fefd..6e442d5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,45 +114,19 @@ dnl ===========================================================================
#AC_CANONICAL_HOST
-AC_MSG_CHECKING([for some Win32 platform])
-case "$host" in
- *-*-mingw*|*-*-cygwin*)
- platform_win32=yes
- ;;
- *)
- platform_win32=no
- ;;
-esac
-AC_MSG_RESULT([$platform_win32])
-AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
-
-AC_MSG_CHECKING([for native Win32])
-case "$host" in
- *-*-mingw*)
- native_win32=yes
- ;;
- *)
- native_win32=no
- ;;
-esac
-AC_MSG_RESULT([$native_win32])
-AM_CONDITIONAL(OS_WIN32, test "$native_win32" = "yes")
-
-dnl ===========================================================================
-
-#AC_CANONICAL_HOST
-
-AC_MSG_CHECKING([for darwin])
-case "$host" in
- *-*-darwin*)
- native_darwin=yes
- ;;
- *)
- native_darwin=no
- ;;
-esac
-AC_MSG_RESULT([$native_darwin])
-AM_CONDITIONAL(OS_DARWIN, test "$native_darwin" = "yes")
+AC_MSG_CHECKING([platform])
+platform=POSIX
+gio_backend=unix
+AS_CASE(["$host"],
+ [*-*-mingw*], [platform=Windows gio_backend=windows],
+ [*-*-cygwin*], [platform=Cygwin],
+ [*-*-darwin*], [platform=Darwin],
+)
+AC_MSG_RESULT([$platform])
+AM_CONDITIONAL(PLATFORM_WIN32,
+ [test x"$platform" = xWindows || test x"$platform" = xCygwin])
+AM_CONDITIONAL(OS_WIN32, [test x"$platform" = xWindows])
+AM_CONDITIONAL(OS_DARWIN, [test x"$platform" = xDarwin])
dnl ===========================================================================
@@ -179,14 +153,7 @@ PKG_CHECK_MODULES([GTHREAD],[gthread-2.0 >= $GLIB_REQUIRED])
PKG_CHECK_MODULES([GMODULE],[gmodule-2.0])
-case "$host" in
- *-*-mingw*)
- PKG_CHECK_MODULES([RSVG_CONVERT],[gio-2.0 gio-windows-2.0 gdk-pixbuf-2.0 cairo pangocairo])
- ;;
- *)
- PKG_CHECK_MODULES([RSVG_CONVERT],[gio-2.0 gio-unix-2.0 gdk-pixbuf-2.0 cairo pangocairo])
- ;;
-esac
+PKG_CHECK_MODULES([RSVG_CONVERT],[gio-2.0 "gio-${gio_backend}-2.0" gdk-pixbuf-2.0 cairo pangocairo])
GLIB_TESTS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]