[PATCH weston 11/11] configure.ac: Reorder weston-launch stuff

[Quentin Glidic]

From: Quentin Glidic <sardemff7+git at sardemff7.net>

Signed-off-by: Quentin Glidic <sardemff7+git at sardemff7.net>
---
 configure.ac | 52 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8238824..fcffe7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,6 +101,35 @@ if test "x$enable_egl" = "xyes"; then
 fi
 
 
+#
+# weston-launch
+#
+
+AC_ARG_ENABLE(weston-launch,
+	     AS_HELP_STRING([--disable-weston-launch],
+			    [Disable weston-launch. Its purpose is to open
+			     devices that require privileges for weston to use
+			     them.]),,
+	     enable_weston_launch=yes)
+AM_CONDITIONAL(BUILD_WESTON_LAUNCH, [test "x$enable_weston_launch" = "xyes"])
+if test "x$enable_weston_launch" = "xyes"; then
+	AC_SEARCH_LIBS([pam_open_session], [pam])
+	case "$ac_cv_search_pam_open_session" in
+		no) AC_MSG_ERROR([pam support required for weston-launch]) ;;
+		"none required") ;;
+		*) PAM_LIBS="$ac_cv_search_pam_open_session" ;;
+	esac
+	AC_SUBST([PAM_LIBS])
+fi
+
+AC_ARG_ENABLE(setuid-install,
+	      AS_HELP_STRING([--disable-setuid-install],
+			     [Disable setuid for weston-launch. Only useful
+			      for local installation.]),,
+	      enable_setuid_install=yes)
+AM_CONDITIONAL(ENABLE_SETUID_INSTALL, [test "x$enable_setuid_install" = "xyes"])
+
+
 COMPOSITOR_MODULES="wayland-server >= 1.3.90 pixman-1"
 
 AC_ARG_ENABLE(xkbcommon,
@@ -117,13 +146,6 @@ if test "x$enable_xkbcommon" = "xyes"; then
 	COMPOSITOR_MODULES="$COMPOSITOR_MODULES xkbcommon >= 0.3.0"
 fi
 
-AC_ARG_ENABLE(setuid-install,
-	      AS_HELP_STRING([--disable-setuid-install],
-			     [Disable setuid for weston-launch. Only useful
-			      for local installation.]),,
-	      enable_setuid_install=yes)
-AM_CONDITIONAL(ENABLE_SETUID_INSTALL, [test "x$enable_setuid_install" = "xyes"])
-
 
 AC_ARG_ENABLE(xwayland,
 	      AS_HELP_STRING([--disable-xwayland],
@@ -395,22 +417,6 @@ PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209],
 AS_IF([test "x$have_systemd_login_209" = "xyes"],
       [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])])
 
-AC_ARG_ENABLE(weston-launch,
-	     AS_HELP_STRING([--disable-weston-launch],
-			    [Disable weston-launch. Its purpose is to open
-			     devices that require privileges for weston to use
-			     them.]),,
-	     enable_weston_launch=yes)
-AM_CONDITIONAL(BUILD_WESTON_LAUNCH, [test "x$enable_weston_launch" = "xyes"])
-if test "x$enable_weston_launch" = "xyes"; then
-	AC_SEARCH_LIBS([pam_open_session], [pam])
-	case "$ac_cv_search_pam_open_session" in
-		no) AC_MSG_ERROR([pam support required for weston-launch]) ;;
-		"none required") ;;
-		*) PAM_LIBS="$ac_cv_search_pam_open_session" ;;
-	esac
-	AC_SUBST([PAM_LIBS])
-fi
 
 if test "x$enable_egl" = "xyes"; then
   PKG_CHECK_MODULES(GLU, [glu], [have_glu=yes], [have_glu=no])
-- 
1.8.4.3