check for iconveh values at configure-time
[bpt/guile.git] / libguile / Makefile.am
index a899b85..4ec7ee5 100644 (file)
@@ -1,6 +1,6 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+##     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -88,7 +88,7 @@ guile_filter_doc_snarfage_SOURCES = c-tokenize.c
 c-tokenize.$(OBJEXT): c-tokenize.c
        $(AM_V_GEN) \
        if [ "$(cross_compiling)" = "yes" ]; then \
-               $(CC_FOR_BUILD) $(DEFS) $(AM_CPPFLAGS) -c -o $@ $<; \
+               $(CC_FOR_BUILD) -c -o $@ $<; \
        else \
                $(COMPILE) -c -o $@ $<; \
        fi
@@ -128,7 +128,6 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES =                             \
        debug.c                                 \
        deprecated.c                            \
        deprecation.c                           \
-       discouraged.c                           \
        dynwind.c                               \
        eq.c                                    \
        error.c                                 \
@@ -137,6 +136,7 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES =                             \
        expand.c                                \
        extensions.c                            \
        feature.c                               \
+       filesys.c                               \
        fluids.c                                \
        foreign.c                               \
        fports.c                                \
@@ -171,13 +171,13 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES =                           \
        objprop.c                               \
        options.c                               \
        pairs.c                                 \
+       poll.c                                  \
        ports.c                                 \
        print.c                                 \
        procprop.c                              \
        procs.c                                 \
        programs.c                              \
        promises.c                              \
-       properties.c                            \
        r6rs-ports.c                            \
        random.c                                \
        rdelim.c                                \
@@ -190,9 +190,11 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES =                            \
        smob.c                                  \
        sort.c                                  \
        srcprop.c                               \
+       srfi-1.c                                \
+       srfi-4.c                                \
        srfi-13.c                               \
        srfi-14.c                               \
-       srfi-4.c                                \
+       srfi-60.c                               \
        stackchk.c                              \
        stacks.c                                \
        stime.c                                 \
@@ -230,7 +232,6 @@ DOT_X_FILES =                                       \
        debug.x                                 \
        deprecated.x                            \
        deprecation.x                           \
-       discouraged.x                           \
        dynl.x                                  \
        dynwind.x                               \
        eq.x                                    \
@@ -240,6 +241,7 @@ DOT_X_FILES =                                       \
        expand.x                                \
        extensions.x                            \
        feature.x                               \
+       filesys.x                               \
        fluids.x                                \
        foreign.x                               \
        fports.x                                \
@@ -273,7 +275,6 @@ DOT_X_FILES =                                       \
        procprop.x                              \
        procs.x                                 \
        promises.x                              \
-       properties.x                            \
        r6rs-ports.x                            \
        random.x                                \
        rdelim.x                                \
@@ -286,9 +287,11 @@ DOT_X_FILES =                                      \
        smob.x                                  \
        sort.x                                  \
        srcprop.x                               \
+       srfi-1.x                                \
+       srfi-4.x                                \
        srfi-13.x                               \
        srfi-14.x                               \
-       srfi-4.x                                \
+       srfi-60.x                               \
        stackchk.x                              \
        stacks.x                                \
        stime.x                                 \
@@ -330,7 +333,6 @@ DOT_DOC_FILES =                             \
        debug.doc                               \
        deprecated.doc                          \
        deprecation.doc                         \
-       discouraged.doc                         \
        dynl.doc                                \
        dynwind.doc                             \
        eq.doc                                  \
@@ -340,6 +342,7 @@ DOT_DOC_FILES =                             \
        expand.doc                              \
        extensions.doc                          \
        feature.doc                             \
+       filesys.doc                             \
        fluids.doc                              \
        foreign.doc                             \
        fports.doc                              \
@@ -373,7 +376,6 @@ DOT_DOC_FILES =                             \
        procprop.doc                            \
        procs.doc                               \
        promises.doc                            \
-       properties.doc                          \
        r6rs-ports.doc                          \
        random.doc                              \
        rdelim.doc                              \
@@ -386,9 +388,11 @@ DOT_DOC_FILES =                            \
        smob.doc                                \
        sort.doc                                \
        srcprop.doc                             \
+       srfi-1.doc                              \
+       srfi-4.doc                              \
        srfi-13.doc                             \
        srfi-14.doc                             \
-       srfi-4.doc                              \
+       srfi-60.doc                             \
        stackchk.doc                            \
        stacks.doc                              \
        stime.doc                               \
@@ -416,13 +420,13 @@ DOT_I_FILES = vm-i-system.i vm-i-scheme.i vm-i-loader.i
        $(AM_V_GEN)$(GREP) '^VM_DEFINE' $< > $@
 
 BUILT_SOURCES = cpp-E.c cpp-SIG.c libpath.h \
-    version.h scmconfig.h \
+    scmconfig.h \
     $(DOT_I_FILES) $(DOT_X_FILES) $(EXTRA_DOT_X_FILES)
 
 EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = _scm.h           \
     memmove.c strerror.c                       \
     dynl.c regex-posix.c                       \
-    filesys.c posix.c net_db.c socket.c                \
+    posix.c net_db.c socket.c                  \
     debug-malloc.c mkstemp.c                   \
     win32-uname.c win32-dirent.c win32-socket.c        \
     locale-categories.h
@@ -448,14 +452,35 @@ noinst_HEADERS = conv-integer.i.c conv-uinteger.i.c               \
 noinst_HEADERS += vm-engine.c vm-i-system.c vm-i-scheme.c vm-i-loader.c
 
 libguile_@GUILE_EFFECTIVE_VERSION@_la_DEPENDENCIES = @LIBLOBJS@
-libguile_@GUILE_EFFECTIVE_VERSION@_la_LIBADD =                         \
-  @LIBLOBJS@ $(gnulib_library) $(LTLIBGMP)     \
-  $(LTLIBUNISTRING) $(LTLIBICONV) $(LTLIBINTL)
-libguile_@GUILE_EFFECTIVE_VERSION@_la_LDFLAGS =                                                                                        \
-  @LTLIBINTL@ $(LIBFFI_LIBS) $(INET_NTOP_LIB) $(INET_PTON_LIB)                                         \
-  $(GETADDRINFO_LIB) $(HOSTENT_LIB) $(SERVENT_LIB)                                                     \
-  -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@    \
-  -export-dynamic -no-undefined                                                                                \
+
+libguile_@GUILE_EFFECTIVE_VERSION@_la_LIBADD =         \
+  @LIBLOBJS@ $(gnulib_library) $(LTLIBGMP) $(LTLIBLTDL)
+
+# Libtool version info.
+version_info = @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@
+
+libguile_@GUILE_EFFECTIVE_VERSION@_la_LDFLAGS =        \
+  $(BDW_GC_LIBS) $(LIBFFI_LIBS)                        \
+  $(CEIL_LIBM)                                 \
+  $(FLOOR_LIBM)                                        \
+  $(FREXP_LIBM)                                        \
+  $(GETADDRINFO_LIB)                           \
+  $(HOSTENT_LIB)                               \
+  $(INET_NTOP_LIB)                             \
+  $(INET_PTON_LIB)                             \
+  $(ISNAND_LIBM)                               \
+  $(ISNANF_LIBM)                               \
+  $(ISNANL_LIBM)                               \
+  $(LDEXP_LIBM)                                        \
+  $(LIBSOCKET)                                 \
+  $(LOG1P_LIBM)                                        \
+  $(LTLIBICONV)                                        \
+  $(LTLIBINTL)                                 \
+  $(LTLIBUNISTRING)                            \
+  $(SERVENT_LIB)                               \
+  $(TRUNC_LIBM)                                        \
+  -version-info $(version_info)                        \
+  -export-dynamic -no-undefined                        \
   $(GNU_LD_FLAGS)
 
 if HAVE_LD_VERSION_SCRIPT
@@ -490,7 +515,6 @@ modinclude_HEADERS =                                \
        debug.h                                 \
        deprecated.h                            \
        deprecation.h                           \
-       discouraged.h                           \
        dynl.h                                  \
        dynwind.h                               \
        eq.h                                    \
@@ -537,6 +561,7 @@ modinclude_HEADERS =                                \
        objprop.h                               \
        options.h                               \
        pairs.h                                 \
+       poll.h                                  \
        ports.h                                 \
        posix.h                                 \
        print.h                                 \
@@ -544,7 +569,6 @@ modinclude_HEADERS =                                \
        procs.h                                 \
        programs.h                              \
        promises.h                              \
-       properties.h                            \
        pthread-threads.h                       \
        r6rs-ports.h                            \
        random.h                                \
@@ -561,9 +585,11 @@ modinclude_HEADERS =                               \
        socket.h                                \
        sort.h                                  \
        srcprop.h                               \
+       srfi-1.h                                \
+       srfi-4.h                                \
        srfi-13.h                               \
        srfi-14.h                               \
-       srfi-4.h                                \
+       srfi-60.h                               \
        stackchk.h                              \
        stacks.h                                \
        stime.h                                 \
@@ -599,28 +625,19 @@ EXTRA_DIST = ChangeLog-scm ChangeLog-threads              \
     ChangeLog-1996-1999 ChangeLog-2000 ChangeLog-2008  \
     guile-func-name-check                              \
     cpp-E.syms cpp-E.c cpp-SIG.syms cpp-SIG.c                  \
-    c-tokenize.lex version.h.in                                                \
+    c-tokenize.lex                                             \
     scmconfig.h.top libgettext.h unidata_to_charset.pl libguile.map
 #    $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) \
 #    guile-procedures.txt guile.texi
 
-## We use @-...-@ as the substitution brackets here, instead of the
-## usual @...@, so autoconf doesn't go and substitute the values
-## directly into the left-hand sides of the sed substitutions.  *sigh*
-version.h: version.h.in $(top_builddir)/config.status
-       $(AM_V_GEN)sed < $(srcdir)/version.h.in > $@.tmp \
-         -e s:@-GUILE_MAJOR_VERSION-@:${GUILE_MAJOR_VERSION}: \
-         -e s:@-GUILE_MINOR_VERSION-@:${GUILE_MINOR_VERSION}: \
-         -e s:@-GUILE_MICRO_VERSION-@:${GUILE_MICRO_VERSION}: \
-         -e s:@-GUILE_EFFECTIVE_VERSION-@:${GUILE_EFFECTIVE_VERSION}: && mv $@.tmp $@
-
 ## FIXME: Consider using timestamp file, to avoid unnecessary rebuilds.
 libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        @rm -f libpath.tmp
        @echo '/* generated by Makefile */' > libpath.tmp
        @echo '#define SCM_PKGDATA_DIR "$(pkgdatadir)"' >> libpath.tmp
        @echo '#define SCM_LIBRARY_DIR "$(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)"'>>libpath.tmp
-       @echo '#define SCM_SITE_DIR "$(pkgdatadir)/site"' >> libpath.tmp
+       @echo '#define SCM_SITE_DIR "$(sitedir)"' >> libpath.tmp
+       @echo '#define SCM_GLOBAL_SITE_DIR "$(pkgdatadir)/site"' >> libpath.tmp
        @echo '#define SCM_LIB_DIR "$(libdir)"' >> libpath.tmp
        @echo '#define SCM_EXTENSIONS_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions"' >> libpath.tmp
        @echo '#define SCM_CCACHE_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/ccache"' >> libpath.tmp
@@ -646,7 +663,7 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        @echo ' { "pkglibdir",     "$(pkglibdir)" }, \' >> libpath.tmp
        @echo ' { "pkgincludedir", "$(pkgincludedir)" }, \' \
                >> libpath.tmp
-       @echo ' { "extensionsdir", "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions" }, \' >> libpath.tmp
+       @echo ' { "extensiondir", "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions" }, \' >> libpath.tmp
        @echo ' { "guileversion", "@GUILE_VERSION@" }, \' >> libpath.tmp
        @echo ' { "libguileinterface", "@LIBGUILE_INTERFACE@" }, \' \
                >> libpath.tmp
@@ -661,16 +678,12 @@ snarfcppopts = $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
 
 SUFFIXES = .x .doc
 
-AM_V_FILTER = $(AM_V_FILTER_$(V))
-AM_V_FILTER_ = $(AM_V_FILTER_$(AM_DEFAULT_VERBOSITY))
-AM_V_FILTER_0 = @echo "  FILTER" $@;
-
 .c.x:
        $(AM_V_SNARF)$(GUILE_SNARF) -o $@ $< $(snarfcppopts)
 .c.doc:
-       -$(AM_V_FILTER)$(AWK) -f $(srcdir)/guile-func-name-check $< && (./guile-snarf-docs $(snarfcppopts) $< | ./guile_filter_doc_snarfage$(EXEEXT) --filter-snarfage) > $@ || { rm $@; false; }
+       $(AM_V_SNARF)./guile-snarf-docs -o $@ $< -- $(snarfcppopts)
 
-$(DOT_X_FILES) $(EXTRA_DOT_X_FILES): scmconfig.h snarf.h guile-snarf.in
+$(DOT_X_FILES) $(EXTRA_DOT_X_FILES): scmconfig.h snarf.h guile-snarf.in version.h
 
 $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES): scmconfig.h snarf.h guile-snarf-docs.in guile_filter_doc_snarfage$(EXEEXT)
 
@@ -734,20 +747,26 @@ MKDEP = gcc -M -MG $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
 #      #ifdef SYMBOL
 #      scm_c_define ("SYMBOL", scm_from_int (SYMBOL));
 #      #endif
-# writing output to foo.c.
+# writing output to foo.c.  We use a while-read loop instead of a
+# one-line sed script because some seds (e.g., FreeBSD) don't read
+# '\n' as a newline (like GNU sed does).  Sad, but true.
 .syms.c:
-       sed 's/.*/#ifdef &\nscm_c_define ("&", scm_from_int (&));\n#endif/' \
-         $< > $@T
-       mv $@T $@
+       $(AM_V_GEN)                                                     \
+       cat $< | while read sym ; do                                    \
+         echo "#ifdef $$sym" ;                                         \
+         echo "scm_c_define (\"$$sym\", scm_from_int ($$sym));" ;      \
+         echo "#endif" ;                                               \
+       done > $@T
+       @mv $@T $@
 
 # Write $(srcdir)/cpp-{E,SIG}.syms.NEW if there are any not-yet-seen
 # ("new" to us) E* or SIG* symbols in <errno.h> or <signal.h>, respectively.
-chknew-E chknew-SIG:
+chknew-E chknew-SIG:                                           \
        @bit=`echo $@ | sed s/^chknew-//` ;                     \
        old="$(srcdir)/cpp-$$bit.syms" ;                        \
        echo "#include <$${bit}.h>"                             \
         | sed 's/E/errno/;s/SIG/signal/'                       \
-        | gcc -undef -dM -E -                                  \
+        | gcc -dM -E -                                         \
         | sed 's/^#define //;/^'$$bit'[A-Z][A-Z]*/!d;s/ .*//'  \
         | sort | diff -u $$old - | sed '1,2d;/^+/!d;s/^.//'    \
         > TMP ;                                                \
@@ -761,7 +780,6 @@ chknew-E chknew-SIG:
 \f
 
 MOSTLYCLEANFILES = \
-       version.h version.h.tmp \
        scmconfig.h scmconfig.h.tmp
 
 CLEANFILES = libpath.h *.x *.doc guile-procedures.txt guile-procedures.texi guile.texi \