Changeset 42378 for trunk/psLib/configure.ac

Timestamp:

Feb 8, 2023, 11:51:50 AM (3 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20220316. deal with more restrictive gcc / autoconf: add no_warn version of strncpy; mysql removes my_bool after v8.0.0

Location:

trunk/psLib

Files:

• . (modified) (1 prop)
• configure.ac (modified) (11 diffs)

trunk/psLib/configure.ac

@@ -46 +46 @@
 SRCDIRS="sys astro db fft fits imageops jpeg math mathtypes types"   dnl xml
 # escape two escapes at this level so \\ gets passed to the shell and \ to perl
-SRCINC=`echo "${SRCDIRS=}" | ${PERL} -pe "s|(\w+)|-I\\\\${SRCPATH=}/\1|g"`
-SRCINC="-I${SRCPATH=} ${SRCINC=}"
-SRCSUBLIBS=`echo "${SRCDIRS=}" | ${PERL} -pe "s|(\w+)|\1/libpslib\1.la|g"`
-AC_SUBST(SRCSUBLIBS,${SRCSUBLIBS=})
-AC_SUBST(SRCINC,${SRCINC=})
+SRCINC=`echo "${SRCDIRS}" | ${PERL} -pe "s|(\w+)|-I\\\\${SRCPATH}/\1|g"`
+SRCINC="-I${SRCPATH} ${SRCINC}"
+SRCSUBLIBS=`echo "${SRCDIRS}" | ${PERL} -pe "s|(\w+)|\1/libpslib\1.la|g"`
+AC_SUBST(SRCSUBLIBS,${SRCSUBLIBS})
+AC_SUBST(SRCINC,${SRCINC})
 AC_SUBST(ABS_SRCDIR,`pwd`) dnl assuming configure is run in top directory -- is there something better?
 AC_PROG_MAKE_SET
@@ -67 +67 @@
   [AC_MSG_RESULT(memory allocation backtracing enabled)
     AC_DEFINE([PS_MEM_BACKTRACE], 1, [Define to 1 if you want memory backtracing])
-    CFLAGS="${CFLAGS=} -rdynamic"
+    CFLAGS="${CFLAGS} -rdynamic"
   ]
 )
@@ -102 +102 @@
 
 ACX_PTHREAD(
-  [PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${PTHREAD_CFLAGS}"
-    PSLIB_LIBS="${PSLIB_LIBS=} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"],
+  [PSLIB_CFLAGS="${PSLIB_CFLAGS} ${PTHREAD_CFLAGS}"
+    PSLIB_LIBS="${PSLIB_LIBS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"],
   [AC_MSG_ERROR([pthread support is required to build psLib])]
 )
@@ -110 +110 @@
 
 AX_LIB_MYSQL([4.1.2],
-  [PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${MYSQL_CFLAGS} -DHAVE_PSDB"
-    PSLIB_LIBS="${PSLIB_LIBS=} ${MYSQL_LDFLAGS}"],
-  [PSLIB_CFLAGS="${PSLIB_CFLAGS=}"]
+  [PSLIB_CFLAGS="${PSLIB_CFLAGS} ${MYSQL_CFLAGS} -DHAVE_PSDB"
+    PSLIB_LIBS="${PSLIB_LIBS} ${MYSQL_LDFLAGS}"],
+  [PSLIB_CFLAGS="${PSLIB_CFLAGS}"]
 )
 
@@ -125 +125 @@
 PKG_CHECK_MODULES([CFITSIO], [cfitsio], [], AC_MSG_ERROR([CFITSIO package not found.  Obtain CFITSIO at  http://heasarc.gsfc.nasa.gov/docs/software/fitsio]))
 
-PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${CFITSIO_CFLAGS}"
-PSLIB_LIBS="${PSLIB_LIBS=} ${CFITSIO_LIBS}"
-
-CFLAGS="${CFLAGS=} ${CFITSIO_CFLAGS}"
-LDFLAGS="${LDFLAGS=} ${CFITSIO_LIBS}"
+PSLIB_CFLAGS="${PSLIB_CFLAGS} ${CFITSIO_CFLAGS}"
+PSLIB_LIBS="${PSLIB_LIBS} ${CFITSIO_LIBS}"
+
+CFLAGS="${CFLAGS} ${CFITSIO_CFLAGS}"
+LDFLAGS="${LDFLAGS} ${CFITSIO_LIBS}"
 
 dnl Now check if CFITSIO supports fits_open_diskfile, i.e., is at least version 2.501
@@ -159 +159 @@
 PKG_CHECK_MODULES([FFTW3], [fftw3f], [], AC_MSG_ERROR([FFTW version 3 (--enable-float) library not found.  Obtain it at http://www.fftw.org/]))
 
-PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${FFTW3_CFLAGS}"
-PSLIB_LIBS="${PSLIB_LIBS=} ${FFTW3_LIBS}"
+PSLIB_CFLAGS="${PSLIB_CFLAGS} ${FFTW3_CFLAGS}"
+PSLIB_LIBS="${PSLIB_LIBS} ${FFTW3_LIBS}"
 
 CFLAGS="${CFLAGS} ${FFTW3_CFLAGS}"
@@ -190 +190 @@
 PKG_CHECK_MODULES([GSL], [gsl], [], AC_MSG_ERROR([GSL is required.  Obtain it at http://www.gnu.org/software/gsl]))
 
-PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${GSL_CFLAGS}"
-PSLIB_LIBS="${PSLIB_LIBS=} ${GSL_LIBS}"
+PSLIB_CFLAGS="${PSLIB_CFLAGS} ${GSL_CFLAGS}"
+PSLIB_LIBS="${PSLIB_LIBS} ${GSL_LIBS}"
 
 AC_SUBST([GSL_CFLAGS])
@@ -303 +303 @@
 LDFLAGS="${LDFLAGS} ${JPEG_LDFLAGS}"
 
-AC_CHECK_HEADERS([jpeglib.h],[PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${JPEG_CFLAGS}"
+AC_CHECK_HEADERS([jpeglib.h],[PSLIB_CFLAGS="${PSLIB_CFLAGS} ${JPEG_CFLAGS}"
                               AC_SUBST(JPEG_CFLAGS)],
   [AC_MSG_ERROR([libjpeg headers not found.  Obtain libjpeg from http://www.ijg.org/ or use --with-jpeg to specify location.])]
 )
 
-AC_CHECK_LIB(jpeg,jpeg_CreateCompress,[PSLIB_LIBS="${PSLIB_LIBS=} ${JPEG_LDFLAGS} -ljpeg"],
+AC_CHECK_LIB(jpeg,jpeg_CreateCompress,[PSLIB_LIBS="${PSLIB_LIBS} ${JPEG_LDFLAGS} -ljpeg"],
   [AC_MSG_ERROR([libjpeg library not found.  Obtain libjpeg from http://www.ijg.org/ or use --with-jpeg to specify location.])]
 )
@@ -391 +391 @@
   AC_CHECK_FILE($SWIG,[],
      [AC_MSG_ERROR([SWIG is required.  Obtain it at www.swig.org or use --with-swig to specify its install location.])])
-  SUBDIR="${SUBDIR=} swig"
+  SUBDIR="${SUBDIR} swig"
 
 dnl restore the CFLAGS/LDFLAGS
@@ -433 +433 @@
 
 AC_CHECK_LIB(mx,sqrtf,
-  [PSLIB_LIBS="${PSLIB_LIBS=} -lmx"])
+  [PSLIB_LIBS="${PSLIB_LIBS} -lmx"])
 LIBS=${TMP_LIBS}
 AC_CHECK_FUNC(atoll, [],
@@ -474 +474 @@
 IPP_STDOPTS
 IPP_STDCFLAGS
-CFLAGS="${CFLAGS=} -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112L"
+CFLAGS="${CFLAGS} -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112L"
 
 dnl ---------------- export variables --------------------