Commit 07e814a5d7957003960427fed884da3d0a67c48a

Thomas de Grivel 2018-08-26T11:14:40

autogen

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
diff --git a/Makefile.in b/Makefile.in
index dfadcad..867baae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -167,6 +167,10 @@ AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
+librtbuf_dynamic_la_DEPENDENCIES = librtbuf_signal.la librtbuf.la
+am_librtbuf_dynamic_la_OBJECTS = rtbuf_dynamic.lo \
+	rtbuf_dynamic_limiter.lo
+librtbuf_dynamic_la_OBJECTS = $(am_librtbuf_dynamic_la_OBJECTS)
 am__DEPENDENCIES_1 =
 @ENABLE_GLFW3_TRUE@librtbuf_glfw3_la_DEPENDENCIES =  \
 @ENABLE_GLFW3_TRUE@	$(am__DEPENDENCIES_1) librtbuf_music.la \
@@ -248,11 +252,11 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(librtbuf_la_SOURCES) $(librtbuf_glfw3_la_SOURCES) \
-	$(librtbuf_music_la_SOURCES) $(librtbuf_signal_la_SOURCES) \
-	$(librtbuf_sndio_la_SOURCES) $(librtbuf_synth_la_SOURCES) \
-	$(rtbuf_SOURCES)
-DIST_SOURCES = $(librtbuf_la_SOURCES) \
+SOURCES = $(librtbuf_la_SOURCES) $(librtbuf_dynamic_la_SOURCES) \
+	$(librtbuf_glfw3_la_SOURCES) $(librtbuf_music_la_SOURCES) \
+	$(librtbuf_signal_la_SOURCES) $(librtbuf_sndio_la_SOURCES) \
+	$(librtbuf_synth_la_SOURCES) $(rtbuf_SOURCES)
+DIST_SOURCES = $(librtbuf_la_SOURCES) $(librtbuf_dynamic_la_SOURCES) \
 	$(am__librtbuf_glfw3_la_SOURCES_DIST) \
 	$(librtbuf_music_la_SOURCES) \
 	$(am__librtbuf_signal_la_SOURCES_DIST) \
@@ -266,7 +270,7 @@ am__can_run_installinfo = \
 am__include_HEADERS_DIST = symbol.h rtbuf_defs.h rtbuf_type.h \
 	rtbuf_fun.h rtbuf.h rtbuf_lib.h rtbuf_music.h \
 	rtbuf_music_type.h rtbuf_signal.h rtbuf_signal_type.h \
-	rtbuf_synth.h rtbuf_synth_type.h rtbuf_sndio.h \
+	rtbuf_dynamic.h rtbuf_synth.h rtbuf_synth_type.h rtbuf_sndio.h \
 	rtbuf_sndio_type.h rtbuf_glfw3.h
 HEADERS = $(include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
@@ -448,10 +452,11 @@ CLEANFILES = rtbuf_music_type rtbuf_music_type.h $(am__append_3) \
 	dependencies.mk.1 dependencies.mk.2
 include_HEADERS = symbol.h rtbuf_defs.h rtbuf_type.h rtbuf_fun.h \
 	rtbuf.h $(am__append_2) rtbuf_music.h rtbuf_music_type.h \
-	$(am__append_5) rtbuf_synth.h rtbuf_synth_type.h \
-	$(am__append_8) $(am__append_10)
+	$(am__append_5) rtbuf_dynamic.h rtbuf_synth.h \
+	rtbuf_synth_type.h $(am__append_8) $(am__append_10)
 lib_LTLIBRARIES = librtbuf.la librtbuf_music.la $(am__append_4) \
-	librtbuf_synth.la $(am__append_7) $(am__append_9)
+	librtbuf_dynamic.la librtbuf_synth.la $(am__append_7) \
+	$(am__append_9)
 AM_CPPFLAGS = ${local_cppflags}
 AM_LDFLAGS = ${local_ldflags} -L./.libs
 @DEBUG_FALSE@AM_CFLAGS = -DNDEBUG -O2
@@ -478,6 +483,11 @@ librtbuf_music_la_SOURCES = \
 @ENABLE_SIGNAL_TRUE@	rtbuf_signal_square.c \
 @ENABLE_SIGNAL_TRUE@	rtbuf_signal_type.h
 
+librtbuf_dynamic_la_LIBADD = -lm librtbuf_signal.la librtbuf.la
+librtbuf_dynamic_la_SOURCES = \
+	rtbuf_dynamic.c \
+	rtbuf_dynamic_limiter.c
+
 librtbuf_synth_la_LIBADD = librtbuf_signal.la librtbuf_music.la librtbuf.la
 librtbuf_synth_la_SOURCES = \
 	rtbuf_synth.c \
@@ -600,6 +610,9 @@ clean-libLTLIBRARIES:
 librtbuf.la: $(librtbuf_la_OBJECTS) $(librtbuf_la_DEPENDENCIES) $(EXTRA_librtbuf_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK) -rpath $(libdir) $(librtbuf_la_OBJECTS) $(librtbuf_la_LIBADD) $(LIBS)
 
+librtbuf_dynamic.la: $(librtbuf_dynamic_la_OBJECTS) $(librtbuf_dynamic_la_DEPENDENCIES) $(EXTRA_librtbuf_dynamic_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK) -rpath $(libdir) $(librtbuf_dynamic_la_OBJECTS) $(librtbuf_dynamic_la_LIBADD) $(LIBS)
+
 librtbuf_glfw3.la: $(librtbuf_glfw3_la_OBJECTS) $(librtbuf_glfw3_la_DEPENDENCIES) $(EXTRA_librtbuf_glfw3_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK) $(am_librtbuf_glfw3_la_rpath) $(librtbuf_glfw3_la_OBJECTS) $(librtbuf_glfw3_la_LIBADD) $(LIBS)
 
@@ -679,6 +692,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librtbuf_glfw3_la-rtbuf_glfw3_oscilloscope.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_cli.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_dynamic.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_dynamic_limiter.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_fun.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_lib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_music.Plo@am__quote@
diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1
index ee52f8f..78ac860 100644
--- a/autom4te.cache/output.1
+++ b/autom4te.cache/output.1
@@ -12426,6 +12426,66 @@ else
   ENABLE_RTBUF_FALSE=
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing data_init" >&5
+$as_echo_n "checking for library containing data_init... " >&6; }
+if ${ac_cv_search_data_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char data_init ();
+int
+main ()
+{
+return data_init ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' data; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_data_init=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_data_init+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_data_init+:} false; then :
+  
+else
+  ac_cv_search_data_init=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_data_init" >&5
+$as_echo "$ac_cv_search_data_init" >&6; }
+ac_res=$ac_cv_search_data_init
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  RTBUF_LIBS="$RTBUF_LIBS -ldata"
+else
+  if test x"$enable_rtbuf" = x"true"; then
+                  as_fn_error $? "missing libdata for rtbuf\"" "$LINENO" 5
+                fi
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cli_init" >&5
 $as_echo_n "checking for library containing cli_init... " >&6; }
 if ${ac_cv_search_cli_init+:} false; then :
diff --git a/autom4te.cache/output.4 b/autom4te.cache/output.4
index ee52f8f..78ac860 100644
--- a/autom4te.cache/output.4
+++ b/autom4te.cache/output.4
@@ -12426,6 +12426,66 @@ else
   ENABLE_RTBUF_FALSE=
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing data_init" >&5
+$as_echo_n "checking for library containing data_init... " >&6; }
+if ${ac_cv_search_data_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char data_init ();
+int
+main ()
+{
+return data_init ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' data; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_data_init=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_data_init+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_data_init+:} false; then :
+  
+else
+  ac_cv_search_data_init=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_data_init" >&5
+$as_echo "$ac_cv_search_data_init" >&6; }
+ac_res=$ac_cv_search_data_init
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  RTBUF_LIBS="$RTBUF_LIBS -ldata"
+else
+  if test x"$enable_rtbuf" = x"true"; then
+                  as_fn_error $? "missing libdata for rtbuf\"" "$LINENO" 5
+                fi
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cli_init" >&5
 $as_echo_n "checking for library containing cli_init... " >&6; }
 if ${ac_cv_search_cli_init+:} false; then :
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index 52400ad..884625c 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -44,186 +44,186 @@
                         'configure.ac'
                       ],
                       {
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
+                        'LT_OUTPUT' => 1,
+                        'LTDL_INIT' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'AU_DEFUN' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'LT_PROG_GO' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        'AM_RUN_LOG' => 1,
+                        'AC_PROG_NM' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'gl_PREREQ_ARGZ' => 1,
+                        'LT_PROG_RC' => 1,
+                        '_LT_PROG_F77' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
                         'AC_LTDL_OBJDIR' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AM_PROG_AR' => 1,
+                        'AC_DEFUN' => 1,
                         'AC_PATH_TOOL_PREFIX' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AM_RUN_LOG' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
                         'AC_LIB_LTDL' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        'LTOPTIONS_VERSION' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        'LT_PATH_LD' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AC_ENABLE_STATIC' => 1,
                         'LTDL_CONVENIENCE' => 1,
-                        'AC_PROG_LD' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
                         'LT_PROG_GCJ' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        '_LT_PROG_F77' => 1,
                         'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
                         '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        'gl_PREREQ_ARGZ' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AC_PROG_NM' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'AC_LIBTOOL_F77' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
                         'AM_SET_LEADING_DOT' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        '_m4_warn' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'LT_OUTPUT' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'LT_LANG' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
                         '_AM_DEPENDENCIES' => 1,
-                        'include' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
                         'AC_LIBTOOL_FC' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
                         'LTOBSOLETE_VERSION' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        'LT_PROG_GO' => 1,
-                        'AU_DEFUN' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        'LT_PATH_NM' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'm4_include' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'LT_INIT' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
                         'AC_ENABLE_FAST_INSTALL' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'include' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
                         'AM_SET_DEPDIR' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        'AC_DEFUN' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
                         'AM_SUBST_NOTMAKE' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'AC_CHECK_LIBM' => 1,
                         'LT_LIB_M' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'AM_PROG_NM' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'AC_DISABLE_STATIC' => 1,
                         'AM_MISSING_PROG' => 1,
-                        'AM_CONDITIONAL' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_PROG_LD' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
                         'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'LT_PROG_RC' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        'AM_PROG_AR' => 1,
-                        'LT_PATH_LD' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        '_LT_PROG_FC' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        'LTSUGAR_VERSION' => 1,
-                        'AM_PROG_NM' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        'AC_PROG_EGREP' => 1,
+                        'AM_PROG_CC_C_O' => 1,
                         'LT_AC_PROG_GCJ' => 1,
-                        'm4_pattern_allow' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'LT_LANG' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
                         'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'm4_pattern_forbid' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
                         '_AM_MANGLE_OPTION' => 1,
-                        'LT_INIT' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'm4_include' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
                         'AM_PROG_LD' => 1,
-                        '_LTDL_SETUP' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        'LTDL_INIT' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'AM_SANITY_CHECK' => 1,
                         'gl_FUNC_ARGZ' => 1,
-                        'AC_CHECK_LIBM' => 1
+                        'AM_MAKE_INCLUDE' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        '_m4_warn' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'LT_PATH_NM' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -240,65 +240,65 @@
                         'configure.ac'
                       ],
                       {
+                        'AM_PROG_MOC' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'm4_sinclude' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        'm4_pattern_allow' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        'AH_OUTPUT' => 1,
                         'AM_MAINTAINER_MODE' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AM_NLS' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        '_m4_warn' => 1,
                         'm4_pattern_forbid' => 1,
+                        'AC_LIBSOURCE' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_NLS' => 1,
+                        'include' => 1,
+                        'AC_SUBST_TRACE' => 1,
                         'AM_SILENT_RULES' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        'AC_SUBST' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
                         'AM_GNU_GETTEXT' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'sinclude' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
+                        'AM_PROG_MKDIR_P' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'm4_pattern_allow' => 1,
                         'AM_XGETTEXT_OPTION' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
                         'AC_FC_FREEFORM' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        'AM_PROG_AR' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'LT_INIT' => 1,
-                        'AC_SUBST_TRACE' => 1,
-                        'include' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'AM_POT_TOOLS' => 1,
                         'm4_include' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'AH_OUTPUT' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        '_AM_COND_IF' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AC_SUBST' => 1,
+                        '_AM_COND_ENDIF' => 1,
                         'AM_ENABLE_MULTILIB' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'm4_sinclude' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'LT_INIT' => 1,
+                        'AM_PROG_AR' => 1,
                         'AC_INIT' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
-                        'AC_CANONICAL_HOST' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
                         'AC_CANONICAL_TARGET' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        'AM_PROG_MKDIR_P' => 1,
+                        'sinclude' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
                         'AC_REQUIRE_AUX_FILE' => 1,
-                        'AM_PROG_F77_C_O' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        '_AM_COND_IF' => 1,
-                        'AC_FC_PP_DEFINE' => 1
+                        '_m4_warn' => 1,
+                        'AM_PROG_F77_C_O' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -342,186 +342,186 @@
                         'configure.ac'
                       ],
                       {
-                        'AC_WITH_LTDL' => 1,
-                        'LTDL_INIT' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'gl_FUNC_ARGZ' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
                         'AM_PROG_CC_C_O' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'AM_PROG_LD' => 1,
-                        'm4_include' => 1,
-                        '_LTDL_SETUP' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'LT_LANG' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'm4_pattern_forbid' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AC_PROG_LD' => 1,
+                        '_AM_PROG_TAR' => 1,
                         'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'LT_INIT' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'LT_PATH_NM' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'gl_FUNC_ARGZ' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        '_m4_warn' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
                         '_AM_MANGLE_OPTION' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
                         '_LT_AC_SHELL_INIT' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'm4_pattern_allow' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        'AM_PROG_NM' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'AM_PROG_LD' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
                         'AC_PROG_EGREP' => 1,
-                        '_LT_PROG_FC' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        'LTSUGAR_VERSION' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'LT_LIB_M' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
                         'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'include' => 1,
+                        'AM_SILENT_RULES' => 1,
                         '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        'LT_PATH_LD' => 1,
-                        'AM_PROG_AR' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        'LT_PROG_RC' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'LT_LIB_M' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AC_DEFUN' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'LT_PATH_NM' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AM_DEP_TRACK' => 1,
                         'AC_DISABLE_FAST_INSTALL' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        'AU_DEFUN' => 1,
-                        'LT_PROG_GO' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'AM_PROG_NM' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
                         'AC_LIBTOOL_FC' => 1,
-                        'LT_LANG' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                         '_LT_AC_TAGVAR' => 1,
-                        'LT_OUTPUT' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'include' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
                         '_AM_DEPENDENCIES' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        '_m4_warn' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        '_AM_IF_OPTION' => 1,
                         'AC_PROG_LD_GNU' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'AC_PROG_NM' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
                         'LT_WITH_LTDL' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
                         'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'LT_PATH_LD' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'LT_INIT' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'm4_include' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
                         'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'LT_PROG_RC' => 1,
                         'gl_PREREQ_ARGZ' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
                         '_LT_PROG_F77' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
                         'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        'AC_PROG_LD' => 1,
-                        'LTOPTIONS_VERSION' => 1,
-                        'LT_PROG_GCJ' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
                         'AM_RUN_LOG' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_PROG_NM' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'LT_PROG_GO' => 1,
+                        'AU_DEFUN' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'LT_OUTPUT' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'LTDL_INIT' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AM_PROG_AR' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'AC_DEFUN' => 1,
                         'AC_PATH_TOOL_PREFIX' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AM_DISABLE_SHARED' => 1
+                        'AM_DISABLE_STATIC' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        'AC_LIBTOOL_GCJ' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -560,177 +560,177 @@
                         'configure.ac'
                       ],
                       {
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'm4_pattern_allow' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        'AC_DEFUN_ONCE' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'include' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
                         'LTDL_INSTALLABLE' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'm4_pattern_forbid' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        '_LTDL_SETUP' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
-                        'AM_PROG_LD' => 1,
-                        'm4_include' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_PROG_EGREP' => 1,
                         '_LT_AC_SYS_COMPILER' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'LT_INIT' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
                         'LT_SYS_DLOPEN_SELF' => 1,
-                        'AC_DISABLE_SHARED' => 1,
                         'AC_CHECK_LIBM' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        'gl_FUNC_ARGZ' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        'LTDL_INIT' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'AM_DISABLE_STATIC' => 1,
+                        'LT_LIB_M' => 1,
                         'AC_LIBTOOL_RC' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'AM_PROG_NM' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        'AM_MISSING_PROG' => 1,
                         'AM_PROG_INSTALL_SH' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
                         'AC_PATH_MAGIC' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AC_DEFUN' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        'LT_PATH_NM' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        'LT_PROG_RC' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_PROG_LD' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
                         'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'LT_LANG' => 1,
                         'AM_CONDITIONAL' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'LT_LIB_M' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'LT_PATH_LD' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        'AM_PROG_NM' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        'LTSUGAR_VERSION' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
                         'AM_PROG_MKDIR_P' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'AM_PROG_LD' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'gl_FUNC_ARGZ' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'LT_LIB_DLLOAD' => 1,
                         '_LT_PROG_FC' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
                         '_LT_PROG_CXX' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        'AC_PROG_NM' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
                         '_m4_warn' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        'include' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        'LT_PATH_NM' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
                         'LT_OUTPUT' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'LT_LANG' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        '_LT_LIBOBJ' => 1,
+                        'LTDL_INIT' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'AC_DEFUN_ONCE' => 1,
                         'LT_PROG_GO' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
                         'AU_DEFUN' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
                         'AM_RUN_LOG' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_PROG_NM' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'gl_PREREQ_ARGZ' => 1,
+                        'LT_PROG_RC' => 1,
+                        '_LT_PROG_F77' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
                         'AC_LTDL_OBJDIR' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
                         '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
                         '_LT_LINKER_BOILERPLATE' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        'LT_PROG_GCJ' => 1,
-                        'LTOPTIONS_VERSION' => 1,
-                        'AC_PROG_LD' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'AC_DEFUN' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
                         'LT_AC_PROG_RC' => 1,
-                        '_LT_PROG_F77' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        'LT_PATH_LD' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
                         'LT_WITH_LTDL' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'gl_PREREQ_ARGZ' => 1,
+                        'AC_PROG_LD_GNU' => 1,
                         '_LT_LINKER_OPTION' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AC_ENABLE_STATIC' => 1,
                         'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1
+                        'LT_PROG_GCJ' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'm4_include' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'LT_INIT' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'LT_AC_PROG_EGREP' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -775,192 +775,192 @@
                         'configure.ac'
                       ],
                       {
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        'AM_PROG_AR' => 1,
-                        'LT_PATH_LD' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        'AM_PROG_NM' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
-                        '_LT_PROG_FC' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        'PKG_CHECK_MODULES' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        'LT_INIT' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'm4_include' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
                         'LTSUGAR_VERSION' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        'AC_DEFUN' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AC_PATH_MAGIC' => 1,
+                        '_LT_AC_TAGVAR' => 1,
                         'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'PKG_INSTALLDIR' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        'LTDL_CONVENIENCE' => 1,
                         'AC_ENABLE_STATIC' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'LT_PATH_NM' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        'LT_PROG_RC' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'LT_PATH_LD' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
                         'AC_LTDL_PREOPEN' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'LT_LIB_M' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
                         'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        'AC_DEFUN' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AM_PROG_AR' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
                         '_LT_PROG_LTMAIN' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'm4_include' => 1,
-                        'AM_PROG_LD' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        '_LTDL_SETUP' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'LT_INIT' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'gl_FUNC_ARGZ' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
                         '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        'LTDL_INIT' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        'PKG_CHECK_MODULES' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
                         'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        'PKG_NOARCH_INSTALLDIR' => 1,
-                        'm4_pattern_allow' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        'm4_pattern_forbid' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
                         'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        '_LT_PROG_F77' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        'LT_WITH_LTDL' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
                         'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'PKG_PROG_PKG_CONFIG' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        '_LT_PROG_F77' => 1,
                         'gl_PREREQ_ARGZ' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'LT_PROG_RC' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'AC_PROG_NM' => 1,
+                        'm4_pattern_allow' => 1,
                         'AM_RUN_LOG' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
                         'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'LT_PROG_GCJ' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AU_DEFUN' => 1,
+                        'LT_PROG_GO' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'PKG_CHECK_EXISTS' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'LTDL_INIT' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'LT_OUTPUT' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                         '_LT_AC_LANG_F77_CONFIG' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        'AC_PROG_LD' => 1,
+                        'LT_PATH_NM' => 1,
+                        '_LT_AC_LOCK' => 1,
                         'LTOPTIONS_VERSION' => 1,
-                        'AC_LIBTOOL_FC' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'PKG_NOARCH_INSTALLDIR' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        '_m4_warn' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'gl_FUNC_ARGZ' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
                         'LT_CMD_MAX_LEN' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'LT_LANG' => 1,
-                        'LT_OUTPUT' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        'PKG_CHECK_EXISTS' => 1,
-                        '_AM_DEPENDENCIES' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'AM_PROG_LD' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
                         'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'include' => 1,
-                        'AU_DEFUN' => 1,
-                        'LT_PROG_GO' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'LT_LANG' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AC_PROG_LD' => 1,
+                        '_AM_PROG_TAR' => 1,
                         '_LT_AC_FILE_LTDLL_C' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'AC_PROG_NM' => 1,
+                        'm4_pattern_forbid' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
                         'AM_PROG_LIBTOOL' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'AC_DISABLE_STATIC' => 1,
                         'AC_LIBTOOL_F77' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        '_m4_warn' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'AM_PROG_NM' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        'PKG_INSTALLDIR' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        'LT_LIB_M' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'AM_ENABLE_SHARED' => 1,
                         '_AM_SET_OPTIONS' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'LT_AC_PROG_SED' => 1
+                        'AM_SET_DEPDIR' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'include' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'PKG_PROG_PKG_CONFIG' => 1
                       }
                     ], 'Autom4te::Request' )
            );
diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1
index 9d33ecc..4d874e5 100644
--- a/autom4te.cache/traces.1
+++ b/autom4te.cache/traces.1
@@ -605,85 +605,85 @@ m4trace:configure.ac:33: -1- AC_SUBST_TRACE([ENABLE_RTBUF_FALSE])
 m4trace:configure.ac:33: -1- m4_pattern_allow([^ENABLE_RTBUF_FALSE$])
 m4trace:configure.ac:33: -1- _AM_SUBST_NOTMAKE([ENABLE_RTBUF_TRUE])
 m4trace:configure.ac:33: -1- _AM_SUBST_NOTMAKE([ENABLE_RTBUF_FALSE])
-m4trace:configure.ac:44: -1- AC_SUBST([RTBUF_LIBS])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([RTBUF_LIBS])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^RTBUF_LIBS$])
-m4trace:configure.ac:47: -1- AC_SUBST([MUSIC_LIBS])
-m4trace:configure.ac:47: -1- AC_SUBST_TRACE([MUSIC_LIBS])
-m4trace:configure.ac:47: -1- m4_pattern_allow([^MUSIC_LIBS$])
-m4trace:configure.ac:57: -1- AC_SUBST([SIGNAL_LIBS])
-m4trace:configure.ac:57: -1- AC_SUBST_TRACE([SIGNAL_LIBS])
-m4trace:configure.ac:57: -1- m4_pattern_allow([^SIGNAL_LIBS$])
-m4trace:configure.ac:58: -1- AM_CONDITIONAL([ENABLE_SIGNAL], [test x"$enable_signal" = x"true"])
-m4trace:configure.ac:58: -1- AC_SUBST([ENABLE_SIGNAL_TRUE])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([ENABLE_SIGNAL_TRUE])
-m4trace:configure.ac:58: -1- m4_pattern_allow([^ENABLE_SIGNAL_TRUE$])
-m4trace:configure.ac:58: -1- AC_SUBST([ENABLE_SIGNAL_FALSE])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([ENABLE_SIGNAL_FALSE])
-m4trace:configure.ac:58: -1- m4_pattern_allow([^ENABLE_SIGNAL_FALSE$])
-m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([ENABLE_SIGNAL_TRUE])
-m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([ENABLE_SIGNAL_FALSE])
-m4trace:configure.ac:65: -1- AC_SUBST([SNDIO_LIBS])
-m4trace:configure.ac:65: -1- AC_SUBST_TRACE([SNDIO_LIBS])
-m4trace:configure.ac:65: -1- m4_pattern_allow([^SNDIO_LIBS$])
-m4trace:configure.ac:66: -1- AM_CONDITIONAL([ENABLE_SNDIO], [test x"$enable_sndio" = x"true"])
-m4trace:configure.ac:66: -1- AC_SUBST([ENABLE_SNDIO_TRUE])
-m4trace:configure.ac:66: -1- AC_SUBST_TRACE([ENABLE_SNDIO_TRUE])
-m4trace:configure.ac:66: -1- m4_pattern_allow([^ENABLE_SNDIO_TRUE$])
-m4trace:configure.ac:66: -1- AC_SUBST([ENABLE_SNDIO_FALSE])
-m4trace:configure.ac:66: -1- AC_SUBST_TRACE([ENABLE_SNDIO_FALSE])
-m4trace:configure.ac:66: -1- m4_pattern_allow([^ENABLE_SNDIO_FALSE$])
-m4trace:configure.ac:66: -1- _AM_SUBST_NOTMAKE([ENABLE_SNDIO_TRUE])
-m4trace:configure.ac:66: -1- _AM_SUBST_NOTMAKE([ENABLE_SNDIO_FALSE])
-m4trace:configure.ac:70: -1- AC_SUBST([GLFW3_CFLAGS])
-m4trace:configure.ac:70: -1- AC_SUBST_TRACE([GLFW3_CFLAGS])
-m4trace:configure.ac:70: -1- m4_pattern_allow([^GLFW3_CFLAGS$])
-m4trace:configure.ac:70: -1- AC_SUBST([GLFW3_LIBS])
-m4trace:configure.ac:70: -1- AC_SUBST_TRACE([GLFW3_LIBS])
-m4trace:configure.ac:70: -1- m4_pattern_allow([^GLFW3_LIBS$])
-m4trace:configure.ac:71: -1- AM_CONDITIONAL([ENABLE_GLFW3], [test x"$enable_glfw3" = x"true"])
-m4trace:configure.ac:71: -1- AC_SUBST([ENABLE_GLFW3_TRUE])
-m4trace:configure.ac:71: -1- AC_SUBST_TRACE([ENABLE_GLFW3_TRUE])
-m4trace:configure.ac:71: -1- m4_pattern_allow([^ENABLE_GLFW3_TRUE$])
-m4trace:configure.ac:71: -1- AC_SUBST([ENABLE_GLFW3_FALSE])
-m4trace:configure.ac:71: -1- AC_SUBST_TRACE([ENABLE_GLFW3_FALSE])
-m4trace:configure.ac:71: -1- m4_pattern_allow([^ENABLE_GLFW3_FALSE$])
-m4trace:configure.ac:71: -1- _AM_SUBST_NOTMAKE([ENABLE_GLFW3_TRUE])
-m4trace:configure.ac:71: -1- _AM_SUBST_NOTMAKE([ENABLE_GLFW3_FALSE])
-m4trace:configure.ac:86: -1- AM_CONDITIONAL([DEBUG], [test x"$debug" = x"true"])
-m4trace:configure.ac:86: -1- AC_SUBST([DEBUG_TRUE])
-m4trace:configure.ac:86: -1- AC_SUBST_TRACE([DEBUG_TRUE])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^DEBUG_TRUE$])
-m4trace:configure.ac:86: -1- AC_SUBST([DEBUG_FALSE])
-m4trace:configure.ac:86: -1- AC_SUBST_TRACE([DEBUG_FALSE])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^DEBUG_FALSE$])
-m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([DEBUG_TRUE])
-m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([DEBUG_FALSE])
-m4trace:configure.ac:88: -1- AC_CONFIG_FILES([Makefile])
-m4trace:configure.ac:90: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:90: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:90: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:90: -1- AC_SUBST([am__EXEEXT_TRUE])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:90: -1- AC_SUBST([am__EXEEXT_FALSE])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:90: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:90: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([MKDIR_P])
-m4trace:configure.ac:90: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
+m4trace:configure.ac:49: -1- AC_SUBST([RTBUF_LIBS])
+m4trace:configure.ac:49: -1- AC_SUBST_TRACE([RTBUF_LIBS])
+m4trace:configure.ac:49: -1- m4_pattern_allow([^RTBUF_LIBS$])
+m4trace:configure.ac:52: -1- AC_SUBST([MUSIC_LIBS])
+m4trace:configure.ac:52: -1- AC_SUBST_TRACE([MUSIC_LIBS])
+m4trace:configure.ac:52: -1- m4_pattern_allow([^MUSIC_LIBS$])
+m4trace:configure.ac:62: -1- AC_SUBST([SIGNAL_LIBS])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([SIGNAL_LIBS])
+m4trace:configure.ac:62: -1- m4_pattern_allow([^SIGNAL_LIBS$])
+m4trace:configure.ac:63: -1- AM_CONDITIONAL([ENABLE_SIGNAL], [test x"$enable_signal" = x"true"])
+m4trace:configure.ac:63: -1- AC_SUBST([ENABLE_SIGNAL_TRUE])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([ENABLE_SIGNAL_TRUE])
+m4trace:configure.ac:63: -1- m4_pattern_allow([^ENABLE_SIGNAL_TRUE$])
+m4trace:configure.ac:63: -1- AC_SUBST([ENABLE_SIGNAL_FALSE])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([ENABLE_SIGNAL_FALSE])
+m4trace:configure.ac:63: -1- m4_pattern_allow([^ENABLE_SIGNAL_FALSE$])
+m4trace:configure.ac:63: -1- _AM_SUBST_NOTMAKE([ENABLE_SIGNAL_TRUE])
+m4trace:configure.ac:63: -1- _AM_SUBST_NOTMAKE([ENABLE_SIGNAL_FALSE])
+m4trace:configure.ac:70: -1- AC_SUBST([SNDIO_LIBS])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([SNDIO_LIBS])
+m4trace:configure.ac:70: -1- m4_pattern_allow([^SNDIO_LIBS$])
+m4trace:configure.ac:71: -1- AM_CONDITIONAL([ENABLE_SNDIO], [test x"$enable_sndio" = x"true"])
+m4trace:configure.ac:71: -1- AC_SUBST([ENABLE_SNDIO_TRUE])
+m4trace:configure.ac:71: -1- AC_SUBST_TRACE([ENABLE_SNDIO_TRUE])
+m4trace:configure.ac:71: -1- m4_pattern_allow([^ENABLE_SNDIO_TRUE$])
+m4trace:configure.ac:71: -1- AC_SUBST([ENABLE_SNDIO_FALSE])
+m4trace:configure.ac:71: -1- AC_SUBST_TRACE([ENABLE_SNDIO_FALSE])
+m4trace:configure.ac:71: -1- m4_pattern_allow([^ENABLE_SNDIO_FALSE$])
+m4trace:configure.ac:71: -1- _AM_SUBST_NOTMAKE([ENABLE_SNDIO_TRUE])
+m4trace:configure.ac:71: -1- _AM_SUBST_NOTMAKE([ENABLE_SNDIO_FALSE])
+m4trace:configure.ac:75: -1- AC_SUBST([GLFW3_CFLAGS])
+m4trace:configure.ac:75: -1- AC_SUBST_TRACE([GLFW3_CFLAGS])
+m4trace:configure.ac:75: -1- m4_pattern_allow([^GLFW3_CFLAGS$])
+m4trace:configure.ac:75: -1- AC_SUBST([GLFW3_LIBS])
+m4trace:configure.ac:75: -1- AC_SUBST_TRACE([GLFW3_LIBS])
+m4trace:configure.ac:75: -1- m4_pattern_allow([^GLFW3_LIBS$])
+m4trace:configure.ac:76: -1- AM_CONDITIONAL([ENABLE_GLFW3], [test x"$enable_glfw3" = x"true"])
+m4trace:configure.ac:76: -1- AC_SUBST([ENABLE_GLFW3_TRUE])
+m4trace:configure.ac:76: -1- AC_SUBST_TRACE([ENABLE_GLFW3_TRUE])
+m4trace:configure.ac:76: -1- m4_pattern_allow([^ENABLE_GLFW3_TRUE$])
+m4trace:configure.ac:76: -1- AC_SUBST([ENABLE_GLFW3_FALSE])
+m4trace:configure.ac:76: -1- AC_SUBST_TRACE([ENABLE_GLFW3_FALSE])
+m4trace:configure.ac:76: -1- m4_pattern_allow([^ENABLE_GLFW3_FALSE$])
+m4trace:configure.ac:76: -1- _AM_SUBST_NOTMAKE([ENABLE_GLFW3_TRUE])
+m4trace:configure.ac:76: -1- _AM_SUBST_NOTMAKE([ENABLE_GLFW3_FALSE])
+m4trace:configure.ac:91: -1- AM_CONDITIONAL([DEBUG], [test x"$debug" = x"true"])
+m4trace:configure.ac:91: -1- AC_SUBST([DEBUG_TRUE])
+m4trace:configure.ac:91: -1- AC_SUBST_TRACE([DEBUG_TRUE])
+m4trace:configure.ac:91: -1- m4_pattern_allow([^DEBUG_TRUE$])
+m4trace:configure.ac:91: -1- AC_SUBST([DEBUG_FALSE])
+m4trace:configure.ac:91: -1- AC_SUBST_TRACE([DEBUG_FALSE])
+m4trace:configure.ac:91: -1- m4_pattern_allow([^DEBUG_FALSE$])
+m4trace:configure.ac:91: -1- _AM_SUBST_NOTMAKE([DEBUG_TRUE])
+m4trace:configure.ac:91: -1- _AM_SUBST_NOTMAKE([DEBUG_FALSE])
+m4trace:configure.ac:93: -1- AC_CONFIG_FILES([Makefile])
+m4trace:configure.ac:95: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:95: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:95: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:95: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:95: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:95: -1- AC_SUBST([am__EXEEXT_TRUE])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
+m4trace:configure.ac:95: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:95: -1- AC_SUBST([am__EXEEXT_FALSE])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
+m4trace:configure.ac:95: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:95: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:95: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:95: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
diff --git a/autom4te.cache/traces.4 b/autom4te.cache/traces.4
index 719d026..3a1f3fa 100644
--- a/autom4te.cache/traces.4
+++ b/autom4te.cache/traces.4
@@ -9399,45 +9399,45 @@ m4trace:configure.ac:33: -1- m4_pattern_allow([^ENABLE_RTBUF_TRUE$])
 m4trace:configure.ac:33: -1- m4_pattern_allow([^ENABLE_RTBUF_FALSE$])
 m4trace:configure.ac:33: -1- _AM_SUBST_NOTMAKE([ENABLE_RTBUF_TRUE])
 m4trace:configure.ac:33: -1- _AM_SUBST_NOTMAKE([ENABLE_RTBUF_FALSE])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^RTBUF_LIBS$])
-m4trace:configure.ac:47: -1- m4_pattern_allow([^MUSIC_LIBS$])
-m4trace:configure.ac:57: -1- m4_pattern_allow([^SIGNAL_LIBS$])
-m4trace:configure.ac:58: -1- AM_CONDITIONAL([ENABLE_SIGNAL], [test x"$enable_signal" = x"true"])
-m4trace:configure.ac:58: -1- m4_pattern_allow([^ENABLE_SIGNAL_TRUE$])
-m4trace:configure.ac:58: -1- m4_pattern_allow([^ENABLE_SIGNAL_FALSE$])
-m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([ENABLE_SIGNAL_TRUE])
-m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([ENABLE_SIGNAL_FALSE])
-m4trace:configure.ac:65: -1- m4_pattern_allow([^SNDIO_LIBS$])
-m4trace:configure.ac:66: -1- AM_CONDITIONAL([ENABLE_SNDIO], [test x"$enable_sndio" = x"true"])
-m4trace:configure.ac:66: -1- m4_pattern_allow([^ENABLE_SNDIO_TRUE$])
-m4trace:configure.ac:66: -1- m4_pattern_allow([^ENABLE_SNDIO_FALSE$])
-m4trace:configure.ac:66: -1- _AM_SUBST_NOTMAKE([ENABLE_SNDIO_TRUE])
-m4trace:configure.ac:66: -1- _AM_SUBST_NOTMAKE([ENABLE_SNDIO_FALSE])
-m4trace:configure.ac:70: -1- PKG_CHECK_MODULES([GLFW3], [glfw3], [enable_glfw3=true], [enable_glfw3=false])
-m4trace:configure.ac:70: -1- m4_pattern_allow([^GLFW3_CFLAGS$])
-m4trace:configure.ac:70: -1- m4_pattern_allow([^GLFW3_LIBS$])
-m4trace:configure.ac:70: -1- PKG_CHECK_EXISTS([glfw3], [pkg_cv_[]GLFW3_CFLAGS=`$PKG_CONFIG --[]cflags "glfw3" 2>/dev/null`
+m4trace:configure.ac:49: -1- m4_pattern_allow([^RTBUF_LIBS$])
+m4trace:configure.ac:52: -1- m4_pattern_allow([^MUSIC_LIBS$])
+m4trace:configure.ac:62: -1- m4_pattern_allow([^SIGNAL_LIBS$])
+m4trace:configure.ac:63: -1- AM_CONDITIONAL([ENABLE_SIGNAL], [test x"$enable_signal" = x"true"])
+m4trace:configure.ac:63: -1- m4_pattern_allow([^ENABLE_SIGNAL_TRUE$])
+m4trace:configure.ac:63: -1- m4_pattern_allow([^ENABLE_SIGNAL_FALSE$])
+m4trace:configure.ac:63: -1- _AM_SUBST_NOTMAKE([ENABLE_SIGNAL_TRUE])
+m4trace:configure.ac:63: -1- _AM_SUBST_NOTMAKE([ENABLE_SIGNAL_FALSE])
+m4trace:configure.ac:70: -1- m4_pattern_allow([^SNDIO_LIBS$])
+m4trace:configure.ac:71: -1- AM_CONDITIONAL([ENABLE_SNDIO], [test x"$enable_sndio" = x"true"])
+m4trace:configure.ac:71: -1- m4_pattern_allow([^ENABLE_SNDIO_TRUE$])
+m4trace:configure.ac:71: -1- m4_pattern_allow([^ENABLE_SNDIO_FALSE$])
+m4trace:configure.ac:71: -1- _AM_SUBST_NOTMAKE([ENABLE_SNDIO_TRUE])
+m4trace:configure.ac:71: -1- _AM_SUBST_NOTMAKE([ENABLE_SNDIO_FALSE])
+m4trace:configure.ac:75: -1- PKG_CHECK_MODULES([GLFW3], [glfw3], [enable_glfw3=true], [enable_glfw3=false])
+m4trace:configure.ac:75: -1- m4_pattern_allow([^GLFW3_CFLAGS$])
+m4trace:configure.ac:75: -1- m4_pattern_allow([^GLFW3_LIBS$])
+m4trace:configure.ac:75: -1- PKG_CHECK_EXISTS([glfw3], [pkg_cv_[]GLFW3_CFLAGS=`$PKG_CONFIG --[]cflags "glfw3" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:70: -1- PKG_CHECK_EXISTS([glfw3], [pkg_cv_[]GLFW3_LIBS=`$PKG_CONFIG --[]libs "glfw3" 2>/dev/null`
+m4trace:configure.ac:75: -1- PKG_CHECK_EXISTS([glfw3], [pkg_cv_[]GLFW3_LIBS=`$PKG_CONFIG --[]libs "glfw3" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:70: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:71: -1- AM_CONDITIONAL([ENABLE_GLFW3], [test x"$enable_glfw3" = x"true"])
-m4trace:configure.ac:71: -1- m4_pattern_allow([^ENABLE_GLFW3_TRUE$])
-m4trace:configure.ac:71: -1- m4_pattern_allow([^ENABLE_GLFW3_FALSE$])
-m4trace:configure.ac:71: -1- _AM_SUBST_NOTMAKE([ENABLE_GLFW3_TRUE])
-m4trace:configure.ac:71: -1- _AM_SUBST_NOTMAKE([ENABLE_GLFW3_FALSE])
-m4trace:configure.ac:86: -1- AM_CONDITIONAL([DEBUG], [test x"$debug" = x"true"])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^DEBUG_TRUE$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^DEBUG_FALSE$])
-m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([DEBUG_TRUE])
-m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([DEBUG_FALSE])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:90: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:90: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:90: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:90: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
-m4trace:configure.ac:90: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:90: -1- _LT_PROG_LTMAIN
+m4trace:configure.ac:75: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:76: -1- AM_CONDITIONAL([ENABLE_GLFW3], [test x"$enable_glfw3" = x"true"])
+m4trace:configure.ac:76: -1- m4_pattern_allow([^ENABLE_GLFW3_TRUE$])
+m4trace:configure.ac:76: -1- m4_pattern_allow([^ENABLE_GLFW3_FALSE$])
+m4trace:configure.ac:76: -1- _AM_SUBST_NOTMAKE([ENABLE_GLFW3_TRUE])
+m4trace:configure.ac:76: -1- _AM_SUBST_NOTMAKE([ENABLE_GLFW3_FALSE])
+m4trace:configure.ac:91: -1- AM_CONDITIONAL([DEBUG], [test x"$debug" = x"true"])
+m4trace:configure.ac:91: -1- m4_pattern_allow([^DEBUG_TRUE$])
+m4trace:configure.ac:91: -1- m4_pattern_allow([^DEBUG_FALSE$])
+m4trace:configure.ac:91: -1- _AM_SUBST_NOTMAKE([DEBUG_TRUE])
+m4trace:configure.ac:91: -1- _AM_SUBST_NOTMAKE([DEBUG_FALSE])
+m4trace:configure.ac:95: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:95: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:95: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:95: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:95: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:95: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:95: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:95: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
+m4trace:configure.ac:95: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:95: -1- _LT_PROG_LTMAIN
diff --git a/configure b/configure
index 7dd2072..abefe04 100755
--- a/configure
+++ b/configure
@@ -12426,6 +12426,66 @@ else
   ENABLE_RTBUF_FALSE=
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing data_init" >&5
+$as_echo_n "checking for library containing data_init... " >&6; }
+if ${ac_cv_search_data_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char data_init ();
+int
+main ()
+{
+return data_init ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' data; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_data_init=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_data_init+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_data_init+:} false; then :
+
+else
+  ac_cv_search_data_init=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_data_init" >&5
+$as_echo "$ac_cv_search_data_init" >&6; }
+ac_res=$ac_cv_search_data_init
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  RTBUF_LIBS="$RTBUF_LIBS -ldata"
+else
+  if test x"$enable_rtbuf" = x"true"; then
+                  as_fn_error $? "missing libdata for rtbuf\"" "$LINENO" 5
+                fi
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cli_init" >&5
 $as_echo_n "checking for library containing cli_init... " >&6; }
 if ${ac_cv_search_cli_init+:} false; then :