Use autoconf instead of cpp for LIB_MATH.

* s/darwin.h (LIB_MATH): Do not define here, move to configure.
* s/cygwin.h (LIB_MATH): Likewise.
* Makefile.in (LIB_MATH): Do not define with cpp.
(LIBES): Use autoconf for LIB_MATH.

* configure.in (LIB_MATH): New output variable.  Set it for some systems.

4 files changed, 9 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index db23a4a7cb3..58ea0e2476b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-26  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Use autoconf instead of cpp for LIB_MATH.
+        * s/darwin.h (LIB_MATH): Do not define here, move to configure.
+        * s/cygwin.h (LIB_MATH): Likewise.
+        * Makefile.in (LIB_MATH): Do not define with cpp.
+        (LIBES): Use autoconf for LIB_MATH.
+
 2010-04-26  Kenichi Handa  <handa@m17n.org>
 
         * composite.c (Ffind_composition_internal): Fix the return value
diff --git a/src/Makefile.in b/src/Makefile.in
index c458c46b619..14fe29cf482 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -175,10 +175,6 @@ DEPFLAGS = -MMD -MF deps/$*.d
 #define LIBS_MACHINE
 #endif
 
-#ifndef LIB_MATH
-#  define LIB_MATH -lm
-#endif /* LIB_MATH */
-
 /* Some s/SYSTEM.h files define this to request special switches in ld.  */
 #ifndef LD_SWITCH_SYSTEM
 #if !defined (__GNUC__) && ((defined (BSD_SYSTEM) && !defined (COFF)))
@@ -795,7 +791,7 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) $(DBUS_LIBS) \
    @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
    $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \
    @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
-   $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
+   $(GNULIB_VAR) @LIB_MATH@ LIB_STANDARD $(GNULIB_VAR)
 
 all: emacs${EXEEXT} $(OTHER_FILES)
 
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 1141f0bbd5e..b2ade390c7e 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -137,7 +137,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Don't list system libs on link command line */
 #define LIB_STANDARD
-#define LIB_MATH
 
 #define START_FILES ecrt0.o
 
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 016ed343f06..060e354dca7 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -205,9 +205,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Link this program just by running cc.  */
 #define ORDINARY_LINK
 
-/* Adding -lm confuses the dynamic linker, so omit it.  */
-#define LIB_MATH
-
 /* Define the following so emacs symbols will not conflict with those
    in the System framework.  Otherwise -prebind will not work.  */