[glib] build: Drop --enable-rebuilds configure option



commit f2c093f6571645d80b2d37bb193e991092ee9737
Author: Philip Withnall <withnall endlessm com>
Date:   Fri Nov 17 13:51:53 2017 +0000

    build: Drop --enable-rebuilds configure option
    
    It is outdated and no longer effectively used. It was originally in
    place to prevent rebuilding generated files (from a tarball) if the
    right build tools (awk, Perl, indent) were not available. However, we no
    longer use indent, we have hard-required awk for a while, and the only
    places the @REBUILD@ substitution was still used were for
    glib-genmarshal, which has recently been rewritten in Python (so no
    longer depends on whether Perl is available).
    
    Drop the whole lot.
    
    Signed-off-by: Philip Withnall <withnall endlessm com>
    
    https://bugzilla.gnome.org/show_bug.cgi?id=694723

 configure.ac              |   16 ----------------
 tests/gobject/Makefile.am |    4 ++--
 2 files changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5cbff19..cbdc980 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,10 +252,6 @@ AC_ARG_ENABLE(mem_pools,
               [AS_HELP_STRING([--disable-mem-pools],
                              [disable all glib memory pools])],,
              [disable_mem_pools=no])
-AC_ARG_ENABLE(rebuilds,
-              [AS_HELP_STRING([--disable-rebuilds],
-                              [disable all source autogeneration rules])],,
-              [enable_rebuilds=yes])
 
 GLIB_TESTS
 
@@ -354,20 +350,8 @@ AC_SUBST(GLIB_EXTRA_CFLAGS)
 
 AC_EXEEXT
 
-# define a MAINT-like variable REBUILD which is set if Perl
-# and awk are found, so autogenerated sources can be rebuilt
 AC_PROG_AWK
 AC_CHECK_PROGS(PERL, [perl5 perl])
-# We would like indent, but don't require it.
-AC_CHECK_PROG(INDENT, indent, indent)
-REBUILD=\#
-if test "x$enable_rebuilds" = "xyes" && \
-     test -n "$PERL" && \
-     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
-     test -n "$AWK" ; then
-  REBUILD=
-fi
-AC_SUBST(REBUILD)
 
 # option to specify python interpreter to use; this just sets $PYTHON, so that
 # we will fallback to reading $PYTHON if --with-python is not given, and
diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
index bc18199..aa5dbb6 100644
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -57,12 +57,12 @@ glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal
 
 testmarshal.h: stamp-testmarshal.h
        @true
-stamp-testmarshal.h: @REBUILD@ testmarshal.list $(glib_genmarshal)
+stamp-testmarshal.h: testmarshal.list $(glib_genmarshal)
        $(AM_V_GEN) $(glib_genmarshal) --prefix=test_marshal $(srcdir)/testmarshal.list --header >> xgen-gmh \
        && (cmp -s xgen-gmh testmarshal.h 2>/dev/null || cp xgen-gmh testmarshal.h) \
        && rm -f xgen-gmh xgen-gmh~ \
        && echo timestamp > $@
-testmarshal.c: @REBUILD@ testmarshal.h testmarshal.list $(glib_genmarshal)
+testmarshal.c: testmarshal.h testmarshal.list $(glib_genmarshal)
        $(AM_V_GEN) (echo "#include \"testmarshal.h\""; $(glib_genmarshal) --prefix=test_marshal 
$(srcdir)/testmarshal.list --body) >> xgen-gmc \
        && cp xgen-gmc testmarshal.c \
        && rm -f xgen-gmc xgen-gmc~


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]