Permalink
Browse files

Fix build failure on some platforms by explicitly listing libm (-lm) …

…in LDADD src/Makefile.am.
  • Loading branch information...
1 parent 5558a7c commit 96adb416733213c6c5a1450bb14246ee38150fb8 @bootchk committed Dec 16, 2011
Showing with 38 additions and 35 deletions.
  1. +33 −33 autom4te.cache/requests
  2. +4 −1 src/Makefile.am
  3. +1 −1 src/Makefile.in
View
@@ -15,25 +15,25 @@
'configure.ac'
],
{
- 'AM_PROG_F77_C_O' => 1,
'_LT_AC_TAGCONFIG' => 1,
- 'm4_pattern_forbid' => 1,
+ 'AM_PROG_F77_C_O' => 1,
'AC_INIT' => 1,
- '_AM_COND_IF' => 1,
+ 'm4_pattern_forbid' => 1,
'AC_CANONICAL_TARGET' => 1,
- 'AC_SUBST' => 1,
+ '_AM_COND_IF' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
- 'AC_FC_SRCEXT' => 1,
+ 'AC_SUBST' => 1,
'AC_CANONICAL_HOST' => 1,
+ 'AC_FC_SRCEXT' => 1,
'AC_PROG_LIBTOOL' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
- 'AC_REQUIRE_AUX_FILE' => 1,
'AC_CONFIG_LINKS' => 1,
- 'LT_SUPPORTED_TAG' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
'm4_sinclude' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
'AM_MAINTAINER_MODE' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'_m4_warn' => 1,
@@ -46,17 +46,17 @@
'include' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_LIBSOURCE' => 1,
- 'AM_PROG_FC_C_O' => 1,
'AC_CANONICAL_BUILD' => 1,
+ 'AM_PROG_FC_C_O' => 1,
'AC_FC_FREEFORM' => 1,
'AH_OUTPUT' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
'AC_CONFIG_AUX_DIR' => 1,
- 'm4_pattern_allow' => 1,
- 'sinclude' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
'AM_PROG_CC_C_O' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
+ 'sinclude' => 1,
+ 'm4_pattern_allow' => 1,
'AM_CONDITIONAL' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'm4_include' => 1,
@@ -125,8 +125,8 @@
'AM_SET_LEADING_DOT' => 1,
'AM_SET_DEPDIR' => 1,
'_AM_DEPENDENCIES' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
'm4_include' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AU_DEFUN' => 1,
'AM_MAKE_INCLUDE' => 1
@@ -170,14 +170,14 @@
{
'IT_PROG_INTLTOOL' => 1,
'm4_pattern_forbid' => 1,
- 'jm_MAINTAINER_MODE' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'jm_MAINTAINER_MODE' => 1,
'_AM_SET_OPTION' => 1,
'AC_DEFUN' => 1,
'GLIB_RUN_PROG' => 1,
'AM_GLIB_DEFINE_LOCALEDIR' => 1,
- 'AM_PROG_MKDIR_P' => 1,
'AM_GLIB_GNU_GETTEXT' => 1,
+ 'AM_PROG_MKDIR_P' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AM_MISSING_HAS_RUN' => 1,
@@ -203,21 +203,21 @@
'AM_DEP_TRACK' => 1,
'AM_CONFIG_HEADER' => 1,
'_AM_SET_OPTIONS' => 1,
- 'AM_RUN_LOG' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_PROG_CC_STDC' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'AM_RUN_LOG' => 1,
'_AM_IF_OPTION' => 1,
'_AM_SUBST_NOTMAKE' => 1,
- 'm4_pattern_allow' => 1,
'_AM_AUTOCONF_VERSION' => 1,
+ 'm4_pattern_allow' => 1,
'_AM_MANGLE_OPTION' => 1,
- 'AM_SET_LEADING_DOT' => 1,
'AM_CONDITIONAL' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
'AM_SET_DEPDIR' => 1,
'_AM_DEPENDENCIES' => 1,
- 'm4_include' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
'AM_PROG_INSTALL_SH' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
+ 'm4_include' => 1,
'PKG_CHECK_MODULES' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AU_DEFUN' => 1,
@@ -236,25 +236,25 @@
'configure.in'
],
{
- 'AM_PROG_F77_C_O' => 1,
'_LT_AC_TAGCONFIG' => 1,
- 'AC_INIT' => 1,
+ 'AM_PROG_F77_C_O' => 1,
'm4_pattern_forbid' => 1,
- 'AC_CANONICAL_TARGET' => 1,
+ 'AC_INIT' => 1,
'_AM_COND_IF' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
'AC_SUBST' => 1,
- 'AC_CANONICAL_HOST' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_FC_SRCEXT' => 1,
+ 'AC_CANONICAL_HOST' => 1,
'AC_PROG_LIBTOOL' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
- 'AC_CONFIG_LINKS' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
- 'LT_SUPPORTED_TAG' => 1,
+ 'AC_CONFIG_LINKS' => 1,
'm4_sinclude' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
'AM_MAINTAINER_MODE' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'_m4_warn' => 1,
@@ -267,17 +267,17 @@
'include' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_LIBSOURCE' => 1,
- 'AC_CANONICAL_BUILD' => 1,
'AM_PROG_FC_C_O' => 1,
+ 'AC_CANONICAL_BUILD' => 1,
'AC_FC_FREEFORM' => 1,
'AH_OUTPUT' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
'_AM_SUBST_NOTMAKE' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'm4_pattern_allow' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
'sinclude' => 1,
- 'AM_CONDITIONAL' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AM_PROG_CC_C_O' => 1,
'AC_CANONICAL_SYSTEM' => 1,
+ 'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'm4_include' => 1,
View
@@ -34,7 +34,10 @@ INCLUDES =\
@GIMP_CFLAGS@ \
-I$(includedir)
-LDADD = $(GIMP_LIBS)
+# lkk Make explicit dependency on libm for atan2()
+# Fixes change to linker ld on some platforms that causes libm not to be found through other libraries.
+# resynthesizer-gui does not actually depend on libm
+LDADD = $(GIMP_LIBS) -lm
View
@@ -211,7 +211,7 @@ INCLUDES = \
@GIMP_CFLAGS@ \
-I$(includedir)
-LDADD = $(GIMP_LIBS)
+LDADD = $(GIMP_LIBS) -lm
all: all-am
.SUFFIXES:

0 comments on commit 96adb41

Please sign in to comment.