Commit b9a2bbee authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Rename THREADS_LDFLAGS to THREADS_LIBS.

* Also write value of THREADS_LIBS to pkgconfig variable threads_libs.
parent 21f33ebb
......@@ -221,7 +221,7 @@ SYSTEM_TYPE = @SYSTEM_TYPE@
SZLIB_INCLUDE = @SZLIB_INCLUDE@
SZLIB_LDFLAGS = @SZLIB_LDFLAGS@
THREADS_INCLUDE = @THREADS_INCLUDE@
THREADS_LDFLAGS = @THREADS_LDFLAGS@
THREADS_LIBS = @THREADS_LIBS@
USER_NAME = @USER_NAME@
VERSION = @VERSION@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
......
......@@ -199,7 +199,7 @@ SYSTEM_TYPE = @SYSTEM_TYPE@
SZLIB_INCLUDE = @SZLIB_INCLUDE@
SZLIB_LDFLAGS = @SZLIB_LDFLAGS@
THREADS_INCLUDE = @THREADS_INCLUDE@
THREADS_LDFLAGS = @THREADS_LDFLAGS@
THREADS_LIBS = @THREADS_LIBS@
USER_NAME = @USER_NAME@
VERSION = @VERSION@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
......
......@@ -25,7 +25,7 @@
"extra" : "@ENABLE_EXTRA@",
"ieg" : "@ENABLE_IEG@",
"threads" : {
"lib" : "@THREADS_LDFLAGS@",
"lib" : "@THREADS_LIBS@",
"include" : "@THREADS_INCLUDE@"
},
"zlib" : {
......
......@@ -657,8 +657,8 @@ SZLIB_INCLUDE
SZLIB_LDFLAGS
ZLIB_LDFLAGS
ZLIB_INCLUDE
THREADS_LIBS
THREADS_INCLUDE
THREADS_LDFLAGS
PTHREAD_CFLAGS
PTHREAD_LIBS
PTHREAD_CC
......@@ -23954,6 +23954,7 @@ else
with_threads=yes
fi
 
THREADS_LIBS=''
case $with_threads in #(
no) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking multithreading" >&5
......@@ -24320,7 +24321,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"
$as_echo "CC:$CC CFLAGS:$CFLAGS LIBS:$LIBS"
;; #(
*) :
THREADS_ROOT=$with_threads
......@@ -24383,13 +24383,13 @@ _ACEOF
 
fi
 
THREADS_LDFLAGS=" -L$THREADS_ROOT/lib -lpthread"
THREADS_LIBS=" -L$THREADS_ROOT/lib -lpthread"
THREADS_INCLUDE=" -I$THREADS_ROOT/include"
;; #(
*) :
;;
esac
# ----------------------------------------------------------------------
# Link application to ZLIB library, needed for netcdf
 
......@@ -24632,7 +24632,7 @@ fi
fi
 
# ----------------------------------------------------------------------
# Compile application with SZLIB library, nedded for GRIB1 or for linking against hdf5/netcdf4
# Compile application with SZLIB library, needed for GRIB1 or for linking against hdf5/netcdf4
 
# Check whether --with-szlib was given.
if test "${with_szlib+set}" = set; then :
......
......@@ -228,7 +228,7 @@ SYSTEM_TYPE = @SYSTEM_TYPE@
SZLIB_INCLUDE = @SZLIB_INCLUDE@
SZLIB_LDFLAGS = @SZLIB_LDFLAGS@
THREADS_INCLUDE = @THREADS_INCLUDE@
THREADS_LDFLAGS = @THREADS_LDFLAGS@
THREADS_LIBS = @THREADS_LIBS@
USER_NAME = @USER_NAME@
VERSION = @VERSION@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
......
......@@ -216,7 +216,7 @@ SYSTEM_TYPE = @SYSTEM_TYPE@
SZLIB_INCLUDE = @SZLIB_INCLUDE@
SZLIB_LDFLAGS = @SZLIB_LDFLAGS@
THREADS_INCLUDE = @THREADS_INCLUDE@
THREADS_LDFLAGS = @THREADS_LDFLAGS@
THREADS_LIBS = @THREADS_LIBS@
USER_NAME = @USER_NAME@
VERSION = @VERSION@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
......
......@@ -7,6 +7,7 @@ AC_ARG_WITH([threads],
[Compile + link for multithreading [default=yes]])],
[],
[with_threads=yes])
THREADS_LIBS=''
AS_CASE([$with_threads],
[no],[AC_MSG_CHECKING([multithreading])
AC_MSG_RESULT([suppressed])],
......@@ -15,15 +16,15 @@ AS_CASE([$with_threads],
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"
AS_ECHO(["CC:$CC CFLAGS:$CFLAGS LIBS:$LIBS"])
AC_SUBST([THREADS_LDFLAGS],[])
AC_SUBST([THREADS_INCLUDE],[])],
[*],[THREADS_ROOT=$with_threads
LDFLAGS="-L$THREADS_ROOT/lib $LDFLAGS"
CPPFLAGS="-I$THREADS_ROOT/include $CPPFLAGS "
AC_CHECK_HEADERS(pthread.h)
AC_CHECK_LIB([pthread],[pthread_create])
AC_SUBST([THREADS_LDFLAGS],[" -L$THREADS_ROOT/lib -lpthread"])
THREADS_LIBS=" -L$THREADS_ROOT/lib -lpthread"
AC_SUBST([THREADS_INCLUDE],[" -I$THREADS_ROOT/include"])])
AC_SUBST([THREADS_LIBS])
# ----------------------------------------------------------------------
# Link application to ZLIB library, needed for netcdf
AC_ARG_WITH([zlib],
......
......@@ -222,7 +222,7 @@ SYSTEM_TYPE = @SYSTEM_TYPE@
SZLIB_INCLUDE = @SZLIB_INCLUDE@
SZLIB_LDFLAGS = @SZLIB_LDFLAGS@
THREADS_INCLUDE = @THREADS_INCLUDE@
THREADS_LDFLAGS = @THREADS_LDFLAGS@
THREADS_LIBS = @THREADS_LIBS@
USER_NAME = @USER_NAME@
VERSION = @VERSION@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
......
......@@ -4,9 +4,9 @@ libdir=@libdir@
includedir=@includedir@
cflags=-I@includedir@
fcflags=@FPP_INCOPT@@includedir@ @CDI_F90_INTERFACE_FCFLAGS@
libs=-L@libdir@ -lcdi @GRIB_API_LDFLAGS@ @JASPER_LDFLAGS@ @NETCDF_LDFLAGS@ @HDF5_LDFLAGS@ @SZLIB_LDFLAGS@ @ZLIB_LDFLAGS@ @THREADS_LDFLAGS@
libs=-L@libdir@ -lcdi @GRIB_API_LDFLAGS@ @JASPER_LDFLAGS@ @NETCDF_LDFLAGS@ @HDF5_LDFLAGS@ @SZLIB_LDFLAGS@ @ZLIB_LDFLAGS@ @THREADS_LIBS@
netcdf_root=@NETCDF_ROOT@
threads_libs=@THREADS_LIBS@
Name: @PACKAGE_NAME@
......
......@@ -185,7 +185,7 @@ SYSTEM_TYPE = @SYSTEM_TYPE@
SZLIB_INCLUDE = @SZLIB_INCLUDE@
SZLIB_LDFLAGS = @SZLIB_LDFLAGS@
THREADS_INCLUDE = @THREADS_INCLUDE@
THREADS_LDFLAGS = @THREADS_LDFLAGS@
THREADS_LIBS = @THREADS_LIBS@
USER_NAME = @USER_NAME@
VERSION = @VERSION@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment