diff --git a/ChangeLog b/ChangeLog index 8a5f9730..c4b5b9a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-03-02 Richard Frith-Macdonald + + * GNUstep.sh.in: Don't define GNUSTEP_DEFAULTS_ROOT + * GNUstep.csh.in: Don't define GNUSTEP_DEFAULTS_ROOT + * configure.in: Remove some unused stuff and improve log + messages for forcing defaults and user roots. + 2002-03-01 Richard Frith-Macdonald * user_home.c: Parse .GNUsteprc in configured GNUSTEP_SYSTEM_ROOT diff --git a/GNUstep.csh.in b/GNUstep.csh.in index 269d8f9d..a6c8a400 100755 --- a/GNUstep.csh.in +++ b/GNUstep.csh.in @@ -64,7 +64,6 @@ if ( ! ${?GNUSTEP_HOST_OS} ) then setenv GNUSTEP_HOST_OS `${GNUSTEP_MAKEFILES}/clean_os.sh ${GNUSTEP_HOST_OS}` endif -setenv GNUSTEP_DEFAULTS_ROOT `${GNUSTEP_MAKEFILES}/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/user_home defaults` setenv GNUSTEP_USER_ROOT `${GNUSTEP_MAKEFILES}/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/user_home user` # diff --git a/GNUstep.sh.in b/GNUstep.sh.in index 8dbad604..76127eea 100755 --- a/GNUstep.sh.in +++ b/GNUstep.sh.in @@ -80,11 +80,10 @@ fi export GNUSTEP_HOST GNUSTEP_HOST_CPU GNUSTEP_HOST_VENDOR GNUSTEP_HOST_OS # -# Ask the user_home tool for the root paths. +# Ask the user_home tool for the root path. # -GNUSTEP_DEFAULTS_ROOT=`$GNUSTEP_MAKEFILES/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/user_home defaults` GNUSTEP_USER_ROOT=`$GNUSTEP_MAKEFILES/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/user_home user` -export GNUSTEP_DEFAULTS_ROOT GNUSTEP_USER_ROOT +export GNUSTEP_USER_ROOT # # Add the GNUstep tools directories to the path diff --git a/configure b/configure index b8f6f86c..ca2355a9 100755 --- a/configure +++ b/configure @@ -49,7 +49,7 @@ to force all users to share the same GNUSTEP_USER_ROOT directory. Example: ac_help="$ac_help --with-defaults-root Set the GNUSTEP_DEFAULTS_ROOT directory. Use this option if you want -to force all users to share common default. Example: +to force all users to share common defaults. Example: --with-defaults-root=/CommonDefaults " ac_help="$ac_help @@ -1637,44 +1637,32 @@ fi echo "$ac_t""$GNUSTEP_NETWORK_ROOT" 1>&6 -echo $ac_n "checking for GNUSTEP_USER_ROOT to use""... $ac_c" 1>&6 -echo "configure:1642: checking for GNUSTEP_USER_ROOT to use" >&5 +echo $ac_n "checking for GNUSTEP_USER_ROOT to be forced for all users""... $ac_c" 1>&6 +echo "configure:1642: checking for GNUSTEP_USER_ROOT to be forced for all users" >&5 # Check whether --with-user-root or --without-user-root was given. if test "${with_user_root+set}" = set; then withval="$with_user_root" FORCE_USER_ROOT="-DFORCE_USER_ROOT=$withval" -GNUSTEP_USER_ROOT="$withval" else 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' -else - GNUSTEP_USER_ROOT='$HOME/GNUstep' -fi fi +echo "$ac_t""$FORCE_USER_ROOT" 1>&6 -echo "$ac_t""$GNUSTEP_USER_ROOT" 1>&6 -echo $ac_n "checking for GNUSTEP_DEFAULTS_ROOT to use""... $ac_c" 1>&6 -echo "configure:1664: checking for GNUSTEP_DEFAULTS_ROOT to use" >&5 +echo $ac_n "checking for GNUSTEP_DEFAULTS_ROOT to be forced for all users""... $ac_c" 1>&6 +echo "configure:1656: checking for GNUSTEP_DEFAULTS_ROOT to be forced for all users" >&5 # Check whether --with-defaults-root or --without-defaults-root was given. if test "${with_defaults_root+set}" = set; then withval="$with_defaults_root" FORCE_DEFAULTS_ROOT="-DFORCE_DEFAULTS_ROOT=$withval" -GNUSTEP_DEFAULTS_ROOT="$withval" else FORCE_DEFAULTS_ROOT="" -GNUSTEP_DEFAULTS_ROOT="" fi - -echo "$ac_t""$GNUSTEP_DEFAULTS_ROOT" 1>&6 - +echo "$ac_t""$FORCE_DEFAULTS_ROOT" 1>&6 @@ -1751,7 +1739,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:1755: checking for shared objc library" >&5 +echo "configure:1743: 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 @@ -1790,12 +1778,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:1794: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1782: 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> @@ -1803,7 +1791,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1828,7 +1816,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:1832: checking for opendir in -ldir" >&5 +echo "configure:1820: 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 @@ -1836,7 +1824,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:1839: \"$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 @@ -1869,7 +1857,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1873: checking for opendir in -lx" >&5 +echo "configure:1861: 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 @@ -1877,7 +1865,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:1880: \"$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 @@ -1914,17 +1902,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:1918: checking for $ac_hdr" >&5 +echo "configure:1906: 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:1928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1916: \"$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* @@ -1953,12 +1941,12 @@ done for ac_func in getpwnam getpwuid geteuid getlogin do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1957: checking for $ac_func" >&5 +echo "configure:1945: 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:1973: \"$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 @@ -2022,7 +2010,7 @@ fi echo $ac_n "checking whether objc has thread support""... $ac_c" 1>&6 -echo "configure:2026: checking whether objc has thread support" >&5 +echo "configure:2014: checking whether objc has thread support" >&5 extra_LIBS="" case "${target_os}" in solaris*) @@ -2041,11 +2029,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:2037: \"$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 @@ -2063,11 +2051,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:2059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lpthread" else @@ -2085,11 +2073,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:2081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-pthread" else @@ -2107,11 +2095,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:2103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lpthread" else @@ -2130,11 +2118,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:2126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lpcthread" else @@ -2154,11 +2142,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:2150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="works" else @@ -2176,11 +2164,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:2172: \"$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 @@ -2212,7 +2200,7 @@ ac_cv_objc_threaded="$objc_threaded" #-------------------------------------------------------------------- echo $ac_n "checking if the compiler supports autodependencies""... $ac_c" 1>&6 -echo "configure:2216: checking if the compiler supports autodependencies" >&5 +echo "configure:2204: checking if the compiler supports autodependencies" >&5 # What we want to do: set AUTO_DEPENDENCIES to yes if gcc => 3.x @@ -2246,7 +2234,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:2250: checking whether to disable compiler warnings about deprecated import" >&5 +echo "configure:2238: checking whether to disable compiler warnings about deprecated import" >&5 # # GCC recommends that you use `--disable-import' here, since #import @@ -2272,7 +2260,7 @@ fi # Record the version #-------------------------------------------------------------------- echo $ac_n "checking for the version of gnustep-make we are compiling""... $ac_c" 1>&6 -echo "configure:2276: checking for the version of gnustep-make we are compiling" >&5 +echo "configure:2264: checking for the version of gnustep-make we are compiling" >&5 . "$srcdir/Version" echo "$ac_t""$GNUSTEP_MAKE_VERSION" 1>&6 @@ -2454,8 +2442,6 @@ 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 -s%@GNUSTEP_DEFAULTS_ROOT@%$GNUSTEP_DEFAULTS_ROOT%g s%@GNUSTEP_FLATTENED@%$GNUSTEP_FLATTENED%g s%@BACKEND_BUNDLE@%$BACKEND_BUNDLE%g s%@FORCE_CPPFLAGS@%$FORCE_CPPFLAGS%g diff --git a/configure.in b/configure.in index daeeca8e..8aa7dca0 100644 --- a/configure.in +++ b/configure.in @@ -195,46 +195,34 @@ GNUSTEP_NETWORK_ROOT="$GNUSTEP_ROOT/Network" ) AC_MSG_RESULT($GNUSTEP_NETWORK_ROOT) -AC_MSG_CHECKING(for GNUSTEP_USER_ROOT to use) +AC_MSG_CHECKING(for GNUSTEP_USER_ROOT to be forced for all users) AC_ARG_WITH(user-root, [--with-user-root Set the GNUSTEP_USER_ROOT directory. Use this option if you want to force all users to share the same GNUSTEP_USER_ROOT directory. Example: --with-user-root=/CommonHome/GNUstep ], -FORCE_USER_ROOT="-DFORCE_USER_ROOT=$withval" -GNUSTEP_USER_ROOT="$withval", +FORCE_USER_ROOT="-DFORCE_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 - GNUSTEP_USER_ROOT='$HOMEDRIVE/$HOMEPATH/GNUstep' -else - GNUSTEP_USER_ROOT='$HOME/GNUstep' -fi ) +AC_MSG_RESULT($FORCE_USER_ROOT) AC_SUBST(FORCE_USER_ROOT) -AC_MSG_RESULT($GNUSTEP_USER_ROOT) -AC_MSG_CHECKING(for GNUSTEP_DEFAULTS_ROOT to use) +AC_MSG_CHECKING(for GNUSTEP_DEFAULTS_ROOT to be forced for all users) AC_ARG_WITH(defaults-root, [--with-defaults-root Set the GNUSTEP_DEFAULTS_ROOT directory. Use this option if you want -to force all users to share common default. Example: +to force all users to share common defaults. Example: --with-defaults-root=/CommonDefaults ], -FORCE_DEFAULTS_ROOT="-DFORCE_DEFAULTS_ROOT=$withval" -GNUSTEP_DEFAULTS_ROOT="$withval", +FORCE_DEFAULTS_ROOT="-DFORCE_DEFAULTS_ROOT=$withval", FORCE_DEFAULTS_ROOT="" -GNUSTEP_DEFAULTS_ROOT="" ) +AC_MSG_RESULT($FORCE_DEFAULTS_ROOT) AC_SUBST(FORCE_DEFAULTS_ROOT) -AC_MSG_RESULT($GNUSTEP_DEFAULTS_ROOT) AC_SUBST(GNUSTEP_LOCAL_ROOT) AC_SUBST(GNUSTEP_NETWORK_ROOT) -AC_SUBST(GNUSTEP_USER_ROOT) -AC_SUBST(GNUSTEP_DEFAULTS_ROOT) #-------------------------------------------------------------------- # Is the system flattened?