diff --git a/Makefile b/Makefile index e74d28522d..13096b81be 100644 --- a/Makefile +++ b/Makefile @@ -228,7 +228,7 @@ win32-remove-setup-dlls: IF EXIST racket\lib\ssleay32.dll cmd /c del racket\lib\ssleay32.dll SRC_MAKEFILE_CONFIG = configure -CONFIG_IN_PLACE_ARGS = --enable-origtree +CONFIG_IN_PLACE_ARGS = --disable-useprefix --enable-origtree racket/src/build/Makefile: racket/src/$(SRC_MAKEFILE_CONFIG) racket/src/Makefile.in mkdir -p racket/src/build diff --git a/racket/src/ac/path.m4 b/racket/src/ac/path.m4 index fd6db8a282..d1669a43a3 100644 --- a/racket/src/ac/path.m4 +++ b/racket/src/ac/path.m4 @@ -1,6 +1,6 @@ unixstyle=no -if test "${enable_origtree}" != "yes" ; then +if test "${enable_useprefix}" = "yes" -a "${prefix}" != "NONE" ; then if test "${prefix}" != "NONE" ; then unixstyle=yes fi @@ -50,7 +50,7 @@ fi MAKE_COPYTREE=no if test "${unixstyle}" = "no" ; then - if test "${prefix}" = "NONE" ; then + if test "${enable_useprefix}" = "no" -o "${prefix}" = "NONE" ; then inplacebuild=yes prefix=`cd "${srcdir}/..${PREFIX_PATH_RELATIVE}" && pwd` else diff --git a/racket/src/ac/path_arg.m4 b/racket/src/ac/path_arg.m4 index 6b7a2ab3b1..5e14ece838 100644 --- a/racket/src/ac/path_arg.m4 +++ b/racket/src/ac/path_arg.m4 @@ -1,5 +1,6 @@ AC_ARG_ENABLE(origtree, [ --enable-origtree install with original directory structure]) +AC_ARG_ENABLE(useprefix, [ --disable-useprefix ignore any --prefix setting]) AC_ARG_ENABLE(pkgscope, [ --enable-pkgscope= set `raco pkg' default: installation, user, or shared]) AC_ARG_ENABLE(docs, [ --enable-docs build docs on install (enabled by default)], , enable_docs=yes) diff --git a/racket/src/cfg-cs b/racket/src/cfg-cs index d0fbe4032a..1b88b4bd6d 100755 --- a/racket/src/cfg-cs +++ b/racket/src/cfg-cs @@ -647,6 +647,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -670,6 +671,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_origtree +enable_useprefix enable_pkgscope enable_docs enable_usersetup @@ -721,6 +723,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -973,6 +976,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1110,7 +1122,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir collectsdir appsdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1287,6 +1299,7 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-origtree install with original directory structure + --disable-useprefix ignore any --prefix setting --enable-pkgscope= set `raco pkg' default: installation, user, or shared --enable-docs build docs on install (enabled by default) --enable-usersetup setup user-specific files on install @@ -1881,6 +1894,11 @@ if test "${enable_origtree+set}" = set; then : enableval=$enable_origtree; fi +# Check whether --enable-useprefix was given. +if test "${enable_useprefix+set}" = set; then : + enableval=$enable_useprefix; +fi + # Check whether --enable-pkgscope was given. if test "${enable_pkgscope+set}" = set; then : enableval=$enable_pkgscope; @@ -2014,7 +2032,7 @@ fi unixstyle=no -if test "${enable_origtree}" != "yes" ; then +if test "${enable_useprefix}" = "yes" -a "${prefix}" != "NONE" ; then if test "${prefix}" != "NONE" ; then unixstyle=yes fi @@ -2064,7 +2082,7 @@ fi MAKE_COPYTREE=no if test "${unixstyle}" = "no" ; then - if test "${prefix}" = "NONE" ; then + if test "${enable_useprefix}" = "no" -o "${prefix}" = "NONE" ; then inplacebuild=yes prefix=`cd "${srcdir}/..${PREFIX_PATH_RELATIVE}" && pwd` else diff --git a/racket/src/cfg-racket b/racket/src/cfg-racket index b3af235ef6..e7d15f9424 100755 --- a/racket/src/cfg-racket +++ b/racket/src/cfg-racket @@ -778,6 +778,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -810,6 +811,7 @@ enable_floatinstead enable_extflonum enable_racket enable_origtree +enable_useprefix enable_pkgscope enable_docs enable_usersetup @@ -891,6 +893,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1143,6 +1146,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1280,7 +1292,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir collectsdir appsdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1466,6 +1478,7 @@ Optional Features: --enable-extflonum support extflonums (enabled by default, if available) --enable-racket= use as Racket to build; or "auto" to create --enable-origtree install with original directory structure + --disable-useprefix ignore any --prefix setting --enable-pkgscope= set `raco pkg' default: installation, user, or shared --enable-docs build docs on install (enabled by default) --enable-usersetup setup user-specific files on install @@ -2672,6 +2685,11 @@ if test "${enable_origtree+set}" = set; then : enableval=$enable_origtree; fi +# Check whether --enable-useprefix was given. +if test "${enable_useprefix+set}" = set; then : + enableval=$enable_useprefix; +fi + # Check whether --enable-pkgscope was given. if test "${enable_pkgscope+set}" = set; then : enableval=$enable_pkgscope; @@ -2986,7 +3004,7 @@ fi unixstyle=no -if test "${enable_origtree}" != "yes" ; then +if test "${enable_useprefix}" = "yes" -a "${prefix}" != "NONE" ; then if test "${prefix}" != "NONE" ; then unixstyle=yes fi @@ -3036,7 +3054,7 @@ fi MAKE_COPYTREE=no if test "${unixstyle}" = "no" ; then - if test "${prefix}" = "NONE" ; then + if test "${enable_useprefix}" = "no" -o "${prefix}" = "NONE" ; then inplacebuild=yes prefix=`cd "${srcdir}/..${PREFIX_PATH_RELATIVE}" && pwd` else diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure index bd20e8b18a..f849916657 100755 --- a/racket/src/cs/c/configure +++ b/racket/src/cs/c/configure @@ -743,6 +743,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -772,6 +773,7 @@ enable_iconv enable_compress enable_compressboot enable_origtree +enable_useprefix enable_pkgscope enable_docs enable_usersetup @@ -842,6 +844,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1094,6 +1097,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1231,7 +1243,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir collectsdir appsdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1414,6 +1426,7 @@ Optional Features: --enable-compress compress compiled code (enabled by default) --enable-compressboot compress boot files --enable-origtree install with original directory structure + --disable-useprefix ignore any --prefix setting --enable-pkgscope= set `raco pkg' default: installation, user, or shared --enable-docs build docs on install (enabled by default) --enable-usersetup setup user-specific files on install @@ -2530,6 +2543,11 @@ if test "${enable_origtree+set}" = set; then : enableval=$enable_origtree; fi +# Check whether --enable-useprefix was given. +if test "${enable_useprefix+set}" = set; then : + enableval=$enable_useprefix; +fi + # Check whether --enable-pkgscope was given. if test "${enable_pkgscope+set}" = set; then : enableval=$enable_pkgscope; @@ -2860,7 +2878,7 @@ PREFIX_PATH_RELATIVE=/../.. unixstyle=no -if test "${enable_origtree}" != "yes" ; then +if test "${enable_useprefix}" = "yes" -a "${prefix}" != "NONE" ; then if test "${prefix}" != "NONE" ; then unixstyle=yes fi @@ -2910,7 +2928,7 @@ fi MAKE_COPYTREE=no if test "${unixstyle}" = "no" ; then - if test "${prefix}" = "NONE" ; then + if test "${enable_useprefix}" = "no" -o "${prefix}" = "NONE" ; then inplacebuild=yes prefix=`cd "${srcdir}/..${PREFIX_PATH_RELATIVE}" && pwd` else diff --git a/racket/src/rktio/configure b/racket/src/rktio/configure index f26d328927..761d2a7e8c 100755 --- a/racket/src/rktio/configure +++ b/racket/src/rktio/configure @@ -675,6 +675,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -750,6 +751,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1002,6 +1004,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1139,7 +1150,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1292,6 +1303,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]