mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 20:00:19 +02:00
Code Activity

* guile-config: Renamed from `build'.

Browse source 
* Makefile.am (SUBDIRS): Mention `guile-config', not `build'.
* configure.in: Create `guile-config/Makefile.in', not
`build/Makefile.in'.  Doc fix, too.
* qthreads.m4: Doc fix.
* Makefile.in, aclocal.m4, configure: Regeneranegerederadea.
This commit is contained in:
Jim Blandy 1998-10-03 19:00:10 +00:00
parent 29cd26efb6
commit bcc695e361
6 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in. ## Process this file with automake to produce Makefile.in.
SUBDIRS = ice-9 qt libguile build SUBDIRS = ice-9 qt libguile guile-config
## FIXME: in the future there will be direct automake support for ## FIXME: in the future there will be direct automake support for
## doing this. When that happens, switch over. ## doing this. When that happens, switch over.

2
Makefile.in
View file

@ -87,7 +87,7 @@ qtmd_h = @qtmd_h@
qtmdc_c = @qtmdc_c@ qtmdc_c = @qtmdc_c@
qtmds_s = @qtmds_s@ qtmds_s = @qtmds_s@
SUBDIRS = ice-9 qt libguile build SUBDIRS = ice-9 qt libguile guile-config
aclocaldir = $(datadir)/aclocal aclocaldir = $(datadir)/aclocal
aclocal_DATA = guile.m4 qthreads.m4 aclocal_DATA = guile.m4 qthreads.m4

2
aclocal.m4 vendored
View file

@ -571,7 +571,7 @@ dnl pass the relative path to the ../libfoo.la file, but
dnl 2) once the whole package has been installed, users should dnl 2) once the whole package has been installed, users should
dnl link using -lfoo. dnl link using -lfoo.
dnl Normally, we only care about the first case, but since the dnl Normally, we only care about the first case, but since the
dnl build-guile script needs to give users all the flags they need dnl guile-config script needs to give users all the flags they need
dnl to link programs against guile, the GUILE_WITH_THREADS macro dnl to link programs against guile, the GUILE_WITH_THREADS macro
dnl needs to supply the second piece of information as well. dnl needs to supply the second piece of information as well.
dnl dnl

5
configure vendored
View file

@ -4632,7 +4632,7 @@ done
ac_given_srcdir=$srcdir ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL" ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile build/Makefile libguile/scmconfig.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 trap 'rm -fr `echo "Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile guile-config/Makefile libguile/scmconfig.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
@ -4745,7 +4745,7 @@ EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile build/Makefile"} CONFIG_FILES=\${CONFIG_FILES-"Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile guile-config/Makefile"}
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@ -4914,7 +4914,6 @@ fi; done
EOF EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
test -z "$CONFIG_HEADERS" || echo timestamp > libguile/stamp-h test -z "$CONFIG_HEADERS" || echo timestamp > libguile/stamp-h

4
configure.in
View file

@ -399,7 +399,7 @@ AC_SUBST(GUILE_MAJOR_VERSION)
AC_SUBST(GUILE_MINOR_VERSION) AC_SUBST(GUILE_MINOR_VERSION)
AC_SUBST(GUILE_VERSION) AC_SUBST(GUILE_VERSION)
dnl Tell build-guile what flags guile users should link against. dnl Tell guile-config what flags guile users should link against.
GUILE_LIBS="$LDFLAGS $THREAD_LIBS_INSTALLED $LIBS" GUILE_LIBS="$LDFLAGS $THREAD_LIBS_INSTALLED $LIBS"
AC_SUBST(GUILE_LIBS) AC_SUBST(GUILE_LIBS)
@ -417,7 +417,7 @@ AC_SUBST(GUILE_STAMP)
AC_SUBST(AWK) AC_SUBST(AWK)
AC_SUBST(LIBLOBJS) AC_SUBST(LIBLOBJS)
AC_OUTPUT([Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile build/Makefile], [chmod +x libguile/guile-snarf]) AC_OUTPUT([Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile guile-config/Makefile], [chmod +x libguile/guile-snarf])
dnl Local Variables: dnl Local Variables:
dnl comment-start: "dnl " dnl comment-start: "dnl "

2
qthreads.m4
View file

@ -30,7 +30,7 @@ dnl pass the relative path to the ../libfoo.la file, but
dnl 2) once the whole package has been installed, users should dnl 2) once the whole package has been installed, users should
dnl link using -lfoo. dnl link using -lfoo.
dnl Normally, we only care about the first case, but since the dnl Normally, we only care about the first case, but since the
dnl build-guile script needs to give users all the flags they need dnl guile-config script needs to give users all the flags they need
dnl to link programs against guile, the GUILE_WITH_THREADS macro dnl to link programs against guile, the GUILE_WITH_THREADS macro
dnl needs to supply the second piece of information as well. dnl needs to supply the second piece of information as well.
dnl dnl