X-Git-Url: https://lisas.de/git/?p=terminatorX.git;a=blobdiff_plain;f=configure.ac;h=8c99afbe10b47abd3d4c23d86254df3af3999d34;hp=dddba0745c038567f599fe359651e9178de48c27;hb=bdd2bf053e98293dbcd9e77506545544155571a1;hpb=d905e4af95510417f851f5e982d47f3839988265

diff --git a/configure.ac b/configure.ac
index dddba07..8c99afb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([terminatorX], [3.90], [https://terminatorx.org/bugs/], [terminatorX])
+AC_INIT([terminatorX], [4.0.1], [https://terminatorX.org/bugs/], [terminatorX], [https://terminatorX.org])
 
 AC_CONFIG_SRCDIR([src/tX_global.h])
 AM_INIT_AUTOMAKE
@@ -15,7 +15,7 @@ AC_ARG_ENABLE(wav,		[  --enable-wav            enables the built-in wav-loader (
 AC_ARG_ENABLE(alsa,		[  --enable-alsa           use ALSA for sound output (default=auto) ])
 AC_ARG_ENABLE(jack,		[  --enable-jack           use JACK for sound output (default=auto) ])
 AC_ARG_ENABLE(oss,		[  --enable-oss            use OSS for sound output (default=auto) ])
-AC_ARG_ENABLE(pulse,		[  --enable-pulse          use PULSE for sound output (default=auto) ])
+AC_ARG_ENABLE(pulse,		[  --enable-pulse          use PulseAudio for sound output (default=auto) ])
 AC_ARG_ENABLE(x11,    [  --enable-x11            include X11 specific code (default=auto) ])
 AC_ARG_ENABLE(libxml2,	    	[  --disable-libxml2       use libxml even if verion 2 detected (default=auto) ])
 AC_ARG_ENABLE(mad,		[  --disable-mad           disable mad for mp3 support (default=auto) ])
@@ -27,7 +27,7 @@ AC_ARG_ENABLE(alsamidi,		[  --disable-alsamidi      disable support  ALSA MIDI i
 AC_ARG_ENABLE(lrdf,		[  --disable-lrdf          disable support for liblrdf (default=auto) ])
 AC_ARG_ENABLE(capabilities,	[  --enable-capabilities   to use rt-scheduling (default=auto) ])
 AC_ARG_ENABLE(deprecated,	[  --disable-deprecated    compile without deprecated G*-headers (default=no) ])
-AC_ARG_ENABLE(suidroot,   [  --disable-suidroot      to avoid setuid root upon installation (default=no) ])
+AC_ARG_ENABLE(suidroot,   [  --enable-suidroot      install terminatorX setuid root (default=no) ])
 AC_ARG_WITH(docdir,		[  --with-docdir=/some/dir the final location the docs will be installed to. ])
 
 dnl Checks for programs.
@@ -139,6 +139,11 @@ else
 	AC_MSG_ERROR([** couldn't find gtk+ > Version 3. Please upgrade (http://www.gtk.org). **])
 fi
 
+AC_PATH_PROG([GLIB_COMPILE_RESOURCES],[glib-compile-resources])
+AS_IF([test "$GLIB_COMPILE_RESOURCES" == ""],[
+       	AC_MSG_ERROR([glib-compile-resources not found])
+       	])
+
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h limits.h malloc.h unistd.h)
@@ -485,10 +490,10 @@ fi
 
 AC_SUBST(DEPRECATED_FLAGS)
 
-if test "$enable_suidroot" = "no"; then
-	OPTION_SUIDROOT="no"
-else
+if test "$enable_suidroot" = "yes"; then
 	OPTION_SUIDROOT="yes"
+else
+	OPTION_SUIDROOT="no"
 fi
 
 AM_CONDITIONAL([SUIDROOT], [ test x$OPTION_SUIDROOT = xyes])
@@ -659,3 +664,8 @@ echo "capabilities support: $OPTION_CAP"
 echo "install setuid-root: $OPTION_SUIDROOT"
 echo
 echo You can now run \'make\' to compile terminatorX
+
+if test "$OPTION_SUIDROOT" = "yes"; then
+    echo As setuid-root is enabled, \'make install\' must be run with root privileges.
+fi
+