diff options
Diffstat (limited to 'xserver/configure')
| -rw-r--r-- | xserver/configure | 84 |
1 files changed, 58 insertions, 26 deletions
diff --git a/xserver/configure b/xserver/configure index c47fc38cd..18db82994 100644 --- a/xserver/configure +++ b/xserver/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xorg-server 1.18.3. +# Generated by GNU Autoconf 2.69 for xorg-server 1.18.4. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -651,8 +651,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xorg-server' PACKAGE_TARNAME='xorg-server' -PACKAGE_VERSION='1.18.3' -PACKAGE_STRING='xorg-server 1.18.3' +PACKAGE_VERSION='1.18.4' +PACKAGE_STRING='xorg-server 1.18.4' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1049,7 +1049,10 @@ INSTALL_SETUID_FALSE INSTALL_SETUID_TRUE X_PRIVSEP_FALSE X_PRIVSEP_TRUE +XQUARTZ_SPARKLE_FEED_URL XQUARTZ_SPARKLE +BUNDLE_VERSION_STRING +BUNDLE_VERSION BUNDLE_ID_PREFIX APPLE_APPLICATION_NAME APPLE_APPLICATIONS_DIR @@ -1333,9 +1336,11 @@ with_default_xkb_options with_serverconfig_path with_apple_applications_dir with_apple_application_name -with_launchd_id_prefix with_bundle_id_prefix +with_bundle_version +with_bundle_version_string enable_sparkle +with_sparkle_feed_url enable_visibility enable_aiglx with_khronos_spec_dir @@ -2050,7 +2055,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorg-server 1.18.3 to adapt to many kinds of systems. +\`configure' configures xorg-server 1.18.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2120,7 +2125,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-server 1.18.3:";; + short | recursive ) echo "Configuration of xorg-server 1.18.4:";; esac cat <<\_ACEOF @@ -2310,11 +2315,18 @@ Optional Packages: /Applications/Utilities) --with-apple-application-name=NAME Name for the .app (default: X11) - --with-launchd-id-prefix=PATH - Deprecated: Use --with-bundle-id-prefix. - --with-bundle-id-prefix=PATH + --with-bundle-id-prefix=RDNS_PREFIX Prefix to use for bundle identifiers (default: org.x) + --with-bundle-version=VERSION + Version to use for X11.app's CFBundleVersion + (default: 1.18.4) + --with-bundle-version-string=VERSION + Version to use for X11.app's + CFBundleShortVersionString (default: 1.18.4) + --with-sparkle-feed-url=URL + URL for the Sparkle feed (default: + https://www.xquartz.org/releases/sparkle/release.xml) --with-khronos-spec-dir=PATH Path to Khronos OpenGL registry database files (default: auto) @@ -2562,7 +2574,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-server configure 1.18.3 +xorg-server configure 1.18.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3271,7 +3283,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorg-server $as_me 1.18.3, which was +It was created by xorg-server $as_me 1.18.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3619,8 +3631,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -RELEASE_DATE="2016-04-04" -RELEASE_NAME="Halloumi" +RELEASE_DATE="2016-07-19" +RELEASE_NAME="Skordalia" am__api_version='1.12' @@ -4099,7 +4111,7 @@ fi # Define the identity of the package. PACKAGE='xorg-server' - VERSION='1.18.3' + VERSION='1.18.4' cat >>confdefs.h <<_ACEOF @@ -22995,14 +23007,6 @@ fi -# Check whether --with-launchd-id-prefix was given. -if test "${with_launchd_id_prefix+set}" = set; then : - withval=$with_launchd_id_prefix; BUNDLE_ID_PREFIX="${withval}" -else - BUNDLE_ID_PREFIX="org.x" -fi - - # Check whether --with-bundle-id-prefix was given. if test "${with_bundle_id_prefix+set}" = set; then : withval=$with_bundle_id_prefix; BUNDLE_ID_PREFIX="${withval}" @@ -23014,6 +23018,25 @@ cat >>confdefs.h <<_ACEOF #define BUNDLE_ID_PREFIX "$BUNDLE_ID_PREFIX" _ACEOF + + +# Check whether --with-bundle-version was given. +if test "${with_bundle_version+set}" = set; then : + withval=$with_bundle_version; BUNDLE_VERSION="${withval}" +else + BUNDLE_VERSION="1.18.4" +fi + + + +# Check whether --with-bundle-version-string was given. +if test "${with_bundle_version_string+set}" = set; then : + withval=$with_bundle_version_string; BUNDLE_VERSION_STRING="${withval}" +else + BUNDLE_VERSION_STRING="${PACKAGE_VERSION}" +fi + + # Check whether --enable-sparkle was given. if test "${enable_sparkle+set}" = set; then : enableval=$enable_sparkle; XQUARTZ_SPARKLE="${enableval}" @@ -23022,6 +23045,15 @@ else fi + +# Check whether --with-sparkle-feed-url was given. +if test "${with_sparkle_feed_url+set}" = set; then : + withval=$with_sparkle_feed_url; XQUARTZ_SPARKLE_FEED_URL="${withval}" +else + XQUARTZ_SPARKLE_FEED_URL="https://www.xquartz.org/releases/sparkle/release.xml" +fi + + # Check whether --enable-visibility was given. if test "${enable_visibility+set}" = set; then : enableval=$enable_visibility; SYMBOL_VISIBILITY=$enableval @@ -24558,7 +24590,7 @@ $as_echo "#define CONFIG_UDEV_KMS 1" >>confdefs.h fi SAVE_LIBS=$LIBS SAVE_CFLAGS=$CFLAGS - CFLAGS=$UDEV_CFLAGS + CFLAGS="$CFLAGS $UDEV_CFLAGS" LIBS=$UDEV_LIBS for ac_func in udev_monitor_filter_add_match_tag do : @@ -25746,7 +25778,7 @@ fi if test "x$DRI2" = xyes; then save_CFLAGS=$CFLAGS - CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS" + CFLAGS="$CFLAGS $GL_CFLAGS $LIBDRM_CFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <GL/gl.h> @@ -32473,7 +32505,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorg-server $as_me 1.18.3, which was +This file was extended by xorg-server $as_me 1.18.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -32539,7 +32571,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xorg-server config.status 1.18.3 +xorg-server config.status 1.18.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" |