diff options
author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-12-08 21:00:11 -0800 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-12-08 21:00:11 -0800 |
commit | fd459e96581a883e30323c840b71004aa0747169 (patch) | |
tree | 07317db9b27a9ed5d945f46c2dfb6fce512f8d7e /configure.ac | |
parent | 894d8d534f9aadca8837ed848fa9c1377f9baa12 (diff) |
XQuartz: unsetenv(DISPLAY) if we're not org.x.X11
Also some prefix related fixes.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 32ccf0c62..6ce1dcdec 100644 --- a/configure.ac +++ b/configure.ac @@ -64,6 +64,7 @@ AC_PROG_LEX AC_PROG_YACC AC_SYS_LARGEFILE XORG_PROG_RAWCPP +AC_PATH_PROG(SED,sed) dnl Check for dtrace program (needed to build Xserver dtrace probes) dnl Also checks for <sys/sdt.h>, since some Linux distros have an @@ -470,6 +471,14 @@ AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir [ APPLE_APPLICATIONS_DIR="${withval}" ], [ APPLE_APPLICATIONS_DIR="/Applications/Utilities" ]) AC_SUBST([APPLE_APPLICATIONS_DIR]) +AC_ARG_WITH(apple-application-name,AS_HELP_STRING([--with-apple-application-name=NAME], [Name for the .app (default: X11)]), + [ APPLE_APPLICATION_NAME="${withval}" ], + [ APPLE_APPLICATION_NAME="X11" ]) +AC_SUBST([APPLE_APPLICATION_NAME]) +AC_ARG_WITH(apple-application-id,AS_HELP_STRING([--with-apple-application-id=VALUE], [CFBundleIdentification for the .app (default: org.x.X11)]), + [ APPLE_APPLICATION_ID="${withval}" ], + [ APPLE_APPLICATION_ID="org.x.X11" ]) +AC_SUBST([APPLE_APPLICATION_ID]) AC_ARG_ENABLE(builddocs, AS_HELP_STRING([--enable-builddocs], [Build docs (default: disabled)]), [BUILDDOCS=$enableval], [BUILDDOCS=no]) |