gnucash maint: Remove obsolete AS_SCRUB_INCLUDES macro.

John Ralls jralls at code.gnucash.org
Sun Sep 25 17:11:46 EDT 2016


Updated	 via  https://github.com/Gnucash/gnucash/commit/b905c4a2 (commit)
	from  https://github.com/Gnucash/gnucash/commit/2d5056db (commit)



commit b905c4a26d57a7b2878db92050e97ec9f3d5a9b9
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Sep 25 23:07:14 2016 +0200

    Remove obsolete AS_SCRUB_INCLUDES macro.
    
    This was an ugly work-around for a bogus warning from gcc-3, a
    long-superceded compiler. The way the macro was written caused
    portablility issues (see PR 102) and other projects (gstreamer
    in particular) removed it several years ago.
    
    Thanks to Julian Ospald for bringing it to our attention.

diff --git a/configure.ac b/configure.ac
index ff05a9c..3ee4e69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -555,7 +555,6 @@ fi
 
 LIBXML2_REQUIRED=2.5.10
 PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED)
-AS_SCRUB_INCLUDE(LIBXML2_CFLAGS)
 AC_SUBST(LIBXML2_CFLAGS)
 AC_SUBST(LIBXML2_LIBS)
 
@@ -572,7 +571,6 @@ LIBS="$oLIBS"
 ### LIBXSLT
 
 PKG_CHECK_MODULES(LIBXSLT, libxslt)
-AS_SCRUB_INCLUDE(LIBXLT_CFLAGS)
 AC_SUBST(LIBXSLT_CFLAGS)
 AC_SUBST(LIBXSLT_LIBS)
 
@@ -870,7 +868,6 @@ then
     AQBANKING_LIBS="${AQBANKING_LIBS} -lktoblzcheck"
   fi
 
-  AS_SCRUB_INCLUDE(AQBANKING_CFLAGS)
   AC_SUBST(AQBANKING_LIBS)
   AC_SUBST(AQBANKING_CFLAGS)
   _COMPONENTS="$_COMPONENTS aqbanking"
@@ -1086,23 +1083,19 @@ then
 
 
   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24.0)
-  AS_SCRUB_INCLUDE(GTK_CFLAGS)
   AC_SUBST(GTK_CFLAGS)
   AC_SUBST(GTK_LIBS)
 
   PKG_CHECK_MODULES(GNOMECANVAS, libgnomecanvas-2.0)
-  AS_SCRUB_INCLUDE(GNOMECANVAS_CFLAGS)
   AC_SUBST(GNOMECANVAS_CFLAGS)
   AC_SUBST(GNOMECANVAS_LIBS)
 
   PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
-  AS_SCRUB_INCLUDE(GDK_PIXBUF_CFLAGS)
   AC_SUBST(GDK_PIXBUF_CFLAGS)
   AC_SUBST(GDK_PIXBUF_LIBS)
 
    # checks for goffice
   PKG_CHECK_MODULES(GOFFICE, libgoffice-0.8 >= 0.7.0 libgoffice-0.8 < 0.9.0, [goffice=1], [AC_MSG_ERROR([Cannot find libgoffice >= 0.7.0 and < 0.9.0])])
-  AS_SCRUB_INCLUDE(GOFFICE_CFLAGS)
   AC_SUBST(GOFFICE_CFLAGS)
   AC_SUBST(GOFFICE_LIBS)
 
diff --git a/macros/as-scrub-include.m4 b/macros/as-scrub-include.m4
deleted file mode 100644
index dcca985..0000000
--- a/macros/as-scrub-include.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl as-scrub-include.m4 0.0.1
-dnl autostars m4 macro for scrubbing CFLAGS of system include dirs
-dnl because gcc 3.x complains about including system including dirs
-dnl
-dnl thomas at apestaart.org
-dnl
-dnl This macro uses output of cpp -v and expects it to contain text that 
-dnl looks a little bit like this:
-dnl #include <...> search starts here:
-dnl  /usr/local/include
-dnl  /usr/lib/gcc-lib/i386-redhat-linux/3.2/include
-dnl  /usr/include
-dnl End of search list.
-
-dnl AS_SCRUB_INCLUDE(VAR)
-dnl example
-dnl AS_SCRUB_INCLUDE(CFLAGS)
-dnl will remove all system include dirs from the given CFLAGS
-
-AC_DEFUN([AS_SCRUB_INCLUDE],
-[
-  GIVEN_CFLAGS=$[$1]
-  INCLUDE_DIRS=`echo | cpp -v 2>&1`
-
-  dnl remove everything from this output between the "starts here" and "End of"
-  dnl line
-  INCLUDE_DIRS=`echo $INCLUDE_DIRS | sed -e 's/.*<...> search starts here://' | sed -e 's/End of search list.*//'`
-  for dir in $INCLUDE_DIRS; do
-    GIVEN_CFLAGS=`echo $GIVEN_CFLAGS | sed -e "s;-I$dir ;;" | sed -e "s;-I$dir$;;"`
-  done
-  [$1]=$GIVEN_CFLAGS
-])



Summary of changes:
 configure.ac               |  7 -------
 macros/as-scrub-include.m4 | 32 --------------------------------
 2 files changed, 39 deletions(-)
 delete mode 100644 macros/as-scrub-include.m4



More information about the gnucash-changes mailing list