summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2005-06-05 03:29:33 +0000
committerAlan Coopersmith <alan.coopersmith@sun.com>2005-06-05 03:29:33 +0000
commit44538f9940f969d46c0e5e4b201c684cde2ba611 (patch)
tree755a87dcf91bd077ea838d3ecb2bf489923c48a8
parent588e30e9ec65fa6205a34be650b79d5e2243edec (diff)
Port Imake flags to autoconf tests & --enable-* flags: HASSETUGID, HASGETRESUID, NO_XLOCALEDIR, HAS_SHM and XF86BIGFONT
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac32
2 files changed, 40 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c5c9ef20..bbf444d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
2005-06-04 Alan Coopersmith <alan.coopersmith@sun.com>
* configure.ac:
+ Port Imake flags to autoconf tests & --enable-* flags:
+ HASSETUGID, HASGETRESUID, NO_XLOCALEDIR,
+ HAS_SHM and XF86BIGFONT
+
+2005-06-04 Alan Coopersmith <alan.coopersmith@sun.com>
+
+ * configure.ac:
Add --enable-secure-rpc flag and checks for needed functions for
Secure RPC ("SUN-DES-1") authentication method
+
2005-05-27 Matthieu Herrb <matthieu.herrb@laas.fr>
diff --git a/configure.ac b/configure.ac
index 8ee999f4..40f2778f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,6 +87,14 @@ dnl AC_CHECK_HEADERS([stdio.h stdlib.h math.h])
# Checks for library functions.
AC_CHECK_FUNCS([strtol])
+# Used in lcFile.c (see also --enable-xlocaledir settings below)
+XLOCALEDIR_IS_SAFE="no"
+AC_CHECK_FUNC([issetugid], [XLOCALEDIR_IS_SAFE="yes"]
+ AC_DEFINE(HASSETUGID,1,[Has issetugid() function]))
+AC_CHECK_FUNC([getresuid], [XLOCALEDIR_IS_SAFE="yes"]
+ AC_DEFINE(HASGETRESUID,1,[Has getresuid() & getresgid() functions]))
+# Used in Font.c
+AC_CHECK_FUNC([shmat], AC_DEFINE(HAS_SHM,1,[Has shm*() functions]))
# Checks for system services
dnl AC_PATH_XTRA
@@ -173,6 +181,30 @@ AC_ARG_ENABLE(xlocale,
[Disable Xlib locale implementation *EXPERIMENTAL*]),
[XLOCALE=$enableval],[XLOCALE=yes])
+# This disables XLOCALEDIR. Set it if you're using BuildLoadableXlibI18n,
+# don't have either issetugid() or getresuid(), and you need to protect
+# clients that are setgid or setuid to an id other than 0.
+AC_MSG_CHECKING([if XLOCALEDIR support should be enabled])
+AC_ARG_ENABLE(xlocaledir,
+ AC_HELP_STRING([--enable-xlocaledir],
+ [Enable XLOCALEDIR environment variable support]),
+ [XLOCALEDIR=$enableval],[XLOCALEDIR=$XLOCALEDIR_IS_SAFE])
+if test "x$XLOCALEDIR" == "xno"; then
+ AC_DEFINE(NO_XLOCALEDIR,1,[Disable XLOCALEDIR environment variable])
+fi
+AC_MSG_RESULT($XLOCALEDIR)
+
+AC_MSG_CHECKING([if XF86BigFont support should be enabled])
+AC_ARG_ENABLE(xf86bigfont,
+ AC_HELP_STRING([--disable-xf86bigfont],
+ [Disable XF86BigFont extension support]),
+ [XF86BIGFONT=$enableval],[XF86BIGFONT="yes"])
+if test "x$XF86BIGFONT" == "xyes"; then
+ AC_DEFINE(XF86BIGFONT,1,[Enable XF86BIGFONT extension])
+fi
+AC_MSG_RESULT($XF86BIGFONT)
+
+
AC_ARG_ENABLE(xkb,
AC_HELP_STRING([--disable-xkb],
[Disable XKB support *EXPERIMENTAL*]),