Fixed installation-domains.conf on Windows - merged back the path con…

…figuration into the main configure script to do it. Minor other fixes to configuration.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@30180 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,33 @@
+2010-04-18   Nicola Pero <[email protected]>
+
+	Fixed bug 25356 ("make ignoring installation domain configuration
+	on windows").
+	* configure.ac: Moved the path configuration here so that it is
+	executed at the right time.  Removed duplicated code for all the
+	path config options.  (AC_CONFIG_SUBDIRS): Removed
+	Source/pathconfig.
+	* configure: Regenerated.
+	* config.mak.in: Merged code from
+	Source/pathconfig/pathconfig.mak.in.
+	* Source/pathconfig: Removed.
+	* GNUmakefile: Do not include
+	Source/pathconfig/pathconfig.mak.
+	* Documentation/GNUmakefile: Same change.
+	* NSTimeZones/GNUmakefile: Same change.
+	* Source/GNUmakefile: Same change.
+	* SSL/GNUmakefile: Same change.
+	* Tools/GNUmakefile: Same change.
+	* Source/Makefile.postamble (after-distclean): Do not remove
+	files in pathconfig/.
+	* Source/NSPathUtilities.m: Do not include pathconfig.h.
+	* GNUmakefile: Include config.mak after common.make.
+
+	* configure.ac: Exit immediately if GNUSTEP_MAKEFILES can not be
+	determined.
+	* configure.ac: Fixed determining GNUSTEP_LOCAL_HEADERS and
+	GNUSTEP_LOCAL_LIBRARIES when adding them to CPPFLAGS and LDFLAGS.
+	Add GNUSTEP_NETWORK_HEADERS and GNUSTEP_NETWORK_LIBRARIES as well.
+
 2010-04-18   Nicola Pero <[email protected]>
 
 	* configure.ac (AC_CONFIG_SUBDIRS): Fixed list of subdirs by

Documentation/GNUmakefile

@@ -45,7 +45,6 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 -include ../Version
 -include ../config.mak
--include ../Source/pathconfig/pathconfig.mak
 
 # The documents to be generated
 DOCUMENT_NAME = coding-standards

GNUmakefile

@@ -40,8 +40,6 @@ ifeq ($(GNUSTEP_MAKEFILES),)
   $(error You need to set GNUSTEP_MAKEFILES before compiling!)
 endif
 
--include config.mak
-
 GNUSTEP_CORE_SOFTWARE = YES
 export GNUSTEP_CORE_SOFTWARE
 RPM_DISABLE_RELOCATABLE = YES
@@ -60,9 +58,8 @@ SVN_BASE_URL = svn+ssh://svn.gna.org/svn/gnustep/libs
 GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=base.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
--include Source/pathconfig/pathconfig.mak
-
 include ./Version
+-include config.mak
 
 #
 # The list of subproject directories

Headers/Additions/GNUstepBase/config.h.in

@@ -9,6 +9,159 @@
 /* Define if constructors are automatically loaded */
 #undef CON_AUTOLOAD
 
+/* Built in default value for GNUstep config file */
+#undef GNUSTEP_TARGET_CONFIG_FILE
+
+/* Built in default value for GNUstep local apps */
+#undef GNUSTEP_TARGET_LOCAL_ADMIN_APPS
+
+/* Built in default value for GNUstep local tools */
+#undef GNUSTEP_TARGET_LOCAL_ADMIN_TOOLS
+
+/* Built in default value for GNUstep local apps */
+#undef GNUSTEP_TARGET_LOCAL_APPS
+
+/* Built in default value for GNUstep local documentation */
+#undef GNUSTEP_TARGET_LOCAL_DOC
+
+/* Built in default value for GNUstep local info documentation */
+#undef GNUSTEP_TARGET_LOCAL_DOC_INFO
+
+/* Built in default value for GNUstep local manpages documentation */
+#undef GNUSTEP_TARGET_LOCAL_DOC_MAN
+
+/* Built in default value for GNUstep local headers */
+#undef GNUSTEP_TARGET_LOCAL_HEADERS
+
+/* Built in default value for GNUstep local libraries */
+#undef GNUSTEP_TARGET_LOCAL_LIBRARIES
+
+/* Built in default value for GNUstep local library */
+#undef GNUSTEP_TARGET_LOCAL_LIBRARY
+
+/* Built in default value for GNUstep local tools */
+#undef GNUSTEP_TARGET_LOCAL_TOOLS
+
+/* Built in default value for GNUstep Local Users directory */
+#undef GNUSTEP_TARGET_LOCAL_USERS_DIR
+
+/* Built in default value for GNUstep local web apps */
+#undef GNUSTEP_TARGET_LOCAL_WEB_APPS
+
+/* Built in default value for GNUstep Makefiles */
+#undef GNUSTEP_TARGET_MAKEFILES
+
+/* Built in default value for GNUstep network apps */
+#undef GNUSTEP_TARGET_NETWORK_ADMIN_APPS
+
+/* Built in default value for GNUstep system tools */
+#undef GNUSTEP_TARGET_NETWORK_ADMIN_TOOLS
+
+/* Built in default value for GNUstep network apps */
+#undef GNUSTEP_TARGET_NETWORK_APPS
+
+/* Built in default value for GNUstep network documentation */
+#undef GNUSTEP_TARGET_NETWORK_DOC
+
+/* Built in default value for GNUstep network info documentation */
+#undef GNUSTEP_TARGET_NETWORK_DOC_INFO
+
+/* Built in default value for GNUstep network manpages documentation */
+#undef GNUSTEP_TARGET_NETWORK_DOC_MAN
+
+/* Built in default value for GNUstep network headers */
+#undef GNUSTEP_TARGET_NETWORK_HEADERS
+
+/* Built in default value for GNUstep network libraries */
+#undef GNUSTEP_TARGET_NETWORK_LIBRARIES
+
+/* Built in default value for GNUstep network library */
+#undef GNUSTEP_TARGET_NETWORK_LIBRARY
+
+/* Built in default value for GNUstep network tools */
+#undef GNUSTEP_TARGET_NETWORK_TOOLS
+
+/* Built in default value for GNUstep Network Users directory */
+#undef GNUSTEP_TARGET_NETWORK_USERS_DIR
+
+/* Built in default value for GNUstep network web apps */
+#undef GNUSTEP_TARGET_NETWORK_WEB_APPS
+
+/* Built in default value for GNUstep system apps */
+#undef GNUSTEP_TARGET_SYSTEM_ADMIN_APPS
+
+/* Built in default value for GNUstep system tools */
+#undef GNUSTEP_TARGET_SYSTEM_ADMIN_TOOLS
+
+/* Built in default value for GNUstep system apps */
+#undef GNUSTEP_TARGET_SYSTEM_APPS
+
+/* Built in default value for GNUstep system documentation */
+#undef GNUSTEP_TARGET_SYSTEM_DOC
+
+/* Built in default value for GNUstep system info documentation */
+#undef GNUSTEP_TARGET_SYSTEM_DOC_INFO
+
+/* Built in default value for GNUstep system manpages documentation */
+#undef GNUSTEP_TARGET_SYSTEM_DOC_MAN
+
+/* Built in default value for GNUstep system headers */
+#undef GNUSTEP_TARGET_SYSTEM_HEADERS
+
+/* Built in default value for GNUstep system libraries */
+#undef GNUSTEP_TARGET_SYSTEM_LIBRARIES
+
+/* Built in default value for GNUstep system library */
+#undef GNUSTEP_TARGET_SYSTEM_LIBRARY
+
+/* Built in default value for GNUstep system tools */
+#undef GNUSTEP_TARGET_SYSTEM_TOOLS
+
+/* Built in default value for GNUstep System Users directory */
+#undef GNUSTEP_TARGET_SYSTEM_USERS_DIR
+
+/* Built in default value for GNUstep web apps */
+#undef GNUSTEP_TARGET_SYSTEM_WEB_APPS
+
+/* Built in default value for GNUstep user config file */
+#undef GNUSTEP_TARGET_USER_CONFIG_FILE
+
+/* Built in default value for GNUstep user defaults directory */
+#undef GNUSTEP_TARGET_USER_DEFAULTS_DIR
+
+/* Built in default value for GNUstep user_dir admin apps */
+#undef GNUSTEP_TARGET_USER_DIR_ADMIN_APPS
+
+/* Built in default value for GNUstep user_dir tools */
+#undef GNUSTEP_TARGET_USER_DIR_ADMIN_TOOLS
+
+/* Built in default value for GNUstep user_dir apps */
+#undef GNUSTEP_TARGET_USER_DIR_APPS
+
+/* Built in default value for GNUstep user_dir documentation */
+#undef GNUSTEP_TARGET_USER_DIR_DOC
+
+/* Built in default value for GNUstep user_dir info documentation */
+#undef GNUSTEP_TARGET_USER_DIR_DOC_INFO
+
+/* Built in default value for GNUstep user_dir manpages documentation */
+#undef GNUSTEP_TARGET_USER_DIR_DOC_MAN
+
+/* Built in default value for GNUstep user_dir headers */
+#undef GNUSTEP_TARGET_USER_DIR_HEADERS
+
+/* Built in default value for GNUstep user_dir libraries */
+#undef GNUSTEP_TARGET_USER_DIR_LIBRARIES
+
+/* Built in default value for GNUstep user_dir library */
+#undef GNUSTEP_TARGET_USER_DIR_LIBRARY
+
+/* Built in default value for GNUstep user_dir tools */
+#undef GNUSTEP_TARGET_USER_DIR_TOOLS
+
+/* Built in default value for GNUstep user_dir web apps */
+#undef GNUSTEP_TARGET_USER_DIR_WEB_APPS
+
 /* Define to 1 if you have the <alloca.h> header file. */
 #undef HAVE_ALLOCA_H
 
@@ -474,6 +627,9 @@
 /* Define if your system needs to have short/int word aligned */
 #undef NEED_WORD_ALIGNMENT
 
+/* Disable GNUSTEP_CONFIG_FILE environment variable */
+#undef OPTION_NO_ENVIRONMENT
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
@@ -495,31 +651,31 @@
 /* Define to 1 if the `setpgrp' function takes no argument. */
 #undef SETPGRP_VOID
 
-/* The size of `double', as computed by sizeof. */
+/* The size of a `double', as computed by sizeof. */
 #undef SIZEOF_DOUBLE
 
-/* The size of `float', as computed by sizeof. */
+/* The size of a `float', as computed by sizeof. */
 #undef SIZEOF_FLOAT
 
-/* The size of `int', as computed by sizeof. */
+/* The size of a `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
-/* The size of `long', as computed by sizeof. */
+/* The size of a `long', as computed by sizeof. */
 #undef SIZEOF_LONG
 
-/* The size of `long long', as computed by sizeof. */
+/* The size of a `long long', as computed by sizeof. */
 #undef SIZEOF_LONG_LONG
 
-/* The size of `pthread_cond_t', as computed by sizeof. */
+/* The size of a `pthread_cond_t', as computed by sizeof. */
 #undef SIZEOF_PTHREAD_COND_T
 
-/* The size of `pthread_mutex_t', as computed by sizeof. */
+/* The size of a `pthread_mutex_t', as computed by sizeof. */
 #undef SIZEOF_PTHREAD_MUTEX_T
 
-/* The size of `short', as computed by sizeof. */
+/* The size of a `short', as computed by sizeof. */
 #undef SIZEOF_SHORT
 
-/* The size of `void*', as computed by sizeof. */
+/* The size of a `void*', as computed by sizeof. */
 #undef SIZEOF_VOIDP
 
 /* Define to 1 if you have the ANSI C header files. */
@@ -547,5 +703,5 @@
 #undef inline
 #endif
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t

NSTimeZones/GNUmakefile

@@ -45,7 +45,6 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 -include ../Version
 -include ../config.mak
--include ../Source/pathconfig/pathconfig.mak
 
 libgnustep-base_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 

SSL/GNUmakefile

@@ -48,7 +48,6 @@ GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
 -include ../config.mak
--include ../Source/pathconfig/pathconfig.mak
 -include config.mak
 
 srcdir = .

Source/GNUmakefile

@@ -47,7 +47,6 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 include ../Version
 include ../config.mak
--include pathconfig/pathconfig.mak
 
 # Interface version changes with each minor release
 libgnustep-base_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
@@ -479,7 +478,7 @@ ifeq ($(OBJC2RUNTIME),0)
 SUBPROJECTS = ObjectiveC2
 endif
 SUBPROJECTS += Additions
- 	 
+
 -include Makefile.preamble
 
 include $(GNUSTEP_MAKEFILES)/aggregate.make

Source/Makefile.postamble

@@ -103,11 +103,7 @@ after-clean::
 # Things to do after distcleaning
 after-distclean::
 	rm -f mframe/mframe.h Foundation \
-		NSNumber[0-9]*.m GSValue[0-9]*.m \
-                pathconfig/config.log \
-                pathconfig/config.status \
-                pathconfig/pathconfig.h \
-                pathconfig/pathconfig.mak \
+		NSNumber[0-9]*.m GSValue[0-9]*.m
 	rm -rf $(GNUSTEP_TARGET_DIR)/GNUstepBase
 	rm -rf $(GNUSTEP_TARGET_DIR)/mframe.h
 	rm -rf $(GNUSTEP_TARGET_DIR)/mframe.h

Source/NSPathUtilities.m

@@ -73,8 +73,6 @@
 
 #import "GSPrivate.h"
 
-#include "pathconfig/pathconfig.h"
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>		// for getuid()
 #endif