mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Fixes for filesystem layout; implemented GSWebApplications support; print out the entire filesystem layout that is hardcoded into gnustep-base to ease debugging problems
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24771 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
76378a7c6b
commit
376600b494
6 changed files with 466 additions and 66 deletions
19
ChangeLog
19
ChangeLog
|
|
@ -1,3 +1,22 @@
|
|||
2007-03-05 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* configure.ac: Fixed setting default GNUSTEP_*_ADMIN_APPS and
|
||||
GNUSTEP_*_ADMIN_TOOLS when none is found in the config file.
|
||||
* configure.ac: Print out the entire filesystem layout that is
|
||||
hardcoded into gnustep-base. It makes it easier to debug
|
||||
filesystem layout issues.
|
||||
* configure.ac: Read, process and output the new
|
||||
GNUSTEP_*_WEB_APPS variables.
|
||||
* configure.ac: Do not output GNUSTEP_CONFIG_FILE variable which
|
||||
is used nowhere.
|
||||
* configure: Regenerated.
|
||||
* Headers/Additions/GNUstepBase/config.h.in: Added definitions of
|
||||
GNUSTEP_*_WEB_APPS.
|
||||
* Headers/Foundation/NSPathUtilities.h (NSSearchPathDirectory):
|
||||
Added GSWebApplicationsDirectory.
|
||||
* Source/NSPathUtilities.m: Implemented
|
||||
GSWebApplicationsDirectory.
|
||||
|
||||
2007-03-05 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/NSObject.m: Try using atomic increment/decrement to get
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@
|
|||
/* Built in default value for GNUstep local apps */
|
||||
#undef GNUSTEP_TARGET_LOCAL_ADMIN_APPS
|
||||
|
||||
/* Built in default value for GNUstep local web apps */
|
||||
#undef GNUSTEP_TARGET_LOCAL_WEB_APPS
|
||||
|
||||
/* Built in default value for GNUstep local tools */
|
||||
#undef GNUSTEP_TARGET_LOCAL_ADMIN_TOOLS
|
||||
|
||||
|
|
@ -51,6 +54,9 @@
|
|||
/* Built in default value for GNUstep network apps */
|
||||
#undef GNUSTEP_TARGET_NETWORK_ADMIN_APPS
|
||||
|
||||
/* Built in default value for GNUstep network web apps */
|
||||
#undef GNUSTEP_TARGET_NETWORK_WEB_APPS
|
||||
|
||||
/* Built in default value for GNUstep system tools */
|
||||
#undef GNUSTEP_TARGET_NETWORK_ADMIN_TOOLS
|
||||
|
||||
|
|
@ -81,6 +87,9 @@
|
|||
/* Built in default value for GNUstep system apps */
|
||||
#undef GNUSTEP_TARGET_SYSTEM_ADMIN_APPS
|
||||
|
||||
/* Built in default value for GNUstep system web apps */
|
||||
#undef GNUSTEP_TARGET_SYSTEM_WEB_APPS
|
||||
|
||||
/* Built in default value for GNUstep system tools */
|
||||
#undef GNUSTEP_TARGET_SYSTEM_ADMIN_TOOLS
|
||||
|
||||
|
|
@ -120,6 +129,9 @@
|
|||
/* Built in default value for GNUstep user_dir apps */
|
||||
#undef GNUSTEP_TARGET_USER_DIR_ADMIN_APPS
|
||||
|
||||
/* Built in default value for GNUstep user_dir web apps */
|
||||
#undef GNUSTEP_TARGET_USER_DIR_WEB_APPS
|
||||
|
||||
/* Built in default value for GNUstep user_dir tools */
|
||||
#undef GNUSTEP_TARGET_USER_DIR_ADMIN_TOOLS
|
||||
|
||||
|
|
|
|||
|
|
@ -109,9 +109,11 @@ GS_EXPORT NSString *NSHomeDirectoryForUser(NSString *loginName);
|
|||
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
|
||||
/**
|
||||
* Enumeration of possible requested directory type specifiers for
|
||||
* NSSearchPathForDirectoriesInDomains() function. These correspond to the
|
||||
* subdirectories that may be found under, e.g., $GNUSTEP_SYSTEM_ROOT, such
|
||||
* as "Library" and "Applications".
|
||||
* NSSearchPathForDirectoriesInDomains() function. On a traditional
|
||||
* GNUstep filesystem layout these correspond to the subdirectories
|
||||
* that may be found in the various domains, such as "Library"
|
||||
* and "Applications". In a different filesystem layout these
|
||||
* directories might be located anywhere on disk.
|
||||
<example>
|
||||
{
|
||||
NSApplicationDirectory,
|
||||
|
|
@ -132,7 +134,8 @@ GS_EXPORT NSString *NSHomeDirectoryForUser(NSString *loginName);
|
|||
GSLibrariesDirectory,
|
||||
GSToolsDirectory,
|
||||
GSFontsDirectory,
|
||||
GSFrameworksDirectory
|
||||
GSFrameworksDirectory,
|
||||
GSWebApplicationsDirectory
|
||||
}
|
||||
</example>
|
||||
*/
|
||||
|
|
@ -168,7 +171,8 @@ typedef enum
|
|||
GSLibrariesDirectory = 1000, /** libraries (binary code) */
|
||||
GSToolsDirectory, /** non-gui programs */
|
||||
GSFontsDirectory, /** font storage */
|
||||
GSFrameworksDirectory /** frameworks */
|
||||
GSFrameworksDirectory, /** frameworks */
|
||||
GSWebApplicationsDirectory /** web applications (GSWeb or SOPE) */
|
||||
} NSSearchPathDirectory;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -151,6 +151,7 @@ static NSString *gnustepMakefiles = nil;
|
|||
|
||||
static NSString *gnustepSystemApps = nil;
|
||||
static NSString *gnustepSystemAdminApps = nil;
|
||||
static NSString *gnustepSystemWebApps = nil;
|
||||
static NSString *gnustepSystemTools = nil;
|
||||
static NSString *gnustepSystemAdminTools = nil;
|
||||
static NSString *gnustepSystemLibrary = nil;
|
||||
|
|
@ -162,6 +163,7 @@ static NSString *gnustepSystemDocumentationMan = nil;
|
|||
|
||||
static NSString *gnustepNetworkApps = nil;
|
||||
static NSString *gnustepNetworkAdminApps = nil;
|
||||
static NSString *gnustepNetworkWebApps = nil;
|
||||
static NSString *gnustepNetworkTools = nil;
|
||||
static NSString *gnustepNetworkAdminTools = nil;
|
||||
static NSString *gnustepNetworkLibrary = nil;
|
||||
|
|
@ -173,6 +175,7 @@ static NSString *gnustepNetworkDocumentationMan = nil;
|
|||
|
||||
static NSString *gnustepLocalApps = nil;
|
||||
static NSString *gnustepLocalAdminApps = nil;
|
||||
static NSString *gnustepLocalWebApps = nil;
|
||||
static NSString *gnustepLocalTools = nil;
|
||||
static NSString *gnustepLocalAdminTools = nil;
|
||||
static NSString *gnustepLocalLibrary = nil;
|
||||
|
|
@ -184,6 +187,7 @@ static NSString *gnustepLocalDocumentationMan = nil;
|
|||
|
||||
static NSString *gnustepUserApps = nil;
|
||||
static NSString *gnustepUserAdminApps = nil;
|
||||
static NSString *gnustepUserWebApps = nil;
|
||||
static NSString *gnustepUserTools = nil;
|
||||
static NSString *gnustepUserAdminTools = nil;
|
||||
static NSString *gnustepUserLibrary = nil;
|
||||
|
|
@ -199,6 +203,7 @@ static NSString *gnustepUserDocumentationMan = nil;
|
|||
*/
|
||||
static NSString *gnustepUserDirApps = nil;
|
||||
static NSString *gnustepUserDirAdminApps = nil;
|
||||
static NSString *gnustepUserDirWebApps = nil;
|
||||
static NSString *gnustepUserDirTools = nil;
|
||||
static NSString *gnustepUserDirAdminTools = nil;
|
||||
static NSString *gnustepUserDirLibrary = nil;
|
||||
|
|
@ -321,6 +326,7 @@ static void ExtractValuesFromConfig(NSDictionary *config)
|
|||
|
||||
ASSIGN_PATH(gnustepSystemApps, c, @"GNUSTEP_SYSTEM_APPS");
|
||||
ASSIGN_PATH(gnustepSystemAdminApps, c, @"GNUSTEP_SYSTEM_ADMIN_APPS");
|
||||
ASSIGN_PATH(gnustepSystemWebApps, c, @"GNUSTEP_SYSTEM_WEB_APPS");
|
||||
ASSIGN_PATH(gnustepSystemTools, c, @"GNUSTEP_SYSTEM_TOOLS");
|
||||
ASSIGN_PATH(gnustepSystemAdminTools, c, @"GNUSTEP_SYSTEM_ADMIN_TOOLS");
|
||||
ASSIGN_PATH(gnustepSystemLibrary, c, @"GNUSTEP_SYSTEM_LIBRARY");
|
||||
|
|
@ -332,6 +338,7 @@ static void ExtractValuesFromConfig(NSDictionary *config)
|
|||
|
||||
ASSIGN_PATH(gnustepNetworkApps, c, @"GNUSTEP_NETWORK_APPS");
|
||||
ASSIGN_PATH(gnustepNetworkAdminApps, c, @"GNUSTEP_NETWORK_ADMIN_APPS");
|
||||
ASSIGN_PATH(gnustepNetworkWebApps, c, @"GNUSTEP_NETWORK_WEB_APPS");
|
||||
ASSIGN_PATH(gnustepNetworkTools, c, @"GNUSTEP_NETWORK_TOOLS");
|
||||
ASSIGN_PATH(gnustepNetworkAdminTools, c, @"GNUSTEP_NETWORK_ADMIN_TOOLS");
|
||||
ASSIGN_PATH(gnustepNetworkLibrary, c, @"GNUSTEP_NETWORK_LIBRARY");
|
||||
|
|
@ -343,6 +350,7 @@ static void ExtractValuesFromConfig(NSDictionary *config)
|
|||
|
||||
ASSIGN_PATH(gnustepLocalApps, c, @"GNUSTEP_LOCAL_APPS");
|
||||
ASSIGN_PATH(gnustepLocalAdminApps, c, @"GNUSTEP_LOCAL_ADMIN_APPS");
|
||||
ASSIGN_PATH(gnustepLocalWebApps, c, @"GNUSTEP_LOCAL_WEB_APPS");
|
||||
ASSIGN_PATH(gnustepLocalTools, c, @"GNUSTEP_LOCAL_TOOLS");
|
||||
ASSIGN_PATH(gnustepLocalAdminTools, c, @"GNUSTEP_LOCAL_ADMIN_TOOLS");
|
||||
ASSIGN_PATH(gnustepLocalLibrary, c, @"GNUSTEP_LOCAL_LIBRARY");
|
||||
|
|
@ -354,6 +362,7 @@ static void ExtractValuesFromConfig(NSDictionary *config)
|
|||
|
||||
ASSIGN_IF_SET(gnustepUserDirApps, c, @"GNUSTEP_USER_DIR_APPS");
|
||||
ASSIGN_IF_SET(gnustepUserDirAdminApps, c, @"GNUSTEP_USER_DIR_ADMIN_APPS");
|
||||
ASSIGN_IF_SET(gnustepUserDirWebApps, c, @"GNUSTEP_USER_DIR_WEB_APPS");
|
||||
ASSIGN_IF_SET(gnustepUserDirTools, c, @"GNUSTEP_USER_DIR_TOOLS");
|
||||
ASSIGN_IF_SET(gnustepUserDirAdminTools, c, @"GNUSTEP_USER_DIR_ADMIN_TOOLS");
|
||||
ASSIGN_IF_SET(gnustepUserDirLibrary, c, @"GNUSTEP_USER_DIR_LIBRARY");
|
||||
|
|
@ -460,6 +469,9 @@ static void ExtractValuesFromConfig(NSDictionary *config)
|
|||
ASSIGN(gnustepUserAdminApps,
|
||||
[gnustepUserHome stringByAppendingPathComponent: gnustepUserDirAdminApps]);
|
||||
|
||||
ASSIGN(gnustepUserWebApps,
|
||||
[gnustepUserHome stringByAppendingPathComponent: gnustepUserDirWebApps]);
|
||||
|
||||
ASSIGN(gnustepUserTools,
|
||||
[gnustepUserHome stringByAppendingPathComponent: gnustepUserDirTools]);
|
||||
|
||||
|
|
@ -516,6 +528,7 @@ static void ExtractValuesFromConfig(NSDictionary *config)
|
|||
*/
|
||||
ASSIGN_DEFAULT_PATH(gnustepSystemApps, @GNUSTEP_TARGET_SYSTEM_APPS);
|
||||
ASSIGN_DEFAULT_PATH(gnustepSystemAdminApps, @GNUSTEP_TARGET_SYSTEM_ADMIN_APPS);
|
||||
ASSIGN_DEFAULT_PATH(gnustepSystemWebApps, @GNUSTEP_TARGET_SYSTEM_WEB_APPS);
|
||||
ASSIGN_DEFAULT_PATH(gnustepSystemTools, @GNUSTEP_TARGET_SYSTEM_TOOLS);
|
||||
ASSIGN_DEFAULT_PATH(gnustepSystemAdminTools, @GNUSTEP_TARGET_SYSTEM_ADMIN_TOOLS);
|
||||
ASSIGN_DEFAULT_PATH(gnustepSystemLibrary, @GNUSTEP_TARGET_SYSTEM_LIBRARY);
|
||||
|
|
@ -527,6 +540,7 @@ static void ExtractValuesFromConfig(NSDictionary *config)
|
|||
|
||||
ASSIGN_DEFAULT_PATH(gnustepNetworkApps, @GNUSTEP_TARGET_NETWORK_APPS);
|
||||
ASSIGN_DEFAULT_PATH(gnustepNetworkAdminApps, @GNUSTEP_TARGET_NETWORK_ADMIN_APPS);
|
||||
ASSIGN_DEFAULT_PATH(gnustepNetworkWebApps, @GNUSTEP_TARGET_NETWORK_WEB_APPS);
|
||||
ASSIGN_DEFAULT_PATH(gnustepNetworkTools, @GNUSTEP_TARGET_NETWORK_TOOLS);
|
||||
ASSIGN_DEFAULT_PATH(gnustepNetworkAdminTools, @GNUSTEP_TARGET_NETWORK_ADMIN_TOOLS);
|
||||
ASSIGN_DEFAULT_PATH(gnustepNetworkLibrary, @GNUSTEP_TARGET_NETWORK_LIBRARY);
|
||||
|
|
@ -538,6 +552,7 @@ static void ExtractValuesFromConfig(NSDictionary *config)
|
|||
|
||||
ASSIGN_DEFAULT_PATH(gnustepLocalApps, @GNUSTEP_TARGET_LOCAL_APPS);
|
||||
ASSIGN_DEFAULT_PATH(gnustepLocalAdminApps, @GNUSTEP_TARGET_LOCAL_ADMIN_APPS);
|
||||
ASSIGN_DEFAULT_PATH(gnustepLocalWebApps, @GNUSTEP_TARGET_LOCAL_WEB_APPS);
|
||||
ASSIGN_DEFAULT_PATH(gnustepLocalTools, @GNUSTEP_TARGET_LOCAL_TOOLS);
|
||||
ASSIGN_DEFAULT_PATH(gnustepLocalAdminTools, @GNUSTEP_TARGET_LOCAL_ADMIN_TOOLS);
|
||||
ASSIGN_DEFAULT_PATH(gnustepLocalLibrary, @GNUSTEP_TARGET_LOCAL_LIBRARY);
|
||||
|
|
@ -782,6 +797,7 @@ static void ShutdownPathUtilities(void)
|
|||
|
||||
DESTROY(gnustepSystemApps);
|
||||
DESTROY(gnustepSystemAdminApps);
|
||||
DESTROY(gnustepSystemWebApps);
|
||||
DESTROY(gnustepSystemTools);
|
||||
DESTROY(gnustepSystemAdminTools);
|
||||
DESTROY(gnustepSystemLibrary);
|
||||
|
|
@ -793,6 +809,7 @@ static void ShutdownPathUtilities(void)
|
|||
|
||||
DESTROY(gnustepNetworkApps);
|
||||
DESTROY(gnustepNetworkAdminApps);
|
||||
DESTROY(gnustepNetworkWebApps);
|
||||
DESTROY(gnustepNetworkTools);
|
||||
DESTROY(gnustepNetworkAdminTools);
|
||||
DESTROY(gnustepNetworkLibrary);
|
||||
|
|
@ -804,6 +821,7 @@ static void ShutdownPathUtilities(void)
|
|||
|
||||
DESTROY(gnustepLocalApps);
|
||||
DESTROY(gnustepLocalAdminApps);
|
||||
DESTROY(gnustepLocalWebApps);
|
||||
DESTROY(gnustepLocalTools);
|
||||
DESTROY(gnustepLocalAdminTools);
|
||||
DESTROY(gnustepLocalLibrary);
|
||||
|
|
@ -815,6 +833,7 @@ static void ShutdownPathUtilities(void)
|
|||
|
||||
DESTROY(gnustepUserApps);
|
||||
DESTROY(gnustepUserAdminApps);
|
||||
DESTROY(gnustepUserWebApps);
|
||||
DESTROY(gnustepUserTools);
|
||||
DESTROY(gnustepUserAdminTools);
|
||||
DESTROY(gnustepUserLibrary);
|
||||
|
|
@ -1865,6 +1884,15 @@ if (domainMask & mask) \
|
|||
if (part) ADD_PATH(NSSystemDomainMask, gnustepSystemTools, part);
|
||||
}
|
||||
break;
|
||||
|
||||
case GSWebApplicationsDirectory:
|
||||
{
|
||||
ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserWebApps);
|
||||
ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalWebApps);
|
||||
ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkWebApps);
|
||||
ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemWebApps);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
#undef ADD_PATH
|
||||
|
|
|
|||
302
configure
vendored
302
configure
vendored
|
|
@ -310,7 +310,7 @@ ac_includes_default="\
|
|||
#endif"
|
||||
|
||||
ac_subdirs_all="$ac_subdirs_all Source/mframe SSL"
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUSTEP_CONFIG_FILE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP WHOAMI EGREP GS_WORDS_BIGENDIAN GS_SINT8 GS_UINT8 ac_cv_sizeof_short ac_cv_sizeof_int ac_cv_sizeof_long ac_cv_sizeof_long_long ac_cv_sizeof_float ac_cv_sizeof_double ac_cv_sizeof_voidp GS_SADDR GS_UADDR GS_SINT16 GS_UINT16 GS_SINT32 GS_UINT32 GS_SINT64 GS_UINT64 GS_HAVE_I64 GS_SINT128 GS_UINT128 GS_HAVE_I128 GS_FLT32 GS_FLT64 _GSC_S_SHT _GSC_S_INT _GSC_S_LNG _GSC_S_LNG_LNG DYNAMIC_LINKER NX_CONST_STRING_OBJCFLAGS NX_CONST_STRING_CLASS HAVE_PTHREAD_H HAVE_PTS_STREAM_MODULES INCLUDE_STDINT DEFINE_INT8_T DEFINE_UINT8_T DEFINE_INT16_T DEFINE_UINT16_T DEFINE_INT32_T DEFINE_UINT32_T DEFINE_INT64_T DEFINE_UINT64_T DEFINE_INTPTR_T DEFINE_UINTPTR_T USE_ZLIB HAVE_INET_PTON GS_PASS_ARGUMENTS GS_FAKE_MAIN WITH_FFI XML2_CONFIG XML_CONFIG XML_CFLAGS XML_LIBS HAVE_LIBXSLT HAVE_LIBXML HAVE_MDNS USE_GMP INCLUDE_FLAGS LDIR_FLAGS subdirs VERSION MAJOR_VERSION MINOR_VERSION SUBMINOR_VERSION GCC_VERSION LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP WHOAMI EGREP GS_WORDS_BIGENDIAN GS_SINT8 GS_UINT8 ac_cv_sizeof_short ac_cv_sizeof_int ac_cv_sizeof_long ac_cv_sizeof_long_long ac_cv_sizeof_float ac_cv_sizeof_double ac_cv_sizeof_voidp GS_SADDR GS_UADDR GS_SINT16 GS_UINT16 GS_SINT32 GS_UINT32 GS_SINT64 GS_UINT64 GS_HAVE_I64 GS_SINT128 GS_UINT128 GS_HAVE_I128 GS_FLT32 GS_FLT64 _GSC_S_SHT _GSC_S_INT _GSC_S_LNG _GSC_S_LNG_LNG DYNAMIC_LINKER NX_CONST_STRING_OBJCFLAGS NX_CONST_STRING_CLASS HAVE_PTHREAD_H HAVE_PTS_STREAM_MODULES INCLUDE_STDINT DEFINE_INT8_T DEFINE_UINT8_T DEFINE_INT16_T DEFINE_UINT16_T DEFINE_INT32_T DEFINE_UINT32_T DEFINE_INT64_T DEFINE_UINT64_T DEFINE_INTPTR_T DEFINE_UINTPTR_T USE_ZLIB HAVE_INET_PTON GS_PASS_ARGUMENTS GS_FAKE_MAIN WITH_FFI XML2_CONFIG XML_CONFIG XML_CFLAGS XML_LIBS HAVE_LIBXSLT HAVE_LIBXML HAVE_MDNS USE_GMP INCLUDE_FLAGS LDIR_FLAGS subdirs VERSION MAJOR_VERSION MINOR_VERSION SUBMINOR_VERSION GCC_VERSION LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -1510,8 +1510,8 @@ test -n "$target_alias" &&
|
|||
#---------------------------------------------------------------------
|
||||
# Location of the GNUstep.conf config file (--with-config-file)
|
||||
#---------------------------------------------------------------------
|
||||
echo "$as_me:$LINENO: checking for GNUstep configuration file to use" >&5
|
||||
echo $ECHO_N "checking for GNUstep configuration file to use... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: checking for GNUstep configuration file to use at runtime" >&5
|
||||
echo $ECHO_N "checking for GNUstep configuration file to use at runtime... $ECHO_C" >&6
|
||||
GNUSTEP_CONFIG_FILE=""
|
||||
|
||||
# This requires gnustep-make > 1.13.0 to work. For gnustep-make =
|
||||
|
|
@ -1553,7 +1553,6 @@ fi
|
|||
echo "$as_me:$LINENO: result: $GNUSTEP_CONFIG_FILE" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_CONFIG_FILE" >&6
|
||||
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
# Whether the GNUstep.conf file path can be set in the environment
|
||||
#-----------------------------------------------------------------
|
||||
|
|
@ -1615,8 +1614,8 @@ esac
|
|||
# installation (or of the config file you specify).
|
||||
# It can be annoying in certain cases though; this option lets you
|
||||
# turn it off.
|
||||
echo "$as_me:$LINENO: checking if we should import an existing configuration file" >&5
|
||||
echo $ECHO_N "checking if we should import an existing configuration file... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: checking if we should import an existing configuration file now" >&5
|
||||
echo $ECHO_N "checking if we should import an existing configuration file now... $ECHO_C" >&6
|
||||
# Check whether --enable-importing-config-file or --disable-importing-config-file was given.
|
||||
if test "${enable_importing_config_file+set}" = set; then
|
||||
enableval="$enable_importing_config_file"
|
||||
|
|
@ -1711,8 +1710,9 @@ fi
|
|||
|
||||
if test x"$GNUSTEP_MAKEFILES" = x""; then GNUSTEP_MAKEFILES=$GNUSTEP_SYSTEM_ROOT/Library/Makefiles; fi
|
||||
|
||||
if test x"$GNUSTEP_SYSTEM_APPS" = x""; then GNUSTEP_SYSTEM_APPS=$GNUSTEP_SYSTEM_ROOT/Apps; fi
|
||||
if test x"$GNUSTEP_SYSTEM_ADMIN_APPS" = x""; then GNUSTEP_SYSTEM_APPS=$GNUSTEP_SYSTEM_ROOT/Apps/Admin; fi
|
||||
if test x"$GNUSTEP_SYSTEM_APPS" = x""; then GNUSTEP_SYSTEM_APPS=$GNUSTEP_SYSTEM_ROOT/Applications; fi
|
||||
if test x"$GNUSTEP_SYSTEM_ADMIN_APPS" = x""; then GNUSTEP_SYSTEM_ADMIN_APPS=$GNUSTEP_SYSTEM_ROOT/Applications/Admin; fi
|
||||
if test x"$GNUSTEP_SYSTEM_WEB_APPS" = x""; then GNUSTEP_SYSTEM_WEB_APPS=$GNUSTEP_SYSTEM_ROOT/WebApplications; fi
|
||||
if test x"$GNUSTEP_SYSTEM_TOOLS" = x""; then GNUSTEP_SYSTEM_TOOLS=$GNUSTEP_SYSTEM_ROOT/Tools; fi
|
||||
if test x"$GNUSTEP_SYSTEM_ADMIN_TOOLS" = x""; then GNUSTEP_SYSTEM_ADMIN_TOOLS=$GNUSTEP_SYSTEM_ROOT/Tools/Admin; fi
|
||||
if test x"$GNUSTEP_SYSTEM_LIBRARY" = x""; then GNUSTEP_SYSTEM_LIBRARY=$GNUSTEP_SYSTEM_ROOT/Library; fi
|
||||
|
|
@ -1722,10 +1722,11 @@ if test x"$GNUSTEP_SYSTEM_DOC" = x""; then GNUSTEP_SYSTEM_DOC=$GNUSTEP_SYSTEM_LI
|
|||
if test x"$GNUSTEP_SYSTEM_DOC_MAN" = x""; then GNUSTEP_SYSTEM_DOC_MAN=$GNUSTEP_SYSTEM_LIBRARY/Documentation/man; fi
|
||||
if test x"$GNUSTEP_SYSTEM_DOC_INFO" = x""; then GNUSTEP_SYSTEM_DOC_INFO=$GNUSTEP_SYSTEM_LIBRARY/Documentation/info; fi
|
||||
|
||||
if test x"$GNUSTEP_NETWORK_APPS" = x""; then GNUSTEP_NETWORK_APPS=$GNUSTEP_NETWORK_ROOT/Apps; fi
|
||||
if test x"$GNUSTEP_NETWORK_ADMIN_APPS" = x""; then GNUSTEP_NETWORK_APPS=$GNUSTEP_NETWORK_ROOT/Apps/Admin; fi
|
||||
if test x"$GNUSTEP_NETWORK_APPS" = x""; then GNUSTEP_NETWORK_APPS=$GNUSTEP_NETWORK_ROOT/Applications; fi
|
||||
if test x"$GNUSTEP_NETWORK_ADMIN_APPS" = x""; then GNUSTEP_NETWORK_ADMIN_APPS=$GNUSTEP_NETWORK_ROOT/Applications/Admin; fi
|
||||
if test x"$GNUSTEP_NETWORK_WEB_APPS" = x""; then GNUSTEP_NETWORK_APPS=$GNUSTEP_NETWORK_ROOT/WebApplications; fi
|
||||
if test x"$GNUSTEP_NETWORK_TOOLS" = x""; then GNUSTEP_NETWORK_TOOLS=$GNUSTEP_NETWORK_ROOT/Tools; fi
|
||||
if test x"$GNUSTEP_NETWORK_ADMIN_TOOLS" = x""; then GNUSTEP_NETWORK_TOOLS=$GNUSTEP_NETWORK_ROOT/Tools/Admin; fi
|
||||
if test x"$GNUSTEP_NETWORK_ADMIN_TOOLS" = x""; then GNUSTEP_NETWORK_ADMIN_TOOLS=$GNUSTEP_NETWORK_ROOT/Tools/Admin; fi
|
||||
if test x"$GNUSTEP_NETWORK_LIBRARY" = x""; then GNUSTEP_NETWORK_LIBRARY=$GNUSTEP_NETWORK_ROOT/Library; fi
|
||||
if test x"$GNUSTEP_NETWORK_LIBRARIES" = x""; then GNUSTEP_NETWORK_LIBRARIES=$GNUSTEP_NETWORK_LIBRARY/Libraries; fi
|
||||
if test x"$GNUSTEP_NETWORK_HEADERS" = x""; then GNUSTEP_NETWORK_HEADERS=$GNUSTEP_NETWORK_LIBRARY/Headers; fi
|
||||
|
|
@ -1733,10 +1734,11 @@ if test x"$GNUSTEP_NETWORK_DOC" = x""; then GNUSTEP_NETWORK_DOC=$GNUSTEP_NETWORK
|
|||
if test x"$GNUSTEP_NETWORK_DOC_MAN" = x""; then GNUSTEP_NETWORK_DOC_MAN=$GNUSTEP_NETWORK_LIBRARY/Documentation/man; fi
|
||||
if test x"$GNUSTEP_NETWORK_DOC_INFO" = x""; then GNUSTEP_NETWORK_DOC_INFO=$GNUSTEP_NETWORK_LIBRARY/Documentation/info; fi
|
||||
|
||||
if test x"$GNUSTEP_LOCAL_APPS" = x""; then GNUSTEP_LOCAL_APPS=$GNUSTEP_LOCAL_ROOT/Apps; fi
|
||||
if test x"$GNUSTEP_LOCAL_ADMIN_APPS" = x""; then GNUSTEP_LOCAL_APPS=$GNUSTEP_LOCAL_ROOT/Apps/Admin; fi
|
||||
if test x"$GNUSTEP_LOCAL_APPS" = x""; then GNUSTEP_LOCAL_APPS=$GNUSTEP_LOCAL_ROOT/Applications; fi
|
||||
if test x"$GNUSTEP_LOCAL_ADMIN_APPS" = x""; then GNUSTEP_LOCAL_ADMIN_APPS=$GNUSTEP_LOCAL_ROOT/Applications/Admin; fi
|
||||
if test x"$GNUSTEP_LOCAL_WEB_APPS" = x""; then GNUSTEP_LOCAL_APPS=$GNUSTEP_LOCAL_ROOT/WebApplications; fi
|
||||
if test x"$GNUSTEP_LOCAL_TOOLS" = x""; then GNUSTEP_LOCAL_TOOLS=$GNUSTEP_LOCAL_ROOT/Tools; fi
|
||||
if test x"$GNUSTEP_LOCAL_ADMIN_TOOLS" = x""; then GNUSTEP_LOCAL_TOOLS=$GNUSTEP_LOCAL_ROOT/Tools/Admin; fi
|
||||
if test x"$GNUSTEP_LOCAL_ADMIN_TOOLS" = x""; then GNUSTEP_LOCAL_ADMIN_TOOLS=$GNUSTEP_LOCAL_ROOT/Tools/Admin; fi
|
||||
if test x"$GNUSTEP_LOCAL_LIBRARY" = x""; then GNUSTEP_LOCAL_LIBRARY=$GNUSTEP_LOCAL_ROOT/Library; fi
|
||||
if test x"$GNUSTEP_LOCAL_LIBRARIES" = x""; then GNUSTEP_LOCAL_LIBRARIES=$GNUSTEP_LOCAL_LIBRARY/Libraries; fi
|
||||
if test x"$GNUSTEP_LOCAL_HEADERS" = x""; then GNUSTEP_LOCAL_HEADERS=$GNUSTEP_LOCAL_LIBRARY/Headers; fi
|
||||
|
|
@ -1744,10 +1746,11 @@ if test x"$GNUSTEP_LOCAL_DOC" = x""; then GNUSTEP_LOCAL_DOC=$GNUSTEP_LOCAL_LIBRA
|
|||
if test x"$GNUSTEP_LOCAL_DOC_MAN" = x""; then GNUSTEP_LOCAL_DOC_MAN=$GNUSTEP_LOCAL_LIBRARY/Documentation/man; fi
|
||||
if test x"$GNUSTEP_LOCAL_DOC_INFO" = x""; then GNUSTEP_LOCAL_DOC_INFO=$GNUSTEP_LOCAL_LIBRARY/Documentation/info; fi
|
||||
|
||||
if test x"$GNUSTEP_USER_DIR_APPS" = x""; then GNUSTEP_USER_DIR_APPS=$GNUSTEP_USER_DIR/Apps; fi
|
||||
if test x"$GNUSTEP_USER_DIR_ADMIN_APPS" = x""; then GNUSTEP_USER_DIR_APPS=$GNUSTEP_USER_DIR/Apps/Admin; fi
|
||||
if test x"$GNUSTEP_USER_DIR_APPS" = x""; then GNUSTEP_USER_DIR_APPS=$GNUSTEP_USER_DIR/Applications; fi
|
||||
if test x"$GNUSTEP_USER_DIR_ADMIN_APPS" = x""; then GNUSTEP_USER_DIR_ADMIN_APPS=$GNUSTEP_USER_DIR/Applications/Admin; fi
|
||||
if test x"$GNUSTEP_USER_DIR_WEB_APPS" = x""; then GNUSTEP_USER_DIR_APPS=$GNUSTEP_USER_DIR/WebApplications; fi
|
||||
if test x"$GNUSTEP_USER_DIR_TOOLS" = x""; then GNUSTEP_USER_DIR_TOOLS=$GNUSTEP_USER_DIR/Tools; fi
|
||||
if test x"$GNUSTEP_USER_DIR_ADMIN_TOOLS" = x""; then GNUSTEP_USER_DIR_TOOLS=$GNUSTEP_USER_DIR/Tools/Admin; fi
|
||||
if test x"$GNUSTEP_USER_DIR_ADMIN_TOOLS" = x""; then GNUSTEP_USER_DIR_ADMIN_TOOLS=$GNUSTEP_USER_DIR/Tools/Admin; fi
|
||||
if test x"$GNUSTEP_USER_DIR_LIBRARY" = x""; then GNUSTEP_USER_DIR_LIBRARY=$GNUSTEP_USER_DIR/Library; fi
|
||||
if test x"$GNUSTEP_USER_DIR_LIBRARIES" = x""; then GNUSTEP_USER_DIR_LIBRARIES=$GNUSTEP_USER_DIR/Libraries; fi
|
||||
if test x"$GNUSTEP_USER_DIR_HEADERS" = x""; then GNUSTEP_USER_DIR_HEADERS=$GNUSTEP_USER_DIR/Headers; fi
|
||||
|
|
@ -1763,13 +1766,12 @@ if test x"$GNUSTEP_USER_DIR_DOC_INFO" = x""; then GNUSTEP_USER_DIR_DOC_INFO=$GNU
|
|||
# the installation domain at configure time! This assumes we always
|
||||
# install into System.
|
||||
#
|
||||
# FIXME: Check that relative_path.sh works with MinGW-style paths too.
|
||||
#
|
||||
case "$target_os" in
|
||||
mingw*)
|
||||
GNUSTEP_BASE_PATH="$GNUSTEP_SYSTEM_TOOLS"
|
||||
GNUSTEP_SYSTEM_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_APPS`
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_ADMIN_APPS`
|
||||
GNUSTEP_SYSTEM_WEB_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_WEB_APPS`
|
||||
GNUSTEP_SYSTEM_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_TOOLS`
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_ADMIN_TOOLS`
|
||||
GNUSTEP_SYSTEM_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_LIBRARY`
|
||||
|
|
@ -1781,6 +1783,7 @@ case "$target_os" in
|
|||
|
||||
GNUSTEP_NETWORK_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_APPS`
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_ADMIN_APPS`
|
||||
GNUSTEP_NETWORK_WEB_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_WEB_APPS`
|
||||
GNUSTEP_NETWORK_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_TOOLS`
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_ADMIN_TOOLS`
|
||||
GNUSTEP_NETWORK_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_LIBRARY`
|
||||
|
|
@ -1792,6 +1795,7 @@ case "$target_os" in
|
|||
|
||||
GNUSTEP_LOCAL_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_APPS`
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_ADMIN_APPS`
|
||||
GNUSTEP_LOCAL_WEB_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_WEB_APPS`
|
||||
GNUSTEP_LOCAL_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_TOOLS`
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_ADMIN_TOOLS`
|
||||
GNUSTEP_LOCAL_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_LIBRARY`
|
||||
|
|
@ -1805,6 +1809,194 @@ case "$target_os" in
|
|||
;;
|
||||
esac
|
||||
|
||||
#
|
||||
# Now, we want to print out the paths that we're going to hardcode
|
||||
# into gnustep-base. This is to help users in finding
|
||||
# misconfigurations.
|
||||
#
|
||||
{ echo "$as_me:$LINENO: We store the following filesystem layout into gnustep-base, to be used when no config file is found" >&5
|
||||
echo "$as_me: We store the following filesystem layout into gnustep-base, to be used when no config file is found" >&6;}
|
||||
echo "$as_me:$LINENO: checking for Makefiles directory" >&5
|
||||
echo $ECHO_N "checking for Makefiles directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_MAKEFILES" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_MAKEFILES" >&6
|
||||
echo "$as_me:$LINENO: checking for user directory" >&5
|
||||
echo $ECHO_N "checking for user directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_USER_DIR" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_USER_DIR" >&6
|
||||
echo "$as_me:$LINENO: checking for user defaults directory" >&5
|
||||
echo $ECHO_N "checking for user defaults directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_USER_DEFAULTS_DIR" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_USER_DEFAULTS_DIR" >&6
|
||||
echo "$as_me:$LINENO: checking for user config file" >&5
|
||||
echo $ECHO_N "checking for user config file... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_USER_CONFIG_FILE" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_USER_CONFIG_FILE" >&6
|
||||
|
||||
echo "$as_me:$LINENO: checking for System Applications directory" >&5
|
||||
echo $ECHO_N "checking for System Applications directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_SYSTEM_APPS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_SYSTEM_APPS" >&6
|
||||
echo "$as_me:$LINENO: checking for System Admin Applications directory" >&5
|
||||
echo $ECHO_N "checking for System Admin Applications directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_SYSTEM_ADMIN_APPS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_SYSTEM_ADMIN_APPS" >&6
|
||||
echo "$as_me:$LINENO: checking for System Web Applications directory" >&5
|
||||
echo $ECHO_N "checking for System Web Applications directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_SYSTEM_WEB_APPS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_SYSTEM_WEB_APPS" >&6
|
||||
echo "$as_me:$LINENO: checking for System Tools directory" >&5
|
||||
echo $ECHO_N "checking for System Tools directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_SYSTEM_TOOLS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_SYSTEM_TOOLS" >&6
|
||||
echo "$as_me:$LINENO: checking for System Admin Tools directory" >&5
|
||||
echo $ECHO_N "checking for System Admin Tools directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_SYSTEM_ADMIN_TOOLS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_SYSTEM_ADMIN_TOOLS" >&6
|
||||
echo "$as_me:$LINENO: checking for System Library directory" >&5
|
||||
echo $ECHO_N "checking for System Library directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_SYSTEM_LIBRARY" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_SYSTEM_LIBRARY" >&6
|
||||
echo "$as_me:$LINENO: checking for System Libraries directory" >&5
|
||||
echo $ECHO_N "checking for System Libraries directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_SYSTEM_LIBRARIES" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_SYSTEM_LIBRARIES" >&6
|
||||
echo "$as_me:$LINENO: checking for System Documentation directory" >&5
|
||||
echo $ECHO_N "checking for System Documentation directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_SYSTEM_DOC" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_SYSTEM_DOC" >&6
|
||||
echo "$as_me:$LINENO: checking for System Info Documentation directory" >&5
|
||||
echo $ECHO_N "checking for System Info Documentation directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_SYSTEM_DOC_INFO" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_SYSTEM_DOC_INFO" >&6
|
||||
echo "$as_me:$LINENO: checking for System Man Documentation directory" >&5
|
||||
echo $ECHO_N "checking for System Man Documentation directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_SYSTEM_DOC_MAN" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_SYSTEM_DOC_MAN" >&6
|
||||
|
||||
echo "$as_me:$LINENO: checking for Network Applications directory" >&5
|
||||
echo $ECHO_N "checking for Network Applications directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_NETWORK_APPS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_NETWORK_APPS" >&6
|
||||
echo "$as_me:$LINENO: checking for Network Admin Applications directory" >&5
|
||||
echo $ECHO_N "checking for Network Admin Applications directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_NETWORK_ADMIN_APPS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_NETWORK_ADMIN_APPS" >&6
|
||||
echo "$as_me:$LINENO: checking for Network Web Applications directory" >&5
|
||||
echo $ECHO_N "checking for Network Web Applications directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_NETWORK_WEB_APPS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_NETWORK_WEB_APPS" >&6
|
||||
echo "$as_me:$LINENO: checking for Network Tools directory" >&5
|
||||
echo $ECHO_N "checking for Network Tools directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_NETWORK_TOOLS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_NETWORK_TOOLS" >&6
|
||||
echo "$as_me:$LINENO: checking for Network Admin Tools directory" >&5
|
||||
echo $ECHO_N "checking for Network Admin Tools directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_NETWORK_ADMIN_TOOLS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_NETWORK_ADMIN_TOOLS" >&6
|
||||
echo "$as_me:$LINENO: checking for Network Library directory" >&5
|
||||
echo $ECHO_N "checking for Network Library directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_NETWORK_LIBRARY" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_NETWORK_LIBRARY" >&6
|
||||
echo "$as_me:$LINENO: checking for Network Libraries directory" >&5
|
||||
echo $ECHO_N "checking for Network Libraries directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_NETWORK_LIBRARIES" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_NETWORK_LIBRARIES" >&6
|
||||
echo "$as_me:$LINENO: checking for Network Documentation directory" >&5
|
||||
echo $ECHO_N "checking for Network Documentation directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_NETWORK_DOC" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_NETWORK_DOC" >&6
|
||||
echo "$as_me:$LINENO: checking for Network Info Documentation directory" >&5
|
||||
echo $ECHO_N "checking for Network Info Documentation directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_NETWORK_DOC_INFO" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_NETWORK_DOC_INFO" >&6
|
||||
echo "$as_me:$LINENO: checking for Network Man Documentation directory" >&5
|
||||
echo $ECHO_N "checking for Network Man Documentation directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_NETWORK_DOC_MAN" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_NETWORK_DOC_MAN" >&6
|
||||
|
||||
echo "$as_me:$LINENO: checking for Local Applications directory" >&5
|
||||
echo $ECHO_N "checking for Local Applications directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_LOCAL_APPS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_LOCAL_APPS" >&6
|
||||
echo "$as_me:$LINENO: checking for Local Admin Applications directory" >&5
|
||||
echo $ECHO_N "checking for Local Admin Applications directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_LOCAL_ADMIN_APPS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_LOCAL_ADMIN_APPS" >&6
|
||||
echo "$as_me:$LINENO: checking for Local Web Applications directory" >&5
|
||||
echo $ECHO_N "checking for Local Web Applications directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_LOCAL_WEB_APPS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_LOCAL_WEB_APPS" >&6
|
||||
echo "$as_me:$LINENO: checking for Local Tools directory" >&5
|
||||
echo $ECHO_N "checking for Local Tools directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_LOCAL_TOOLS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_LOCAL_TOOLS" >&6
|
||||
echo "$as_me:$LINENO: checking for Local Admin Tools directory" >&5
|
||||
echo $ECHO_N "checking for Local Admin Tools directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_LOCAL_ADMIN_TOOLS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_LOCAL_ADMIN_TOOLS" >&6
|
||||
echo "$as_me:$LINENO: checking for Local Library directory" >&5
|
||||
echo $ECHO_N "checking for Local Library directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_LOCAL_LIBRARY" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_LOCAL_LIBRARY" >&6
|
||||
echo "$as_me:$LINENO: checking for Local Libraries directory" >&5
|
||||
echo $ECHO_N "checking for Local Libraries directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_LOCAL_LIBRARIES" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_LOCAL_LIBRARIES" >&6
|
||||
echo "$as_me:$LINENO: checking for Local Documentation directory" >&5
|
||||
echo $ECHO_N "checking for Local Documentation directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_LOCAL_DOC" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_LOCAL_DOC" >&6
|
||||
echo "$as_me:$LINENO: checking for Local Info Documentation directory" >&5
|
||||
echo $ECHO_N "checking for Local Info Documentation directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_LOCAL_DOC_INFO" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_LOCAL_DOC_INFO" >&6
|
||||
echo "$as_me:$LINENO: checking for Local Man Documentation directory" >&5
|
||||
echo $ECHO_N "checking for Local Man Documentation directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_LOCAL_DOC_MAN" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_LOCAL_DOC_MAN" >&6
|
||||
|
||||
echo "$as_me:$LINENO: checking for User Applications directory" >&5
|
||||
echo $ECHO_N "checking for User Applications directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_USER_DIR_APPS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_USER_DIR_APPS" >&6
|
||||
echo "$as_me:$LINENO: checking for User Admin Applications directory" >&5
|
||||
echo $ECHO_N "checking for User Admin Applications directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_USER_DIR_ADMIN_APPS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_USER_DIR_ADMIN_APPS" >&6
|
||||
echo "$as_me:$LINENO: checking for User Web Applications directory" >&5
|
||||
echo $ECHO_N "checking for User Web Applications directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_USER_DIR_WEB_APPS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_USER_DIR_WEB_APPS" >&6
|
||||
echo "$as_me:$LINENO: checking for User Tools directory" >&5
|
||||
echo $ECHO_N "checking for User Tools directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_USER_DIR_TOOLS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_USER_DIR_TOOLS" >&6
|
||||
echo "$as_me:$LINENO: checking for User Admin Tools directory" >&5
|
||||
echo $ECHO_N "checking for User Admin Tools directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_USER_DIR_ADMIN_TOOLS" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_USER_DIR_ADMIN_TOOLS" >&6
|
||||
echo "$as_me:$LINENO: checking for User Library directory" >&5
|
||||
echo $ECHO_N "checking for User Library directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_USER_DIR_LIBRARY" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_USER_DIR_LIBRARY" >&6
|
||||
echo "$as_me:$LINENO: checking for User Libraries directory" >&5
|
||||
echo $ECHO_N "checking for User Libraries directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_USER_DIR_LIBRARIES" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_USER_DIR_LIBRARIES" >&6
|
||||
echo "$as_me:$LINENO: checking for User Documentation directory" >&5
|
||||
echo $ECHO_N "checking for User Documentation directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_USER_DIR_DOC" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_USER_DIR_DOC" >&6
|
||||
echo "$as_me:$LINENO: checking for User Info Documentation directory" >&5
|
||||
echo $ECHO_N "checking for User Info Documentation directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_USER_DIR_DOC_INFO" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_USER_DIR_DOC_INFO" >&6
|
||||
echo "$as_me:$LINENO: checking for User Man Documentation directory" >&5
|
||||
echo $ECHO_N "checking for User Man Documentation directory... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_USER_DIR_DOC_MAN" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_USER_DIR_DOC_MAN" >&6
|
||||
|
||||
#
|
||||
# Set the default configuration file values in config.h to be hard-coded
|
||||
# into NSPathUtilities.m
|
||||
|
|
@ -1857,6 +2049,13 @@ cat >>confdefs.h <<_ACEOF
|
|||
_ACEOF
|
||||
|
||||
|
||||
GNUSTEP_SYSTEM_WEB_APPS=`echo $GNUSTEP_SYSTEM_WEB_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define GNUSTEP_TARGET_SYSTEM_WEB_APPS "$GNUSTEP_SYSTEM_WEB_APPS"
|
||||
_ACEOF
|
||||
|
||||
|
||||
GNUSTEP_SYSTEM_TOOLS=`echo $GNUSTEP_SYSTEM_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -1930,6 +2129,13 @@ cat >>confdefs.h <<_ACEOF
|
|||
_ACEOF
|
||||
|
||||
|
||||
GNUSTEP_NETWORK_WEB_APPS=`echo $GNUSTEP_NETWORK_WEB_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define GNUSTEP_TARGET_NETWORK_WEB_APPS "$GNUSTEP_NETWORK_WEB_APPS"
|
||||
_ACEOF
|
||||
|
||||
|
||||
GNUSTEP_NETWORK_TOOLS=`echo $GNUSTEP_NETWORK_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -2003,6 +2209,13 @@ cat >>confdefs.h <<_ACEOF
|
|||
_ACEOF
|
||||
|
||||
|
||||
GNUSTEP_LOCAL_WEB_APPS=`echo $GNUSTEP_LOCAL_WEB_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define GNUSTEP_TARGET_LOCAL_WEB_APPS "$GNUSTEP_LOCAL_WEB_APPS"
|
||||
_ACEOF
|
||||
|
||||
|
||||
GNUSTEP_LOCAL_TOOLS=`echo $GNUSTEP_LOCAL_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -2076,6 +2289,13 @@ cat >>confdefs.h <<_ACEOF
|
|||
_ACEOF
|
||||
|
||||
|
||||
GNUSTEP_USER_DIR_WEB_APPS=`echo $GNUSTEP_USER_DIR_WEB_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define GNUSTEP_TARGET_USER_DIR_WEB_APPS "$GNUSTEP_USER_DIR_WEB_APPS"
|
||||
_ACEOF
|
||||
|
||||
|
||||
GNUSTEP_USER_DIR_TOOLS=`echo $GNUSTEP_USER_DIR_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -14926,8 +15146,8 @@ case "$target_os" in
|
|||
cygwin*) PASS_ARG=yes;;
|
||||
esac
|
||||
|
||||
echo "$as_me:$LINENO: checking \"use of pass-through arguments\"" >&5
|
||||
echo $ECHO_N "checking \"use of pass-through arguments\"... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: checking use of pass-through arguments" >&5
|
||||
echo $ECHO_N "checking use of pass-through arguments... $ECHO_C" >&6
|
||||
# Check whether --enable-pass-arguments or --disable-pass-arguments was given.
|
||||
if test "${enable_pass_arguments+set}" = set; then
|
||||
enableval="$enable_pass_arguments"
|
||||
|
|
@ -14945,8 +15165,8 @@ fi
|
|||
echo "$as_me:$LINENO: result: $enable_pass_arguments" >&5
|
||||
echo "${ECHO_T}$enable_pass_arguments" >&6
|
||||
|
||||
echo "$as_me:$LINENO: checking \"use of fake-main definition\"" >&5
|
||||
echo $ECHO_N "checking \"use of fake-main definition\"... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: checking use of fake-main definition" >&5
|
||||
echo $ECHO_N "checking use of fake-main definition... $ECHO_C" >&6
|
||||
# Check whether --enable-fake-main or --disable-fake-main was given.
|
||||
if test "${enable_fake_main+set}" = set; then
|
||||
enableval="$enable_fake_main"
|
||||
|
|
@ -15438,8 +15658,8 @@ if test $have_forward_hook = no; then
|
|||
fi
|
||||
CPPFLAGS="$saved_CPPFLAGS"
|
||||
|
||||
echo "$as_me:$LINENO: checking \"FFI library usage\"" >&5
|
||||
echo $ECHO_N "checking \"FFI library usage\"... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: checking FFI library usage" >&5
|
||||
echo $ECHO_N "checking FFI library usage... $ECHO_C" >&6
|
||||
WITH_FFI=none
|
||||
if test $enable_libffi = yes; then
|
||||
|
||||
|
|
@ -15559,26 +15779,18 @@ echo "${ECHO_T}ffcall" >&6
|
|||
fi
|
||||
echo "$as_me:$LINENO: checking if ffcall trampolines work" >&5
|
||||
echo $ECHO_N "checking if ffcall trampolines work... $ECHO_C" >&6
|
||||
if test "$cross_compiling" = yes; then
|
||||
have_working_trampoline=yes
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#include "$srcdir/config/config.trampoline.c"
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
rm -f conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -15586,12 +15798,15 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
(exit $ac_status); }; }; then
|
||||
have_working_trampoline=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
echo "$as_me: program exited with status $ac_status" >&5
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
( exit $ac_status )
|
||||
have_working_trampoline=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $have_working_trampoline" >&5
|
||||
echo "${ECHO_T}$have_working_trampoline" >&6
|
||||
if test $have_working_trampoline = no; then
|
||||
|
|
@ -15607,7 +15822,7 @@ echo "${ECHO_T}none" >&6
|
|||
echo
|
||||
if test $have_forward_hook = no; then
|
||||
echo "You do not have an up-to-date libobjc library installed"
|
||||
elif test $have_working_trampoline = no; then
|
||||
elif test "$have_working_trampoline" = no; then
|
||||
echo "You have ffcall, but it does not work properly. Most likely because"
|
||||
echo "your're system's security policy is blocking some parts of ffcall"
|
||||
echo "we recommend installing libffi instead."
|
||||
|
|
@ -17983,7 +18198,6 @@ s,@target@,$target,;t t
|
|||
s,@target_cpu@,$target_cpu,;t t
|
||||
s,@target_vendor@,$target_vendor,;t t
|
||||
s,@target_os@,$target_os,;t t
|
||||
s,@GNUSTEP_CONFIG_FILE@,$GNUSTEP_CONFIG_FILE,;t t
|
||||
s,@CC@,$CC,;t t
|
||||
s,@CFLAGS@,$CFLAGS,;t t
|
||||
s,@LDFLAGS@,$LDFLAGS,;t t
|
||||
|
|
|
|||
157
configure.ac
157
configure.ac
|
|
@ -72,7 +72,7 @@ AC_CANONICAL_TARGET([])
|
|||
#---------------------------------------------------------------------
|
||||
# Location of the GNUstep.conf config file (--with-config-file)
|
||||
#---------------------------------------------------------------------
|
||||
AC_MSG_CHECKING([for GNUstep configuration file to use])
|
||||
AC_MSG_CHECKING([for GNUstep configuration file to use at runtime])
|
||||
GNUSTEP_CONFIG_FILE=""
|
||||
|
||||
# This requires gnustep-make > 1.13.0 to work. For gnustep-make =
|
||||
|
|
@ -129,7 +129,6 @@ if test "$GNUSTEP_CONFIG_FILE" = ""; then
|
|||
esac
|
||||
fi
|
||||
AC_MSG_RESULT($GNUSTEP_CONFIG_FILE)
|
||||
AC_SUBST(GNUSTEP_CONFIG_FILE)
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
# Whether the GNUstep.conf file path can be set in the environment
|
||||
|
|
@ -189,7 +188,7 @@ esac
|
|||
# installation (or of the config file you specify).
|
||||
# It can be annoying in certain cases though; this option lets you
|
||||
# turn it off.
|
||||
AC_MSG_CHECKING([if we should import an existing configuration file])
|
||||
AC_MSG_CHECKING([if we should import an existing configuration file now])
|
||||
AC_ARG_ENABLE(importing-config-file,
|
||||
[ --disable-importing-config-file
|
||||
Disable importing of an existing GNUstep config
|
||||
|
|
@ -276,8 +275,9 @@ fi
|
|||
|
||||
if test x"$GNUSTEP_MAKEFILES" = x""; then GNUSTEP_MAKEFILES=$GNUSTEP_SYSTEM_ROOT/Library/Makefiles; fi
|
||||
|
||||
if test x"$GNUSTEP_SYSTEM_APPS" = x""; then GNUSTEP_SYSTEM_APPS=$GNUSTEP_SYSTEM_ROOT/Apps; fi
|
||||
if test x"$GNUSTEP_SYSTEM_ADMIN_APPS" = x""; then GNUSTEP_SYSTEM_APPS=$GNUSTEP_SYSTEM_ROOT/Apps/Admin; fi
|
||||
if test x"$GNUSTEP_SYSTEM_APPS" = x""; then GNUSTEP_SYSTEM_APPS=$GNUSTEP_SYSTEM_ROOT/Applications; fi
|
||||
if test x"$GNUSTEP_SYSTEM_ADMIN_APPS" = x""; then GNUSTEP_SYSTEM_ADMIN_APPS=$GNUSTEP_SYSTEM_ROOT/Applications/Admin; fi
|
||||
if test x"$GNUSTEP_SYSTEM_WEB_APPS" = x""; then GNUSTEP_SYSTEM_WEB_APPS=$GNUSTEP_SYSTEM_ROOT/WebApplications; fi
|
||||
if test x"$GNUSTEP_SYSTEM_TOOLS" = x""; then GNUSTEP_SYSTEM_TOOLS=$GNUSTEP_SYSTEM_ROOT/Tools; fi
|
||||
if test x"$GNUSTEP_SYSTEM_ADMIN_TOOLS" = x""; then GNUSTEP_SYSTEM_ADMIN_TOOLS=$GNUSTEP_SYSTEM_ROOT/Tools/Admin; fi
|
||||
if test x"$GNUSTEP_SYSTEM_LIBRARY" = x""; then GNUSTEP_SYSTEM_LIBRARY=$GNUSTEP_SYSTEM_ROOT/Library; fi
|
||||
|
|
@ -287,10 +287,11 @@ if test x"$GNUSTEP_SYSTEM_DOC" = x""; then GNUSTEP_SYSTEM_DOC=$GNUSTEP_SYSTEM_LI
|
|||
if test x"$GNUSTEP_SYSTEM_DOC_MAN" = x""; then GNUSTEP_SYSTEM_DOC_MAN=$GNUSTEP_SYSTEM_LIBRARY/Documentation/man; fi
|
||||
if test x"$GNUSTEP_SYSTEM_DOC_INFO" = x""; then GNUSTEP_SYSTEM_DOC_INFO=$GNUSTEP_SYSTEM_LIBRARY/Documentation/info; fi
|
||||
|
||||
if test x"$GNUSTEP_NETWORK_APPS" = x""; then GNUSTEP_NETWORK_APPS=$GNUSTEP_NETWORK_ROOT/Apps; fi
|
||||
if test x"$GNUSTEP_NETWORK_ADMIN_APPS" = x""; then GNUSTEP_NETWORK_APPS=$GNUSTEP_NETWORK_ROOT/Apps/Admin; fi
|
||||
if test x"$GNUSTEP_NETWORK_APPS" = x""; then GNUSTEP_NETWORK_APPS=$GNUSTEP_NETWORK_ROOT/Applications; fi
|
||||
if test x"$GNUSTEP_NETWORK_ADMIN_APPS" = x""; then GNUSTEP_NETWORK_ADMIN_APPS=$GNUSTEP_NETWORK_ROOT/Applications/Admin; fi
|
||||
if test x"$GNUSTEP_NETWORK_WEB_APPS" = x""; then GNUSTEP_NETWORK_APPS=$GNUSTEP_NETWORK_ROOT/WebApplications; fi
|
||||
if test x"$GNUSTEP_NETWORK_TOOLS" = x""; then GNUSTEP_NETWORK_TOOLS=$GNUSTEP_NETWORK_ROOT/Tools; fi
|
||||
if test x"$GNUSTEP_NETWORK_ADMIN_TOOLS" = x""; then GNUSTEP_NETWORK_TOOLS=$GNUSTEP_NETWORK_ROOT/Tools/Admin; fi
|
||||
if test x"$GNUSTEP_NETWORK_ADMIN_TOOLS" = x""; then GNUSTEP_NETWORK_ADMIN_TOOLS=$GNUSTEP_NETWORK_ROOT/Tools/Admin; fi
|
||||
if test x"$GNUSTEP_NETWORK_LIBRARY" = x""; then GNUSTEP_NETWORK_LIBRARY=$GNUSTEP_NETWORK_ROOT/Library; fi
|
||||
if test x"$GNUSTEP_NETWORK_LIBRARIES" = x""; then GNUSTEP_NETWORK_LIBRARIES=$GNUSTEP_NETWORK_LIBRARY/Libraries; fi
|
||||
if test x"$GNUSTEP_NETWORK_HEADERS" = x""; then GNUSTEP_NETWORK_HEADERS=$GNUSTEP_NETWORK_LIBRARY/Headers; fi
|
||||
|
|
@ -298,10 +299,11 @@ if test x"$GNUSTEP_NETWORK_DOC" = x""; then GNUSTEP_NETWORK_DOC=$GNUSTEP_NETWORK
|
|||
if test x"$GNUSTEP_NETWORK_DOC_MAN" = x""; then GNUSTEP_NETWORK_DOC_MAN=$GNUSTEP_NETWORK_LIBRARY/Documentation/man; fi
|
||||
if test x"$GNUSTEP_NETWORK_DOC_INFO" = x""; then GNUSTEP_NETWORK_DOC_INFO=$GNUSTEP_NETWORK_LIBRARY/Documentation/info; fi
|
||||
|
||||
if test x"$GNUSTEP_LOCAL_APPS" = x""; then GNUSTEP_LOCAL_APPS=$GNUSTEP_LOCAL_ROOT/Apps; fi
|
||||
if test x"$GNUSTEP_LOCAL_ADMIN_APPS" = x""; then GNUSTEP_LOCAL_APPS=$GNUSTEP_LOCAL_ROOT/Apps/Admin; fi
|
||||
if test x"$GNUSTEP_LOCAL_APPS" = x""; then GNUSTEP_LOCAL_APPS=$GNUSTEP_LOCAL_ROOT/Applications; fi
|
||||
if test x"$GNUSTEP_LOCAL_ADMIN_APPS" = x""; then GNUSTEP_LOCAL_ADMIN_APPS=$GNUSTEP_LOCAL_ROOT/Applications/Admin; fi
|
||||
if test x"$GNUSTEP_LOCAL_WEB_APPS" = x""; then GNUSTEP_LOCAL_APPS=$GNUSTEP_LOCAL_ROOT/WebApplications; fi
|
||||
if test x"$GNUSTEP_LOCAL_TOOLS" = x""; then GNUSTEP_LOCAL_TOOLS=$GNUSTEP_LOCAL_ROOT/Tools; fi
|
||||
if test x"$GNUSTEP_LOCAL_ADMIN_TOOLS" = x""; then GNUSTEP_LOCAL_TOOLS=$GNUSTEP_LOCAL_ROOT/Tools/Admin; fi
|
||||
if test x"$GNUSTEP_LOCAL_ADMIN_TOOLS" = x""; then GNUSTEP_LOCAL_ADMIN_TOOLS=$GNUSTEP_LOCAL_ROOT/Tools/Admin; fi
|
||||
if test x"$GNUSTEP_LOCAL_LIBRARY" = x""; then GNUSTEP_LOCAL_LIBRARY=$GNUSTEP_LOCAL_ROOT/Library; fi
|
||||
if test x"$GNUSTEP_LOCAL_LIBRARIES" = x""; then GNUSTEP_LOCAL_LIBRARIES=$GNUSTEP_LOCAL_LIBRARY/Libraries; fi
|
||||
if test x"$GNUSTEP_LOCAL_HEADERS" = x""; then GNUSTEP_LOCAL_HEADERS=$GNUSTEP_LOCAL_LIBRARY/Headers; fi
|
||||
|
|
@ -309,10 +311,11 @@ if test x"$GNUSTEP_LOCAL_DOC" = x""; then GNUSTEP_LOCAL_DOC=$GNUSTEP_LOCAL_LIBRA
|
|||
if test x"$GNUSTEP_LOCAL_DOC_MAN" = x""; then GNUSTEP_LOCAL_DOC_MAN=$GNUSTEP_LOCAL_LIBRARY/Documentation/man; fi
|
||||
if test x"$GNUSTEP_LOCAL_DOC_INFO" = x""; then GNUSTEP_LOCAL_DOC_INFO=$GNUSTEP_LOCAL_LIBRARY/Documentation/info; fi
|
||||
|
||||
if test x"$GNUSTEP_USER_DIR_APPS" = x""; then GNUSTEP_USER_DIR_APPS=$GNUSTEP_USER_DIR/Apps; fi
|
||||
if test x"$GNUSTEP_USER_DIR_ADMIN_APPS" = x""; then GNUSTEP_USER_DIR_APPS=$GNUSTEP_USER_DIR/Apps/Admin; fi
|
||||
if test x"$GNUSTEP_USER_DIR_APPS" = x""; then GNUSTEP_USER_DIR_APPS=$GNUSTEP_USER_DIR/Applications; fi
|
||||
if test x"$GNUSTEP_USER_DIR_ADMIN_APPS" = x""; then GNUSTEP_USER_DIR_ADMIN_APPS=$GNUSTEP_USER_DIR/Applications/Admin; fi
|
||||
if test x"$GNUSTEP_USER_DIR_WEB_APPS" = x""; then GNUSTEP_USER_DIR_APPS=$GNUSTEP_USER_DIR/WebApplications; fi
|
||||
if test x"$GNUSTEP_USER_DIR_TOOLS" = x""; then GNUSTEP_USER_DIR_TOOLS=$GNUSTEP_USER_DIR/Tools; fi
|
||||
if test x"$GNUSTEP_USER_DIR_ADMIN_TOOLS" = x""; then GNUSTEP_USER_DIR_TOOLS=$GNUSTEP_USER_DIR/Tools/Admin; fi
|
||||
if test x"$GNUSTEP_USER_DIR_ADMIN_TOOLS" = x""; then GNUSTEP_USER_DIR_ADMIN_TOOLS=$GNUSTEP_USER_DIR/Tools/Admin; fi
|
||||
if test x"$GNUSTEP_USER_DIR_LIBRARY" = x""; then GNUSTEP_USER_DIR_LIBRARY=$GNUSTEP_USER_DIR/Library; fi
|
||||
if test x"$GNUSTEP_USER_DIR_LIBRARIES" = x""; then GNUSTEP_USER_DIR_LIBRARIES=$GNUSTEP_USER_DIR/Libraries; fi
|
||||
if test x"$GNUSTEP_USER_DIR_HEADERS" = x""; then GNUSTEP_USER_DIR_HEADERS=$GNUSTEP_USER_DIR/Headers; fi
|
||||
|
|
@ -328,13 +331,12 @@ if test x"$GNUSTEP_USER_DIR_DOC_INFO" = x""; then GNUSTEP_USER_DIR_DOC_INFO=$GNU
|
|||
# the installation domain at configure time! This assumes we always
|
||||
# install into System.
|
||||
#
|
||||
# FIXME: Check that relative_path.sh works with MinGW-style paths too.
|
||||
#
|
||||
case "$target_os" in
|
||||
mingw*)
|
||||
GNUSTEP_BASE_PATH="$GNUSTEP_SYSTEM_TOOLS"
|
||||
GNUSTEP_SYSTEM_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_APPS`
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_ADMIN_APPS`
|
||||
GNUSTEP_SYSTEM_WEB_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_WEB_APPS`
|
||||
GNUSTEP_SYSTEM_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_TOOLS`
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_ADMIN_TOOLS`
|
||||
GNUSTEP_SYSTEM_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_LIBRARY`
|
||||
|
|
@ -346,6 +348,7 @@ case "$target_os" in
|
|||
|
||||
GNUSTEP_NETWORK_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_APPS`
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_ADMIN_APPS`
|
||||
GNUSTEP_NETWORK_WEB_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_WEB_APPS`
|
||||
GNUSTEP_NETWORK_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_TOOLS`
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_ADMIN_TOOLS`
|
||||
GNUSTEP_NETWORK_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_LIBRARY`
|
||||
|
|
@ -357,6 +360,7 @@ case "$target_os" in
|
|||
|
||||
GNUSTEP_LOCAL_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_APPS`
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_ADMIN_APPS`
|
||||
GNUSTEP_LOCAL_WEB_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_WEB_APPS`
|
||||
GNUSTEP_LOCAL_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_TOOLS`
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_ADMIN_TOOLS`
|
||||
GNUSTEP_LOCAL_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_LIBRARY`
|
||||
|
|
@ -370,6 +374,105 @@ case "$target_os" in
|
|||
;;
|
||||
esac
|
||||
|
||||
#
|
||||
# Now, we want to print out the paths that we're going to hardcode
|
||||
# into gnustep-base. This is to help users in finding
|
||||
# misconfigurations.
|
||||
#
|
||||
AC_MSG_NOTICE([We store the following filesystem layout into gnustep-base, to be used when no config file is found])
|
||||
AC_MSG_CHECKING([for Makefiles directory])
|
||||
AC_MSG_RESULT($GNUSTEP_MAKEFILES)
|
||||
AC_MSG_CHECKING([for user directory])
|
||||
AC_MSG_RESULT($GNUSTEP_USER_DIR)
|
||||
AC_MSG_CHECKING([for user defaults directory])
|
||||
AC_MSG_RESULT($GNUSTEP_USER_DEFAULTS_DIR)
|
||||
AC_MSG_CHECKING([for user config file])
|
||||
AC_MSG_RESULT($GNUSTEP_USER_CONFIG_FILE)
|
||||
|
||||
AC_MSG_CHECKING([for System Applications directory])
|
||||
AC_MSG_RESULT($GNUSTEP_SYSTEM_APPS)
|
||||
AC_MSG_CHECKING([for System Admin Applications directory])
|
||||
AC_MSG_RESULT($GNUSTEP_SYSTEM_ADMIN_APPS)
|
||||
AC_MSG_CHECKING([for System Web Applications directory])
|
||||
AC_MSG_RESULT($GNUSTEP_SYSTEM_WEB_APPS)
|
||||
AC_MSG_CHECKING([for System Tools directory])
|
||||
AC_MSG_RESULT($GNUSTEP_SYSTEM_TOOLS)
|
||||
AC_MSG_CHECKING([for System Admin Tools directory])
|
||||
AC_MSG_RESULT($GNUSTEP_SYSTEM_ADMIN_TOOLS)
|
||||
AC_MSG_CHECKING([for System Library directory])
|
||||
AC_MSG_RESULT($GNUSTEP_SYSTEM_LIBRARY)
|
||||
AC_MSG_CHECKING([for System Libraries directory])
|
||||
AC_MSG_RESULT($GNUSTEP_SYSTEM_LIBRARIES)
|
||||
AC_MSG_CHECKING([for System Documentation directory])
|
||||
AC_MSG_RESULT($GNUSTEP_SYSTEM_DOC)
|
||||
AC_MSG_CHECKING([for System Info Documentation directory])
|
||||
AC_MSG_RESULT($GNUSTEP_SYSTEM_DOC_INFO)
|
||||
AC_MSG_CHECKING([for System Man Documentation directory])
|
||||
AC_MSG_RESULT($GNUSTEP_SYSTEM_DOC_MAN)
|
||||
|
||||
AC_MSG_CHECKING([for Network Applications directory])
|
||||
AC_MSG_RESULT($GNUSTEP_NETWORK_APPS)
|
||||
AC_MSG_CHECKING([for Network Admin Applications directory])
|
||||
AC_MSG_RESULT($GNUSTEP_NETWORK_ADMIN_APPS)
|
||||
AC_MSG_CHECKING([for Network Web Applications directory])
|
||||
AC_MSG_RESULT($GNUSTEP_NETWORK_WEB_APPS)
|
||||
AC_MSG_CHECKING([for Network Tools directory])
|
||||
AC_MSG_RESULT($GNUSTEP_NETWORK_TOOLS)
|
||||
AC_MSG_CHECKING([for Network Admin Tools directory])
|
||||
AC_MSG_RESULT($GNUSTEP_NETWORK_ADMIN_TOOLS)
|
||||
AC_MSG_CHECKING([for Network Library directory])
|
||||
AC_MSG_RESULT($GNUSTEP_NETWORK_LIBRARY)
|
||||
AC_MSG_CHECKING([for Network Libraries directory])
|
||||
AC_MSG_RESULT($GNUSTEP_NETWORK_LIBRARIES)
|
||||
AC_MSG_CHECKING([for Network Documentation directory])
|
||||
AC_MSG_RESULT($GNUSTEP_NETWORK_DOC)
|
||||
AC_MSG_CHECKING([for Network Info Documentation directory])
|
||||
AC_MSG_RESULT($GNUSTEP_NETWORK_DOC_INFO)
|
||||
AC_MSG_CHECKING([for Network Man Documentation directory])
|
||||
AC_MSG_RESULT($GNUSTEP_NETWORK_DOC_MAN)
|
||||
|
||||
AC_MSG_CHECKING([for Local Applications directory])
|
||||
AC_MSG_RESULT($GNUSTEP_LOCAL_APPS)
|
||||
AC_MSG_CHECKING([for Local Admin Applications directory])
|
||||
AC_MSG_RESULT($GNUSTEP_LOCAL_ADMIN_APPS)
|
||||
AC_MSG_CHECKING([for Local Web Applications directory])
|
||||
AC_MSG_RESULT($GNUSTEP_LOCAL_WEB_APPS)
|
||||
AC_MSG_CHECKING([for Local Tools directory])
|
||||
AC_MSG_RESULT($GNUSTEP_LOCAL_TOOLS)
|
||||
AC_MSG_CHECKING([for Local Admin Tools directory])
|
||||
AC_MSG_RESULT($GNUSTEP_LOCAL_ADMIN_TOOLS)
|
||||
AC_MSG_CHECKING([for Local Library directory])
|
||||
AC_MSG_RESULT($GNUSTEP_LOCAL_LIBRARY)
|
||||
AC_MSG_CHECKING([for Local Libraries directory])
|
||||
AC_MSG_RESULT($GNUSTEP_LOCAL_LIBRARIES)
|
||||
AC_MSG_CHECKING([for Local Documentation directory])
|
||||
AC_MSG_RESULT($GNUSTEP_LOCAL_DOC)
|
||||
AC_MSG_CHECKING([for Local Info Documentation directory])
|
||||
AC_MSG_RESULT($GNUSTEP_LOCAL_DOC_INFO)
|
||||
AC_MSG_CHECKING([for Local Man Documentation directory])
|
||||
AC_MSG_RESULT($GNUSTEP_LOCAL_DOC_MAN)
|
||||
|
||||
AC_MSG_CHECKING([for User Applications directory])
|
||||
AC_MSG_RESULT($GNUSTEP_USER_DIR_APPS)
|
||||
AC_MSG_CHECKING([for User Admin Applications directory])
|
||||
AC_MSG_RESULT($GNUSTEP_USER_DIR_ADMIN_APPS)
|
||||
AC_MSG_CHECKING([for User Web Applications directory])
|
||||
AC_MSG_RESULT($GNUSTEP_USER_DIR_WEB_APPS)
|
||||
AC_MSG_CHECKING([for User Tools directory])
|
||||
AC_MSG_RESULT($GNUSTEP_USER_DIR_TOOLS)
|
||||
AC_MSG_CHECKING([for User Admin Tools directory])
|
||||
AC_MSG_RESULT($GNUSTEP_USER_DIR_ADMIN_TOOLS)
|
||||
AC_MSG_CHECKING([for User Library directory])
|
||||
AC_MSG_RESULT($GNUSTEP_USER_DIR_LIBRARY)
|
||||
AC_MSG_CHECKING([for User Libraries directory])
|
||||
AC_MSG_RESULT($GNUSTEP_USER_DIR_LIBRARIES)
|
||||
AC_MSG_CHECKING([for User Documentation directory])
|
||||
AC_MSG_RESULT($GNUSTEP_USER_DIR_DOC)
|
||||
AC_MSG_CHECKING([for User Info Documentation directory])
|
||||
AC_MSG_RESULT($GNUSTEP_USER_DIR_DOC_INFO)
|
||||
AC_MSG_CHECKING([for User Man Documentation directory])
|
||||
AC_MSG_RESULT($GNUSTEP_USER_DIR_DOC_MAN)
|
||||
|
||||
#
|
||||
# Set the default configuration file values in config.h to be hard-coded
|
||||
# into NSPathUtilities.m
|
||||
|
|
@ -408,6 +511,11 @@ AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_SYSTEM_ADMIN_APPS,
|
|||
"$GNUSTEP_SYSTEM_ADMIN_APPS",
|
||||
[Built in default value for GNUstep system apps])
|
||||
|
||||
GNUSTEP_SYSTEM_WEB_APPS=`echo $GNUSTEP_SYSTEM_WEB_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_SYSTEM_WEB_APPS,
|
||||
"$GNUSTEP_SYSTEM_WEB_APPS",
|
||||
[Built in default value for GNUstep web apps])
|
||||
|
||||
GNUSTEP_SYSTEM_TOOLS=`echo $GNUSTEP_SYSTEM_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_SYSTEM_TOOLS,
|
||||
"$GNUSTEP_SYSTEM_TOOLS",
|
||||
|
|
@ -461,6 +569,11 @@ AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_NETWORK_ADMIN_APPS,
|
|||
"$GNUSTEP_NETWORK_ADMIN_APPS",
|
||||
[Built in default value for GNUstep network apps])
|
||||
|
||||
GNUSTEP_NETWORK_WEB_APPS=`echo $GNUSTEP_NETWORK_WEB_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_NETWORK_WEB_APPS,
|
||||
"$GNUSTEP_NETWORK_WEB_APPS",
|
||||
[Built in default value for GNUstep network web apps])
|
||||
|
||||
GNUSTEP_NETWORK_TOOLS=`echo $GNUSTEP_NETWORK_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_NETWORK_TOOLS,
|
||||
"$GNUSTEP_NETWORK_TOOLS",
|
||||
|
|
@ -514,6 +627,11 @@ AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_LOCAL_ADMIN_APPS,
|
|||
"$GNUSTEP_LOCAL_ADMIN_APPS",
|
||||
[Built in default value for GNUstep local apps])
|
||||
|
||||
GNUSTEP_LOCAL_WEB_APPS=`echo $GNUSTEP_LOCAL_WEB_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_LOCAL_WEB_APPS,
|
||||
"$GNUSTEP_LOCAL_WEB_APPS",
|
||||
[Built in default value for GNUstep local web apps])
|
||||
|
||||
GNUSTEP_LOCAL_TOOLS=`echo $GNUSTEP_LOCAL_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_LOCAL_TOOLS,
|
||||
"$GNUSTEP_LOCAL_TOOLS",
|
||||
|
|
@ -565,7 +683,12 @@ AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_USER_DIR_APPS,
|
|||
GNUSTEP_USER_DIR_ADMIN_APPS=`echo $GNUSTEP_USER_DIR_ADMIN_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_USER_DIR_ADMIN_APPS,
|
||||
"$GNUSTEP_USER_DIR_ADMIN_APPS",
|
||||
[Built in default value for GNUstep user_dir apps])
|
||||
[Built in default value for GNUstep user_dir admin apps])
|
||||
|
||||
GNUSTEP_USER_DIR_WEB_APPS=`echo $GNUSTEP_USER_DIR_WEB_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_USER_DIR_WEB_APPS,
|
||||
"$GNUSTEP_USER_DIR_WEB_APPS",
|
||||
[Built in default value for GNUstep user_dir web apps])
|
||||
|
||||
GNUSTEP_USER_DIR_TOOLS=`echo $GNUSTEP_USER_DIR_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
|
||||
AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_USER_DIR_TOOLS,
|
||||
|
|
|
|||
Loading…
Reference in a new issue