cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* configure.ac: Applied patch by Brad Smith to improve pkg-config

Browse Source 
static linking by adding -lm to Libs.private when needed.
This commit is contained in:
Bob Friesenhahn 2013-03-29 16:50:11 +00:00
parent feb6bd9f1d
commit e90c73e611
4 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2013-03-29 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* configure.ac: Applied patch by Brad Smith to improve pkg-config
static linking by adding -lm to Libs.private when needed.
2013-03-05 Tom Lane <tgl@sss.pgh.pa.us> 2013-03-05 Tom Lane <tgl@sss.pgh.pa.us>
* html/man/tiff2ps.1.html, html/man/tiffcp.1.html, * html/man/tiff2ps.1.html, html/man/tiffcp.1.html,

19
configure vendored
View File

@ -16088,6 +16088,9 @@ fi
AM_BACKSLASH='\' AM_BACKSLASH='\'
tiff_libs_private=
case "${host_os}" in case "${host_os}" in
cygwin* | mingw32* | beos* | darwin*) cygwin* | mingw32* | beos* | darwin*)
;; ;;
@ -16129,20 +16132,18 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
$as_echo "$ac_cv_lib_m_sin" >&6; } $as_echo "$ac_cv_lib_m_sin" >&6; }
if test "x$ac_cv_lib_m_sin" = xyes; then : if test "x$ac_cv_lib_m_sin" = xyes; then :
cat >>confdefs.h <<_ACEOF libm_lib=yes
#define HAVE_LIBM 1 else
_ACEOF libm_lib=no
LIBS="-lm $LIBS"
fi fi
if test "x$libm_lib" = "xyes" ; then
LIBS="-lm $LIBS"
tiff_libs_private="-lm ${tiff_libs_private}"
fi
;; ;;
esac esac
tiff_libs_private=
for ac_header in assert.h fcntl.h io.h limits.h malloc.h search.h sys/time.h unistd.h for ac_header in assert.h fcntl.h io.h limits.h malloc.h search.h sys/time.h unistd.h
do : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

12
configure.ac
View File

@ -154,18 +154,22 @@ LT_LANG([C++])
# Enable support for silent build rules # Enable support for silent build rules
AM_SILENT_RULES AM_SILENT_RULES
tiff_libs_private=
AC_SUBST(tiff_libs_private)
dnl We don't need to add math library to all targets dnl We don't need to add math library to all targets
case "${host_os}" in case "${host_os}" in
cygwin* | mingw32* | beos* | darwin*) cygwin* | mingw32* | beos* | darwin*)
;; ;;
*) *)
AC_CHECK_LIB(m,sin,,,) AC_CHECK_LIB(m,sin,[libm_lib=yes], [libm_lib=no],)
if test "x$libm_lib" = "xyes" ; then
LIBS="-lm $LIBS"
tiff_libs_private="-lm ${tiff_libs_private}"
fi
;; ;;
esac esac
tiff_libs_private=
AC_SUBST(tiff_libs_private)
dnl Checks for header files. dnl Checks for header files.
AC_CHECK_HEADERS([assert.h fcntl.h io.h limits.h malloc.h search.h sys/time.h unistd.h]) AC_CHECK_HEADERS([assert.h fcntl.h io.h limits.h malloc.h search.h sys/time.h unistd.h])

3
libtiff/tif_config.h.in
View File

@ -79,9 +79,6 @@
/* Define to 1 if you have the `lfind' function. */ /* Define to 1 if you have the `lfind' function. */
#undef HAVE_LFIND #undef HAVE_LFIND
/* Define to 1 if you have the `m' library (-lm). */
#undef HAVE_LIBM
/* Define to 1 if you have the <limits.h> header file. */ /* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H #undef HAVE_LIMITS_H