From 9520c4be9f067355f1cd21dfe3862db67f841218 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Fri, 28 Oct 2005 21:28:00 +0000 Subject: [PATCH] Removed references to POSIX=YES/NO. --- configure/CONFIG_COMMON | 5 ----- configure/os/CONFIG.Common.aix-ppc | 5 ++--- configure/os/CONFIG.Common.cygwin-x86 | 9 ++++----- configure/os/CONFIG.Common.linux-x86-borland | 3 +-- configure/os/CONFIG.Common.linuxCommon | 5 ++--- configure/os/CONFIG.Common.solaris-sparc | 6 +++--- configure/os/CONFIG.Common.solaris-x86 | 6 +++--- configure/os/CONFIG.Common.vxWorks6Common | 3 +-- configure/os/CONFIG.Common.vxWorksCommon | 3 +-- configure/os/CONFIG.Common.win32-x86-mingw | 2 +- configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu | 2 +- 11 files changed, 19 insertions(+), 30 deletions(-) diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index fa5b82bed..19187f746 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -233,11 +233,6 @@ WARN_CXXFLAGS = $(WARN_CXXFLAGS_$($(BUILD_CLASS)_WARN)) OPT_CFLAGS = $(OPT_CFLAGS_$($(BUILD_CLASS)_OPT)) OPT_CXXFLAGS = $(OPT_CXXFLAGS_$($(BUILD_CLASS)_OPT)) -# Posix flags -POSIX=YES -POSIX_CPPFLAGS=$(POSIX_CPPFLAGS_$(POSIX)) -POSIX_LDLIBS=$(POSIX_LDLIBS_$(POSIX)) - # Static build flags STATIC_CFLAGS = $(STATIC_CFLAGS_$(STATIC_BUILD)) STATIC_CXXCFLAGS = $(STATIC_CXXFLAGS_$(STATIC_BUILD)) diff --git a/configure/os/CONFIG.Common.aix-ppc b/configure/os/CONFIG.Common.aix-ppc index 8357941ec..683eb8c15 100644 --- a/configure/os/CONFIG.Common.aix-ppc +++ b/configure/os/CONFIG.Common.aix-ppc @@ -17,9 +17,8 @@ ARCH_CLASS = ppc CODE_CPPFLAGS = -D_REENTRANT -POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500 -D_ALL_SOURCE -POSIX_CPPFLAGS_NO = -POSIX_LDLIBS_YES = -lpthread +POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500 -D_ALL_SOURCE +POSIX_LDLIBS = -lpthread #SHARED_LIBRARIES=NO diff --git a/configure/os/CONFIG.Common.cygwin-x86 b/configure/os/CONFIG.Common.cygwin-x86 index 36c083a01..7cf061514 100644 --- a/configure/os/CONFIG.Common.cygwin-x86 +++ b/configure/os/CONFIG.Common.cygwin-x86 @@ -17,11 +17,10 @@ EXE=.exe COMPILER_CPPFLAGS = -D_REENTRANT -#POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE=199506L -D_POSIX_THREADS -D_POSIX_TIMERS +#POSIX_CPPFLAGS = -D_POSIX_SOURCE=199506L -D_POSIX_THREADS -D_POSIX_TIMERS # _POSIX_SOURCE eliminates select() -POSIX_CPPFLAGS_YES = -D_POSIX_THREADS -D_POSIX_TIMERS -#POSIX_LDLIBS_YES += -lpthread -POSIX_LDLIBS_YES += -lpthread +POSIX_CPPFLAGS = -D_POSIX_THREADS -D_POSIX_TIMERS +POSIX_LDLIBS += -lpthread ARCH_DEP_CPPFLAGS += -D_X86_ @@ -33,5 +32,5 @@ RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%) # Definitions used when COMMANDLINE_LIBRARY is READLINE INCLUDES_READLINE = -I$(GNU_DIR)/include LDFLAGS_READLINE += -L$(GNU_DIR)/lib -LDLIBS_READLINE = -lcygreadline5 -lcygcurses7 +LDLIBS_READLINE = -lreadline diff --git a/configure/os/CONFIG.Common.linux-x86-borland b/configure/os/CONFIG.Common.linux-x86-borland index 76259445c..e12e048b6 100644 --- a/configure/os/CONFIG.Common.linux-x86-borland +++ b/configure/os/CONFIG.Common.linux-x86-borland @@ -13,8 +13,7 @@ include $(CONFIG)/os/CONFIG.Common.UnixCommon OS_CLASS = Linux ARCH_CLASS = x86 -POSIX_CPPFLAGS_NO = -POSIX_LDLIBS_YES = libpthread.so +POSIX_LDLIBS = libpthread.so OP_SYS_CPPFLAGS += -D_BSD_SOURCE -D_SVID_SOURCE OP_SYS_CPPFLAGS += -Dlinux diff --git a/configure/os/CONFIG.Common.linuxCommon b/configure/os/CONFIG.Common.linuxCommon index 830eeb6de..fafa7f9dc 100644 --- a/configure/os/CONFIG.Common.linuxCommon +++ b/configure/os/CONFIG.Common.linuxCommon @@ -14,9 +14,8 @@ OS_CLASS = Linux CODE_CPPFLAGS = -D_REENTRANT -POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500 -POSIX_CPPFLAGS_NO = -POSIX_LDLIBS_YES = -lpthread +POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500 +POSIX_LDLIBS = -lpthread # -D_BSD_SOURCE for gethostname() in unistd.h as needed by cacChannelIO.cpp. OP_SYS_CPPFLAGS += -D_BSD_SOURCE diff --git a/configure/os/CONFIG.Common.solaris-sparc b/configure/os/CONFIG.Common.solaris-sparc index 7bda34afe..59bb36278 100644 --- a/configure/os/CONFIG.Common.solaris-sparc +++ b/configure/os/CONFIG.Common.solaris-sparc @@ -20,9 +20,9 @@ COMPILER_LDFLAGS += -mt SOLARIS_VERSION = $(subst 5.,,$(shell uname -r)) -POSIX_CPPFLAGS_YES += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_YES_$(SOLARIS_VERSION)) -POSIX_CPPFLAGS_YES += -D_XOPEN_SOURCE=500 -POSIX_LDLIBS_YES += -lposix4 -lpthread $(POSIX_LDLIBS_YES_$(SOLARIS_VERSION)) +POSIX_CPPFLAGS += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_YES_$(SOLARIS_VERSION)) +POSIX_CPPFLAGS += -D_XOPEN_SOURCE=500 +POSIX_LDLIBS += -lposix4 -lpthread $(POSIX_LDLIBS_YES_$(SOLARIS_VERSION)) OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) $(COMPILER_CPPFLAGS) OP_SYS_LDFLAGS += $(COMPILER_LDFLAGS) diff --git a/configure/os/CONFIG.Common.solaris-x86 b/configure/os/CONFIG.Common.solaris-x86 index 07de71f04..0601b60bd 100644 --- a/configure/os/CONFIG.Common.solaris-x86 +++ b/configure/os/CONFIG.Common.solaris-x86 @@ -20,9 +20,9 @@ COMPILER_LDFLAGS += -mt SOLARIS_VERSION = $(subst 5.,,$(shell uname -r)) -POSIX_CPPFLAGS_YES += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_YES_$(SOLARIS_VERSION)) -POSIX_CPPFLAGS_YES += -D_XOPEN_SOURCE=500 -POSIX_LDLIBS_YES += -lposix4 -lpthread $(POSIX_LDLIBS_YES_$(SOLARIS_VERSION)) +POSIX_CPPFLAGS += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_$(SOLARIS_VERSION)) +POSIX_CPPFLAGS += -D_XOPEN_SOURCE=500 +POSIX_LDLIBS += -lposix4 -lpthread $(POSIX_LDLIBS_$(SOLARIS_VERSION)) OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) $(COMPILER_CPPFLAGS) OP_SYS_LDFLAGS += $(COMPILER_LDFLAGS) diff --git a/configure/os/CONFIG.Common.vxWorks6Common b/configure/os/CONFIG.Common.vxWorks6Common index 1705a55eb..1f13f1680 100644 --- a/configure/os/CONFIG.Common.vxWorks6Common +++ b/configure/os/CONFIG.Common.vxWorks6Common @@ -122,8 +122,7 @@ CODE_CXXFLAGS = -fno-implicit-templates #-------------------------------------------------- # posix c preprocessor flags -POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE -POSIX_CPPFLAGS_NO = +POSIX_CPPFLAGS = -D_POSIX_SOURCE #-------------------------------------------------- # no shared libs for vxWorks diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index 696232556..25efb8ecb 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -119,8 +119,7 @@ CODE_CXXFLAGS = -fno-implicit-templates #-------------------------------------------------- # posix c preprocessor flags -POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE -POSIX_CPPFLAGS_NO = +POSIX_CPPFLAGS = -D_POSIX_SOURCE #-------------------------------------------------- # no shared libs for vxWorks diff --git a/configure/os/CONFIG.Common.win32-x86-mingw b/configure/os/CONFIG.Common.win32-x86-mingw index 796e0db1d..5bc450d64 100644 --- a/configure/os/CONFIG.Common.win32-x86-mingw +++ b/configure/os/CONFIG.Common.win32-x86-mingw @@ -15,7 +15,7 @@ ARCH_CLASS = x86 EXE=.exe -POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE +POSIX_CPPFLAGS = -D_POSIX_SOURCE ARCH_DEP_CPPFLAGS += -D_X86_ diff --git a/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu b/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu index 7326bea09..c51c71aa9 100644 --- a/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu +++ b/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu @@ -21,7 +21,7 @@ STATIC_LDLIBS_YES = -Wl,-a,default STATIC_LDLIBS_NO = # Switch explicitly from default DCE threads to posix threads -POSIX_CPPFLAGS_YES += -D_REENTRANT -D_PTHREADS -D_POSIX_C_SOURCE=199506L +POSIX_CPPFLAGS += -D_REENTRANT -D_PTHREADS -D_POSIX_C_SOURCE=199506L USR_SYS_LIBS += pthread # C++ templates need PIC definition also in link phase