[Guile-commits] 10/19: Merge commit '7c433cbbce83bc9f2f9967afba00bbb68e312657'

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 7c6ce75e2cc218e193b765149e619d1c9c69cbd6
Merge: 12dfe65 7c433cb
Author: Andy Wingo <address@hidden>
Date:   Thu Jan 22 13:32:59 2015 +0100

    Merge commit '7c433cbbce83bc9f2f9967afba00bbb68e312657'
    
    Conflicts:
        meta/Makefile.am

 doc/ref/api-io.texi |   10 ++++++--
 meta/Makefile.am    |   60 +++++++++++++++++++++++++++++++++++---------------
 2 files changed, 49 insertions(+), 21 deletions(-)

diff --cc meta/Makefile.am
index b543c5e,b48c8ec..5b89edb
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@@ -48,27 -47,51 +48,51 @@@ aclocal_DATA = guile.m
  # Script to instantiate substitution variables found on the standard
  # input.  We do this from the Makefile because we need things like
  # $(program_transform_name), which are not usable from 'configure.ac'.
- substitute =                                                          \
-   guile="`echo guile | $(SED) -e '$(program_transform_name)'`" ;      \
-   guild="`echo guild | $(SED) -e '$(program_transform_name)'`" ;      \
-   installed_guile="@bindir@/$$guile" ;                                        
\
-   $(SED) -e "s,address@hidden@],$(PACKAGE_NAME),g"                    \
-        -e "s,address@hidden@],$(PACKAGE_BUGREPORT),g"         \
-        -e "s,address@hidden@],$(PKG_CONFIG),g"                        \
-        -e "s,address@hidden@],$(pkgconfigdir),g"                      \
-        -e "s,address@hidden@],$(prefix),g"                            \
-        -e "s,address@hidden@],$(exec_prefix),g"                       \
-        -e "s,address@hidden@],$(bindir),g"                            \
-        -e "s,address@hidden@],$(libdir),g"                            \
-        -e "s,address@hidden@],$(includedir),g"                        \
-        -e "s,address@hidden@],$(datarootdir),g"                       \
-        -e "s,address@hidden@],$(datadir),g"                           \
-        -e "s,address@hidden@],$(sitedir),g"                           \
-        -e "s,address@hidden@],$$guile,g"                                      
\
-        -e "s,address@hidden@],$$guild,g"                                      
\
+ substitute =                                                                  
\
+   guile="`echo guile | $(SED) -e '$(program_transform_name)'`" ;              
\
+   guild="`echo guild | $(SED) -e '$(program_transform_name)'`" ;              
\
+   installed_guile="@bindir@/$$guile" ;                                        
        \
+   $(SED) -e "s,address@hidden@],$(PACKAGE_NAME),g"                            
\
+        -e "s,address@hidden@],$(PACKAGE_BUGREPORT),g"                 \
+        -e "s,address@hidden@],$(GUILE_EFFECTIVE_VERSION),g"   \
+        -e "s,address@hidden@],$(GUILE_VERSION),g"                             
\
+        -e "s,address@hidden@],$(GUILE_CFLAGS),g"                              
\
+        -e "s,address@hidden@],$(GUILE_LIBS),g"                                
\
+        -e "s,address@hidden@],$(LIBGUILE_INTERFACE),g"                \
+        $(dependency_substitutions)                                            
\
+        -e "s,address@hidden@],$(PKG_CONFIG),g"                                
\
+        -e "s,address@hidden@],$(pkgconfigdir),g"                              
\
+        -e "s,address@hidden@],$(prefix),g"                                    
\
+        -e "s,address@hidden@],$(exec_prefix),g"                               
\
+        -e "s,address@hidden@],$(bindir),g"                                    
\
+        -e "s,address@hidden@],$(libdir),g"                                    
\
+        -e "s,address@hidden@],$(includedir),g"                                
\
+        -e "s,address@hidden@],$(datarootdir),g"                               
\
+        -e "s,address@hidden@],$(datadir),g"                                   
\
+        -e "s,address@hidden@],$(sitedir),g"                                   
\
+        -e "s,address@hidden@],$$guile,g"                                      
        \
+        -e "s,address@hidden@],$$guild,g"                                      
        \
         -e "s,address@hidden@],$$installed_guile,g"
  
+ # Substitutions for dependencies that appear in 'guile-2.0.pc'.
+ dependency_substitutions =                            \
+   -e "s,address@hidden@],$(BDW_GC_CFLAGS),g"          \
+   -e "s,address@hidden@],$(BDW_GC_LIBS),g"            \
+   -e "s,address@hidden@],$(LIB_CLOCK_GETTIME),g"      \
+   -e "s,address@hidden@],$(LIBGMP),g"                 \
+   -e "s,address@hidden@],$(LIBLTDL),g"                        \
+   -e "s,address@hidden@],$(LIBFFI_LIBS),g"            \
+   -e "s,address@hidden@],$(LIBUNISTRING),g"           \
+   -e "s,address@hidden@],$(LIBICONV),g"                       \
+   -e "s,address@hidden@],$(LIBINTL),g"                        \
+   -e "s,address@hidden@],$(LIBSOCKET),g"                      \
+   -e "s,address@hidden@],$(SERVENT_LIB),g"            \
+   -e "s,address@hidden@],$(HOSTENT_LIB),g"            \
+   -e "s,address@hidden@],$(GETADDRINFO_LIB),g"        \
+   -e "s,address@hidden@],$(INET_NTOP_LIB),g"          \
+   -e "s,address@hidden@],$(INET_PTON_LIB),g"
+ 
 -guile-2.0.pc: guile-2.0.pc.in
 +guile-$(GUILE_EFFECTIVE_VERSION).pc: guile-$(GUILE_EFFECTIVE_VERSION).pc.in
        $(substitute) < "$<" > "address@hidden"
        mv "address@hidden" "$@"