From 9583f91bd4fb13c04bde6a6fb4d626481cd901fb Mon Sep 17 00:00:00 2001 From: Richard Frith-Macdonald Date: Thu, 28 Feb 2002 19:52:12 +0000 Subject: [PATCH] Pass configure time information about forced user and defaults paths to the code we build. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12906 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 ++++ common.make | 3 +- config.make.in | 4 +++ configure | 86 +++++++++++++++++++++++++++----------------------- configure.in | 6 ++++ 5 files changed, 66 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b027dd4..36f703cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-02-28 Richard Frith-Macdonald + + * configure.in: setup variables to force particular paths for user + and defaults roots. + * config.make.in: pass configured forced paths on to build process + * common.make: use path forcing. + Thu Feb 28 18:27:05 2002 Nicola Pero * Master/rules.make (PRINCIPAL_CLASS): Do not pass down diff --git a/common.make b/common.make index 86b017c7..7a57e4f8 100644 --- a/common.make +++ b/common.make @@ -373,7 +373,8 @@ endif AUXILIARY_CPPFLAGS += $(GNUSTEP_DEFINE) \ $(FND_DEFINE) $(GUI_DEFINE) $(BACKEND_DEFINE) \ - $(RUNTIME_DEFINE) $(FOUNDATION_LIBRARY_DEFINE) + $(RUNTIME_DEFINE) $(FOUNDATION_LIBRARY_DEFINE) \ + $(FORCE_DEFAULTS_ROOT) $(FORCE_USER_ROOT) INTERNAL_OBJCFLAGS += $(ADDITIONAL_FLAGS) $(OPTFLAG) $(OBJCFLAGS) \ $(RUNTIME_FLAG) diff --git a/config.make.in b/config.make.in index 20e8c41a..c0fe1f67 100644 --- a/config.make.in +++ b/config.make.in @@ -73,6 +73,10 @@ default_library_combo = @ac_cv_library_combo@ # Backend bundle BACKEND_BUNDLE=@BACKEND_BUNDLE@ +FORCE_DEFAULTS_ROOT=@FORCE_DEFAULTS_ROOT@ + +FORCE_USER_ROOT=@FORCE_USER_ROOT@ + # # Do threading stuff. # diff --git a/configure b/configure index b127b156..d63f2fbb 100755 --- a/configure +++ b/configure @@ -1641,9 +1641,11 @@ echo "configure:1641: checking for GNUSTEP_USER_ROOT to use" >&5 # Check whether --with-user-root or --without-user-root was given. if test "${with_user_root+set}" = set; then withval="$with_user_root" - GNUSTEP_USER_ROOT="$withval" + FORCE_USER_ROOT="-DFORCE_USER_ROOT=$withval" +GNUSTEP_USER_ROOT="$withval" else - if test ! -z "$WINDIR"; then + FORCE_USER_ROOT="" +if test ! -z "$WINDIR"; then # Any \ is turned into a / inside GNUstep.sh. We can't do it here # because HOMEDRIVE and HOMEPATH are only expanded inside GNUstep.sh GNUSTEP_USER_ROOT='$HOMEDRIVE/$HOMEPATH/GNUstep' @@ -1653,19 +1655,23 @@ fi fi + echo "$ac_t""$GNUSTEP_USER_ROOT" 1>&6 echo $ac_n "checking for GNUSTEP_DEFAULTS_ROOT to use""... $ac_c" 1>&6 -echo "configure:1660: checking for GNUSTEP_DEFAULTS_ROOT to use" >&5 +echo "configure:1663: checking for GNUSTEP_DEFAULTS_ROOT to use" >&5 # Check whether --with-defaults-root or --without-defaults-root was given. if test "${with_defaults_root+set}" = set; then withval="$with_defaults_root" - GNUSTEP_DEFAULTS_ROOT="$withval" + FORCE_DEFAULTS_ROOT="-DFORCE_DEFAULTS_ROOT=$withval" +GNUSTEP_DEFAULTS_ROOT="$withval" else - GNUSTEP_DEFAULTS_ROOT="" + FORCE_DEFAULTS_ROOT="" +GNUSTEP_DEFAULTS_ROOT="" fi + echo "$ac_t""$GNUSTEP_DEFAULTS_ROOT" 1>&6 @@ -1744,7 +1750,7 @@ fi # If so, there are probably other libraries that we want there also, so # leave the proper includes in CPPFLAGS and LDFLAGS echo $ac_n "checking for shared objc library""... $ac_c" 1>&6 -echo "configure:1748: checking for shared objc library" >&5 +echo "configure:1754: checking for shared objc library" >&5 if eval "test \"`echo '$''{'gs_cv_objc_libdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1783,12 +1789,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1787: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1793: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1796,7 +1802,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1821,7 +1827,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1825: checking for opendir in -ldir" >&5 +echo "configure:1831: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1829,7 +1835,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1862,7 +1868,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1866: checking for opendir in -lx" >&5 +echo "configure:1872: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1870,7 +1876,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1907,17 +1913,17 @@ for ac_hdr in sys/param.h sys/file.h dir.h string.h stdlib.h sys/types.h sys/s do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1911: checking for $ac_hdr" >&5 +echo "configure:1917: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1946,12 +1952,12 @@ done for ac_func in getpwnam getpwuid geteuid getlogin do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1950: checking for $ac_func" >&5 +echo "configure:1956: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2015,7 +2021,7 @@ fi echo $ac_n "checking whether objc has thread support""... $ac_c" 1>&6 -echo "configure:2019: checking whether objc has thread support" >&5 +echo "configure:2025: checking whether objc has thread support" >&5 extra_LIBS="" case "${target_os}" in solaris*) @@ -2034,11 +2040,11 @@ if test "$OBJC_THREAD" != ""; then objc_threaded="" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="$OBJC_THREAD $extra_LIBS" else @@ -2056,11 +2062,11 @@ elif test "$host_os" = linux-gnu; then objc_threaded="-lpthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lpthread" else @@ -2078,11 +2084,11 @@ elif test "`echo $host_os|sed 's/[0-9].*//'|sed s/elf//`" = freebsd; then objc_threaded="-pthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-pthread" else @@ -2100,11 +2106,11 @@ fi objc_threaded="-lpthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lpthread" else @@ -2123,11 +2129,11 @@ fi objc_threaded="-lpcthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lpcthread" else @@ -2147,11 +2153,11 @@ elif test "$MINGW32" = yes; then objc_threaded="works" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="works" else @@ -2169,11 +2175,11 @@ else objc_threaded="" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lthread $extra_LIBS" else @@ -2205,7 +2211,7 @@ ac_cv_objc_threaded="$objc_threaded" #-------------------------------------------------------------------- echo $ac_n "checking if the compiler supports autodependencies""... $ac_c" 1>&6 -echo "configure:2209: checking if the compiler supports autodependencies" >&5 +echo "configure:2215: checking if the compiler supports autodependencies" >&5 # What we want to do: set AUTO_DEPENDENCIES to yes if gcc => 3.x @@ -2239,7 +2245,7 @@ fi # Enable/disable warnings for deprecated #import directive as required #--------------------------------------------------------------------- echo $ac_n "checking whether to disable compiler warnings about deprecated import""... $ac_c" 1>&6 -echo "configure:2243: checking whether to disable compiler warnings about deprecated import" >&5 +echo "configure:2249: checking whether to disable compiler warnings about deprecated import" >&5 # # GCC recommends that you use `--disable-import' here, since #import @@ -2265,7 +2271,7 @@ fi # Record the version #-------------------------------------------------------------------- echo $ac_n "checking for the version of gnustep-make we are compiling""... $ac_c" 1>&6 -echo "configure:2269: checking for the version of gnustep-make we are compiling" >&5 +echo "configure:2275: checking for the version of gnustep-make we are compiling" >&5 . "$srcdir/Version" echo "$ac_t""$GNUSTEP_MAKE_VERSION" 1>&6 @@ -2443,6 +2449,8 @@ s%@TAR@%$TAR%g s%@CHOWN@%$CHOWN%g s%@GNUSTEP_ROOT@%$GNUSTEP_ROOT%g s%@root_prefix@%$root_prefix%g +s%@FORCE_USER_ROOT@%$FORCE_USER_ROOT%g +s%@FORCE_DEFAULTS_ROOT@%$FORCE_DEFAULTS_ROOT%g s%@GNUSTEP_LOCAL_ROOT@%$GNUSTEP_LOCAL_ROOT%g s%@GNUSTEP_NETWORK_ROOT@%$GNUSTEP_NETWORK_ROOT%g s%@GNUSTEP_USER_ROOT@%$GNUSTEP_USER_ROOT%g diff --git a/configure.in b/configure.in index 41c2a6a5..0ef55e1e 100644 --- a/configure.in +++ b/configure.in @@ -201,7 +201,9 @@ AC_ARG_WITH(user-root, to have the GNUSTEP_USER_ROOT directory in a non-standard place. Example: --with-user-root=/MyHome/local/GNUstep ], +FORCE_USER_ROOT="-DFORCE_USER_ROOT=$withval" GNUSTEP_USER_ROOT="$withval", +FORCE_USER_ROOT="" if test ! -z "$WINDIR"; then # Any \ is turned into a / inside GNUstep.sh. We can't do it here # because HOMEDRIVE and HOMEPATH are only expanded inside GNUstep.sh @@ -210,6 +212,7 @@ else GNUSTEP_USER_ROOT='$HOME/GNUstep' fi ) +AC_SUBST(FORCE_USER_ROOT) AC_MSG_RESULT($GNUSTEP_USER_ROOT) AC_MSG_CHECKING(for GNUSTEP_DEFAULTS_ROOT to use) @@ -219,9 +222,12 @@ AC_ARG_WITH(defaults-root, to have the GNUSTEP_DEFAULTS_ROOT directory in a non-standard place. Example: --with-defaults-root=$HOME ], +FORCE_DEFAULTS_ROOT="-DFORCE_DEFAULTS_ROOT=$withval" GNUSTEP_DEFAULTS_ROOT="$withval", +FORCE_DEFAULTS_ROOT="" GNUSTEP_DEFAULTS_ROOT="" ) +AC_SUBST(FORCE_DEFAULTS_ROOT) AC_MSG_RESULT($GNUSTEP_DEFAULTS_ROOT) AC_SUBST(GNUSTEP_LOCAL_ROOT)