Revert "Remove traces of libspiro being optional (it is now mandatory)"

This reverts commit 7703be7a2062eadcc7bf97993d57db937429679d.

Conflicts:

	fontforge/splinefont.h
Revert "Use BDW garbage collector" but preserve libgc options.

This reverts commit e05e5254b77fd5471a673e75a347cbe80d9ec0b1.

Conflicts:

	Unicode/usprintf.c
	collab/Makefile.am
	configure.ac
	fontforge/Makefile.am
	fontforge/autowidth2.c
	fontforge/clipnoui.c
	fontforge/cvundoes.c
	fontforge/fontviewbase.c
	fontforge/parsettf.c
	fontforge/psread.c
	fontforge/python.c
	fontforge/scripting.c
	fontforge/scstyles.c
	fontforge/splinefont.h
	fontforge/splinesaveafm.c
	fontforge/splinestroke.c
	fontforge/splineutil.c
	fontforge/splineutil2.c
	fontforge/stamper.c
	fontforge/tottf.c
	fontforge/ttfspecial.c
	fontforgeexe/Makefile.am
	fontforgeexe/charview.c
	fontforgeexe/collab/Makefile.am
	fontforgeexe/collab/fontforge-internal-collab-server.c
	fontforgeexe/fontview.c
	fontforgeexe/main.c
	fontforgeexe/sftextfield.c
	gdraw/Makefile.am
	gdraw/gxdraw.c
	gtkui/fontview.c
	gutils/Makefile.am
	inc/gc_veneer.c
Fix merge.
Merge branch 'master' into recompatible

Conflicts:
	fontforgeexe/Makefile.am
	fontforgeexe/charview.c
Revert "Remove some free-ing code previously missed, which was causing a crash"

This reverts commit bb5fc1c35d525844665da9de05ece08b8436062e.

Conflicts:

	gdraw/gdraw.c
	gdraw/gdrawP.h
	gdraw/gxdraw.c
Revert "Use gnulib tzset module to provide tzset"

This reverts commit 958a7fad45af85ffd191117d2125957cb33e784f.
Revert "Make libspiro mandatory"

This partially reverts commit 5a44e707c3ef4e844d23cfa97f968cf30a2fb272.

Conflicts:

	configure.ac
Partially revert "Use gnulib's getline module for platforms lacking getline"

This partially reverts commit 4b90c16e2244fe69ae530e06d763711101f3393f.

Conflicts:

	bootstrap.conf
	fontforge/scripting.c
Restore usprintf.c.

This reverts commit 76dcb966298668727c310c3ef04a10c15f91466f.
Revert "Add gnulib xalloc module, and replace chunkalloc with X[ZC]ALLOC"

(It was easier than adding new free statements.)

This reverts commit f414cd9115084eb8cbaa64274e59e4289249b3ee.

Conflicts:

	bootstrap.conf
	fontforge/asmfpst.c
	fontforge/autohint.c
	fontforge/featurefile.c
	fontforge/fontforge.h
	fontforge/fvimportbdf.c
	fontforge/python.c
	fontforge/splinefont.h
	fontforge/splinestroke.c
	fontforgeexe/basedlg.c
	fontforgeexe/charinfo.c
	fontforgeexe/cvstroke.c
	fontforgeexe/kernclass.c
	fontforgeexe/mmdlg.c
	fontforgeexe/ttfinstrsui.c
Merge branch 'master' into recompatible
Continue selectively removing garbage collection dependents.

Revert "Fix crashes with moving splines"

This reverts commit b10425b10fc8f3994a22b10f4e897c17e5fe796c.

Conflicts:

	bootstrap.conf
	fontforgeexe/charview.c
Remove libgc redefinitions.
Relax libgc version requirements so as to allow building on Ubuntu 12.04.
Restore some lost variable declarations.
More restoration.
Make additional changes to get compilation working with gnulib.
Merge branch 'master' into recompatible
Fix travis build.
More gnulib headers for travis.