diff options
Diffstat (limited to 'lib/make/extras/PTHREADS')
-rwxr-xr-x | lib/make/extras/PTHREADS/setup.sh | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/lib/make/extras/PTHREADS/setup.sh b/lib/make/extras/PTHREADS/setup.sh index 52082e6d..3398f89c 100755 --- a/lib/make/extras/PTHREADS/setup.sh +++ b/lib/make/extras/PTHREADS/setup.sh @@ -8,18 +8,22 @@ # @enddesc # @@*/ -if test -n "$PTHREADS" ; then - -echo "Configuring with PTHREADS." +if test "X$PTHREADS" != "Xyes"; then + return +fi + +echo "Configuring with PTHREADS" # Write the data out to the header and make files. -CCTK_WriteLine cctk_Extradefs.h "#define PTHREADS" -CCTK_WriteLine make.extra.defn "PTHREADS_LIBS = pthread" +CCTK_WriteLine cctk_Extradefs.h "#define CCTK_PTHREADS 1" +# the PTHREAD_xxx variables are set by configure +CCTK_WriteLine make.extra.defn "PTHREADS_CFLAGS = $PTHREADS_CFLAGS" +CCTK_WriteLine make.extra.defn "PTHREADS_CXXFLAGS = $PTHREADS_CXXFLAGS" +CCTK_WriteLine make.extra.defn "PTHREADS_LIBS = $PTHREAD_LIBS" CCTK_WriteLine make.extra.defn "" CCTK_WriteLine make.extra.defn "" - -CCTK_WriteLine make.extra.defn 'LIBS += $(PTHREADS_LIBS)' - -fi +CCTK_WriteLine make.extra.defn 'CFLAGS += $(PTHREADS_CFLAGS)' +CCTK_WriteLine make.extra.defn 'CXXFLAGS += $(PTHREADS_CXXFLAGS)' +CCTK_WriteLine make.extra.defn 'LIBS += $(PTHREADS_LIBS)' |