ChangeLogTag: 'head -1 ChangeLog'

7 files changed, 127 insertions, 133 deletions

diff --git a/ChangeLog b/ChangeLog
index 56a618725bf..2e1e1fc80ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Jul 14 19:31:39 2000  Eric Ding  <qnd1@cs.wustl.edu>
+
+        * ace/config-linux.h
+        * ace/config-linux-lxpthreads.h
+        * include/makeinclude/platform_linux.GNU
+        * include/makeinclude/platform_linux_lxpthreads.GNU
+
+        Changing the default config/platform setting to thread enable on Linux
+
 Fri Jul 14 19:03:49 2000  John Heitmann  <jwh1@cs.wustl.edu>
 
         * include/makeinclude/warpepr_macros.GNU:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 56a618725bf..2e1e1fc80ff 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Fri Jul 14 19:31:39 2000  Eric Ding  <qnd1@cs.wustl.edu>
+
+        * ace/config-linux.h
+        * ace/config-linux-lxpthreads.h
+        * include/makeinclude/platform_linux.GNU
+        * include/makeinclude/platform_linux_lxpthreads.GNU
+
+        Changing the default config/platform setting to thread enable on Linux
+
 Fri Jul 14 19:03:49 2000  John Heitmann  <jwh1@cs.wustl.edu>
 
         * include/makeinclude/warpepr_macros.GNU:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 56a618725bf..2e1e1fc80ff 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,12 @@
+Fri Jul 14 19:31:39 2000  Eric Ding  <qnd1@cs.wustl.edu>
+
+        * ace/config-linux.h
+        * ace/config-linux-lxpthreads.h
+        * include/makeinclude/platform_linux.GNU
+        * include/makeinclude/platform_linux_lxpthreads.GNU
+
+        Changing the default config/platform setting to thread enable on Linux
+
 Fri Jul 14 19:03:49 2000  John Heitmann  <jwh1@cs.wustl.edu>
 
         * include/makeinclude/warpepr_macros.GNU:
diff --git a/ace/config-linux-lxpthreads.h b/ace/config-linux-lxpthreads.h
index 67dc61fac7f..4133f5ec84f 100644
--- a/ace/config-linux-lxpthreads.h
+++ b/ace/config-linux-lxpthreads.h
@@ -1,51 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
 
-/* The following configuration file is designed to work for Linux
-   platforms using GNU C++ and Xavier Leroy's pthreads package.  For
-   more information you should check out his Web site:
+/*This file is here for backward compatibility*/
 
-   http://pauillac.inria.fr/~xleroy/linuxthreads/
-*/
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-#include "ace/pre.h"
-
-#include "ace/config-linux-common.h"
-
-#define ACE_HAS_SVR4_DYNAMIC_LINKING
-#define ACE_HAS_AUTOMATIC_INIT_FINI
-
-// Yes, we do have threads.
-#define ACE_HAS_THREADS
-// And they're even POSIX pthreads (LinuxThreads implementation)
-#define ACE_HAS_PTHREADS
-// ... and the final standard even!
-#define ACE_HAS_PTHREADS_STD
-
-#if !defined (ACE_MT_SAFE)
-#define ACE_MT_SAFE 1                           // JCEJ 12/22/96        #1
-#endif
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE         // jcej 12/22/96        #2
-
-#define ACE_LACKS_THREAD_STACK_ADDR             // JCEJ 12/17/96
-#define ACE_LACKS_THREAD_STACK_SIZE             // JCEJ 12/17/96
-
-#define ACE_LACKS_RWLOCK_T                      // JCEJ 12/23/96        #1
-#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS    // JCEJ 1/7-8/96
-
-#if defined(__GLIBC__)
-// Platform supports reentrant functions (i.e., all the POSIX *_r
-// functions).
-#define ACE_HAS_REENTRANT_FUNCTIONS
-// getprotobyname_r have a different signature!
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-// uses ctime_r & asctime_r with only two parameters vs. three
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-#endif
-
-#include /**/ <pthread.h>
-
-#include "ace/post.h"
-#endif /* ACE_CONFIG_H */
+#include "ace/config-linux.h"
diff --git a/ace/config-linux.h b/ace/config-linux.h
index 2f8b40a0ceb..b1b65b6818f 100644
--- a/ace/config-linux.h
+++ b/ace/config-linux.h
@@ -13,5 +13,38 @@
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 
+#if !defined (ACE_MT_SAFE)
+#define ACE_MT_SAFE 1                           // JCEJ 12/22/96        #1
+#endif
+
+#if ACE_MT_SAFE
+// Yes, we do have threads.
+#define ACE_HAS_THREADS
+// And they're even POSIX pthreads (LinuxThreads implementation)
+#define ACE_HAS_PTHREADS
+
+// ... and the final standard even!
+#define ACE_HAS_PTHREADS_STD
+#define ACE_HAS_THREAD_SPECIFIC_STORAGE     // jcej 12/22/96         #2
+
+#define ACE_LACKS_THREAD_STACK_ADDR             // JCEJ 12/17/96
+#define ACE_LACKS_THREAD_STACK_SIZE             // JCEJ 12/17/96
+
+#define ACE_LACKS_RWLOCK_T                      // JCEJ 12/23/96        #1
+#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS    // JCEJ 1/7-8/96
+
+#if defined(__GLIBC__)
+// Platform supports reentrant functions (i.e., all the POSIX *_r
+// functions).
+#define ACE_HAS_REENTRANT_FUNCTIONS
+// getprotobyname_r have a different signature!
+#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
+// uses ctime_r & asctime_r with only two parameters vs. three
+#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
+#endif
+#include /**/ <pthread.h>
+#endif /*ACE_MT_SAFE*/
+
+
 #include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index 5c59e55f48e..5653628b1a7 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -3,26 +3,86 @@
 # According to Bryon G. Rigg <bgrigg@opus.bcbnet.com>, this file
 # should allow ACE to be built on Linux.
 
-debug = 1
-optimize = 1
+# debug = 1
+# optimize = 1
+
+ifeq (,$(debug))
+  debug = 1
+endif
+ifeq (,$(optimize))
+  optimize = 1
+endif
+ifeq (,$(threads))
+  threads = 1
+endif
+ifeq ($(threads),0)
+  CFLAGS += -DACE_MT_SAFE=0
+endif # threads
+
+ifeq ($(threads),1)
+   xt_reactor =0
+   fl_reactor =0
+   PLATFORM_XT_CPPFLAGS=
+   PLATFORM_XT_LIBS=-lXt  
+   PLATFORM_XT_LDFLAGS=
+
+   PLATFORM_FL_CPPFLAGS=
+   PLATFORM_FL_LIBS=-lfltk
+   PLATFORM_FL_LDFLAGS=
+
+   PLATFORM_X11_CPPFLAGS=-I/usr/X11R6/include
+   PLATFORM_X11_LIBS=-lX11
+   PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib
+
+   PLATFORM_GL_CPPFLAGS=
+   PLATFORM_GL_LIBS=-lGL
+   PLATFORM_GL_LDFLAGS= 
+
+   PLATFORM_AIO_SUPPORT := \
+   $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
+endif
 
 CC      = gcc
 CXX     = g++
 CFLAGS  += -W -Wall -Wpointer-arith -pipe
+ifeq ($(threads),1)
+    CFLAGS  += -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT \
+               $(PLATFORM_AIO_SUPPORT)
+endif # threads
+
 CCFLAGS += $(CFLAGS) -fno-implicit-templates
 DCFLAGS += -g
 DLD     = $(CXX)
 LD      = $(CXX)
 LIBS    += -ldl
+
+ifeq ($(threads),1) 
+  LIBS += -lpthread
+  ifeq (-DACE_HAS_AIO_CALLS,$(PLATFORM_AIO_SUPPORT))
+    LIBS += -lrt
+  endif
+endif 
+
 OCFLAGS += -O3
 PIC     = -fPIC
 AR      = ar
 ARFLAGS = rsuv
 RANLIB  = @true
 SOFLAGS = $(CPPFLAGS) -shared
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
+SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \
+          $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
 PRELIB  = @true
 
+# Added line below to support "Executable Shared Object" files (as
+# needed by the service configurator).
+# Marius Kjeldahl <mariusk@sn.no, marius@funcom.com>
+ifeq ($(threads),1) 
+    ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $<
+    ifndef PRELIB
+       PRELIB = @true
+    endif # ! PRELIB
+endif
+
 #### GNU gas has a string limit of 4096 characters.  On Alphas,
 #### builds will fail due to running over that limit.  There are
 #### at least two workarounds:
diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU
index d246985f2b2..87346836efb 100644
--- a/include/makeinclude/platform_linux_lxpthreads.GNU
+++ b/include/makeinclude/platform_linux_lxpthreads.GNU
@@ -1,86 +1,5 @@
 # $Id$
 
-# For pthreads support on Linux, you need
-# -D_POSIX_THREADS
-# -D_POSIX_THREAD_SAFE_FUNCTIONS
-# in the CXX command line. Also, add -lpthreads to the LIBS.
-# libpthreads.so comes with the sources of Linux libc-5.3.*, you need
-# to compile it yourself (no binaries included) --
-# Jan Rychter <jwr@icm.edu.pl>
+# This file is here for backward compatibility.
 
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(optimize))
-  optimize = 1
-endif
-  xt_reactor = 0
-
-PLATFORM_XT_CPPFLAGS=
-PLATFORM_XT_LIBS=-lXt
-PLATFORM_XT_LDFLAGS=
-
-fl_reactor = 0
-
-PLATFORM_FL_CPPFLAGS=
-PLATFORM_FL_LIBS=-lfltk
-PLATFORM_FL_LDFLAGS=
-
-PLATFORM_X11_CPPFLAGS=-I/usr/X11R6/include
-PLATFORM_X11_LIBS=-lX11
-PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib
-
-PLATFORM_GL_CPPFLAGS=
-PLATFORM_GL_LIBS=-lGL
-PLATFORM_GL_LDFLAGS=
-
-PLATFORM_AIO_SUPPORT := \
-  $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
-
-ifeq ($(NO_IMPLICIT_TEMPLATES),)
-      NO_IMPLICIT_TEMPLATES = -fno-implicit-templates
-endif
-
-CC      = gcc
-CXX     = g++
-CFLAGS  += -W -Wall -pipe \
-           -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT \
-           $(PLATFORM_AIO_SUPPORT)
-CCFLAGS += $(CFLAGS) $(NO_IMPLICIT_TEMPLATES)
-DCFLAGS += -g
-DLD     = $(CXX)
-LD      = $(CXX)
-LIBS    += -ldl -lpthread
-ifeq (-DACE_HAS_AIO_CALLS,$(PLATFORM_AIO_SUPPORT))
-  LIBS += -lrt
-endif
-OCFLAGS += -O3
-PCFLAGS  = -pg
-PCCFLAGS = -pg
-PIC     = -fPIC
-AR      = ar
-ARFLAGS = rsuv
-RANLIB  = @true
-SOFLAGS = $(CPPFLAGS) -shared
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
-          $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
-# Added line below to support "Executable Shared Object" files (as
-# needed by the service configurator).
-# Marius Kjeldahl <mariusk@sn.no, marius@funcom.com>
-ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $<
-ifndef PRELIB
-  PRELIB = @true
-endif # ! PRELIB
-
-
-#### GNU gas has a string limit of 4096 characters.  On Alphas,
-#### builds will fail due to running over that limit.  There are
-#### at least two workarounds:
-#### 1) Change the limit to 8192 characters and rebuild gas.  See
-####    ACE-INSTALL.html for more information.
-#### 2) Don't use -g when compiling those files.
-#### If you're building on an Alpha and you haven't hacked and
-#### rebuilt gas, you might need to uncomment the following.
-#### ifeq ($(debug),1)
-####   SUPPRESS_DASH_G = 1
-#### endif # debug
+include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU