summaryrefslogtreecommitdiff
path: root/libre/isdnutils-dfsg/modern-autoconf.patch
blob: f80f34f544e7447f667134a6842238c0830bdfba (plain)
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
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/Makefile isdnutils-dfsg-3.25.1.3.5/Makefile
--- isdnutils-dfsg-3.25.1.3.5.orig/Makefile	2014-11-19 00:40:58.000000000 -0500
+++ isdnutils-dfsg-3.25.1.3.5/Makefile	2014-11-19 00:41:00.452734610 -0500
@@ -53,10 +53,10 @@
 endif
 
 ifeq ($(CONFIG_RCAPID),y)
-	SUBDIRS := $(SUBDIRS) capiinfo
+	SUBDIRS := $(SUBDIRS) capi20 capiinfo
 else
 	ifeq ($(CONFIG_AVMCAPICTRL),y)
-		SUBDIRS := $(SUBDIRS) capiinfo
+		SUBDIRS := $(SUBDIRS) capi20 capiinfo
 	endif
 endif
 
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capi20/configure.ac isdnutils-dfsg-3.25.1.3.5/capi20/configure.ac
--- isdnutils-dfsg-3.25.1.3.5.orig/capi20/configure.ac	2014-11-19 00:40:58.000000000 -0500
+++ isdnutils-dfsg-3.25.1.3.5/capi20/configure.ac	2014-11-19 00:41:00.452734610 -0500
@@ -1,7 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(capi20.c)
+AC_INIT(libcapi20, ${LIBCAPI_VERSION}.${LIBCAPI_VERSION_RELEASE})
+AC_CONFIG_SRCDIR(capi20.c)
+AM_INIT_AUTOMAKE
+
 AC_ARG_ENABLE([V2],
   AS_HELP_STRING([--enable-V2],[build libcapi20 version 2 compatible library]),
      [case "${enableval}" in
@@ -22,7 +25,6 @@
 	LIBCAPI_VERSION_RELEASE=6
 ])
 
-AM_INIT_AUTOMAKE(libcapi20,${LIBCAPI_VERSION}.${LIBCAPI_VERSION_RELEASE})
 AC_PREFIX_DEFAULT(/usr)
 AC_SUBST(BUILD)
 
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capifax/Makefile.am isdnutils-dfsg-3.25.1.3.5/capifax/Makefile.am
--- isdnutils-dfsg-3.25.1.3.5.orig/capifax/Makefile.am	2014-11-19 00:40:58.000000000 -0500
+++ isdnutils-dfsg-3.25.1.3.5/capifax/Makefile.am	2014-11-19 00:42:07.217978987 -0500
@@ -7,9 +7,9 @@
 MAINTAINERCLEANFILES    = configure aclocal.m4 Makefile.in config.h.in \
 			  stamp-h.in
 
-INCLUDES = $(all_includes)
+AM_CPPFLAGS = -I../capi20 $(all_includes)
 CFLAGS = -Wall -O2
-LDFLAGS = $(all_libraries)
+LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 LDADD = -lcapi20
 
 bin_PROGRAMS = capifax capifaxrcvd
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capifax/configure.ac isdnutils-dfsg-3.25.1.3.5/capifax/configure.ac
--- isdnutils-dfsg-3.25.1.3.5.orig/capifax/configure.ac	2012-07-06 02:27:19.000000000 -0400
+++ isdnutils-dfsg-3.25.1.3.5/capifax/configure.ac	2014-11-19 00:41:00.456067872 -0500
@@ -1,6 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(capifax.c)
-AM_INIT_AUTOMAKE(capifax, 1.0)
+AC_INIT(capifax, 1.0)
+AC_CONFIG_SRCDIR(capifax.c)
+AM_INIT_AUTOMAKE
 AC_PREFIX_DEFAULT(/usr)
 
 CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"}
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/Makefile.am isdnutils-dfsg-3.25.1.3.5/capiinfo/Makefile.am
--- isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/Makefile.am	2014-11-19 00:40:58.000000000 -0500
+++ isdnutils-dfsg-3.25.1.3.5/capiinfo/Makefile.am	2014-11-19 00:41:00.456067872 -0500
@@ -7,9 +7,9 @@
 MAINTAINERCLEANFILES    = configure aclocal.m4 Makefile.in config.h.in \
 			  stamp-h.in comperr
 
-INCLUDES = $(all_includes)
+AM_CPPFLAGS = -I../capi20 $(all_includes)
 CFLAGS = -Wall -O2
-LDFLAGS = $(all_libraries)
+LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 LDADD = -lcapi20
 
 bin_PROGRAMS = capiinfo
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/configure.ac isdnutils-dfsg-3.25.1.3.5/capiinfo/configure.ac
--- isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/configure.ac	2014-11-19 00:40:58.000000000 -0500
+++ isdnutils-dfsg-3.25.1.3.5/capiinfo/configure.ac	2014-11-19 00:41:00.456067872 -0500
@@ -1,6 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(capiinfo.c)
-AM_INIT_AUTOMAKE(capiinfo, 1.0)
+AC_INIT(capiinfo, 1.0)
+AC_CONFIG_SRCDIR(capiinfo.c)
+AM_INIT_AUTOMAKE
 AC_PREFIX_DEFAULT(/usr)
 
 I4LCONFDIR=`eval echo ${CONFIG_I4LCONFDIR:-"/etc/isdn"}`
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinit/Makefile.am isdnutils-dfsg-3.25.1.3.5/capiinit/Makefile.am
--- isdnutils-dfsg-3.25.1.3.5.orig/capiinit/Makefile.am	2012-07-06 02:27:19.000000000 -0400
+++ isdnutils-dfsg-3.25.1.3.5/capiinit/Makefile.am	2014-11-19 00:41:00.456067872 -0500
@@ -7,7 +7,7 @@
 MAINTAINERCLEANFILES    = configure aclocal.m4 Makefile.in config.h.in \
 			  stamp-h.in comperr core
 
-INCLUDES = $(all_includes)
+AM_CPPFLAGS = $(all_includes)
 CFLAGS = -Wall -O2 -D_GNU_SOURCE # -g
 LDFLAGS = $(all_libraries)
 LDADD = 
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinit/configure.ac isdnutils-dfsg-3.25.1.3.5/capiinit/configure.ac
--- isdnutils-dfsg-3.25.1.3.5.orig/capiinit/configure.ac	2012-07-06 02:27:19.000000000 -0400
+++ isdnutils-dfsg-3.25.1.3.5/capiinit/configure.ac	2014-11-19 00:41:00.456067872 -0500
@@ -1,6 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(capiinit.c)
-AM_INIT_AUTOMAKE(capiinit, 1.0)
+AC_INIT(capiinit, 1.0)
+AC_CONFIG_SRCDIR(capiinit.c)
+AM_INIT_AUTOMAKE
 AC_PREFIX_DEFAULT(/)
 
 CONFIG_SBINDIR$=${CONFIG_CARD_SBINDIR:-"/sbin"}
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/imon/configure.ac isdnutils-dfsg-3.25.1.3.5/imon/configure.ac
--- isdnutils-dfsg-3.25.1.3.5.orig/imon/configure.ac	2012-07-06 02:27:19.000000000 -0400
+++ isdnutils-dfsg-3.25.1.3.5/imon/configure.ac	2014-11-19 00:41:00.459401135 -0500
@@ -4,8 +4,8 @@
 AC_PREFIX_DEFAULT(/usr)
 
 I4LVERSION=${I4LVERSION:-"?.?"}
-CONFIG_MANDIR=`eval echo ${CONFIG_MANDIR:-"/usr/man"}`
-CONFIG_SBINDIR=`eval echo ${CONFIG_SBINDIR:-"/sbin"}`
+CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"}
+CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"}
 MANDATE=`grep CHECKIN imon.man.in | awk '{print $4}'`
 
 dnl Checks for programs.
@@ -38,14 +38,14 @@
 AC_ARG_WITH(sbin,
 	[  --with-sbin=DIR         Set dir where binary is istalled. [/sbin]],
 	CONFIG_SBINDIR="${withval}"
-	AC_DEFINE(CONFIG_SBINDIR,"${withval}"),
+	AC_DEFINE(CONFIG_SBINDIR,"${withval}", [imon sbin directory]),
 )
 
 dnl Optional man directory
 AC_ARG_WITH(man,
 	[  --with-man=DIR          Set manpage dir. [/usr/man]],
 	CONFIG_MANDIR="${withval}"
-	AC_DEFINE(CONFIG_MANDIR,"${withval}"),
+	AC_DEFINE(CONFIG_MANDIR,"${withval}", [imon manual directory]),
 )
 
 AC_SUBST(INSTALL)
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnctrl/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnctrl/configure.ac
--- isdnutils-dfsg-3.25.1.3.5.orig/isdnctrl/configure.ac	2012-07-06 02:27:19.000000000 -0400
+++ isdnutils-dfsg-3.25.1.3.5/isdnctrl/configure.ac	2014-11-19 00:41:00.459401135 -0500
@@ -30,21 +30,21 @@
 AC_ARG_WITH(sbin,
 	[  --with-sbin=DIR         Set dir where binary is istalled. [/sbin]],
 	CONFIG_SBINDIR="${withval}"
-	AC_DEFINE(CONFIG_SBINDIR,"${withval}"),
+	AC_DEFINE(CONFIG_SBINDIR,"${withval}",[isdnctrl sbin directory]),
 )
 
 dnl Optional man directory
 AC_ARG_WITH(man,
 	[  --with-man=DIR          Set manpage dir. [/usr/man]],
 	CONFIG_MANDIR="${withval}"
-	AC_DEFINE(CONFIG_MANDIR,"${withval}"),
+	AC_DEFINE(CONFIG_MANDIR,"${withval}",[isdn manual directory]),
 )
 
 dnl Optional config-file-option
 AC_ARG_ENABLE(cfile,
 	[  --enable-cfile          Enable configfile option [no]],
 	CONFIG_ISDNCTRL_CONF=y
-	AC_DEFINE(CONFIG_ISDNCTRL_CONF,y),
+	AC_DEFINE(CONFIG_ISDNCTRL_CONF,y,[enable isdnctrl config file]),
 )
 
 AC_SUBST(INSTALL)
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/aclocal.m4 isdnutils-dfsg-3.25.1.3.5/isdnlog/aclocal.m4
--- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/aclocal.m4	2012-07-06 02:27:19.000000000 -0400
+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/aclocal.m4	2014-11-19 00:41:00.459401135 -0500
@@ -2,7 +2,7 @@
 dnl Check for postgres
 dnl
 
-AC_DEFUN(AC_CHECK_POSTGRES, [
+AC_DEFUN([AC_CHECK_POSTGRES], [
 	POSTGRESDIR=""
 	pqdir="no"
 	tst_postgresdir="$CONFIG_ISDNLOG_POSTGRESDIR"
@@ -45,13 +45,13 @@
 	if test "$pqdir" != "no" ; then
 		AC_MSG_RESULT("yes")
 		POSTGRES=1
-		AC_DEFINE_UNQUOTED(POSTGRES,1)
+		AC_DEFINE_UNQUOTED(POSTGRES,1,[Define to 1 if postgres should be used])
 	else
 		AC_MSG_RESULT("no POSTGRES DISABLED")
 		pqdir=""
 	fi
 	POSTGRESDIR="$pqdir"
-	AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir")
+	AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir",[Define to the prefix that postgres was installed to.])
 	AC_SUBST(POSTGRES)
 	AC_SUBST(POSTGRESDIR)
 ])
@@ -59,7 +59,7 @@
 dnl Check for mysql
 dnl
 
-AC_DEFUN(AC_CHECK_MYSQLDB, [
+AC_DEFUN([AC_CHECK_MYSQLDB], [
 	MYSQLDIR=""
 	mydir="no"
 	tst_mysqldir="$CONFIG_ISDNLOG_MYSQLDIR"
@@ -108,13 +108,13 @@
 	if test "$mydir" != "no" ; then
 		AC_MSG_RESULT("yes")
 		MYSQLDB=1
-		AC_DEFINE_UNQUOTED(MYSQLDB,1)
+		AC_DEFINE_UNQUOTED(MYSQLDB,1,[Define to 1 if mysql should be used])
 	else
 		AC_MSG_RESULT("no MYSQL DISABLED")
 		mydir=""
 	fi
 	MYSQLDIR="$mydir"
-	AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir")
+	AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir",[Define to the prefix that postgres was installed to.])
 	AC_SUBST(MYSQLDB)
 	AC_SUBST(MYSQLDIR)
 ])
@@ -123,7 +123,7 @@
 dnl Check for Oracle
 dnl
 
-AC_DEFUN(AC_CHECK_ORACLE, [
+AC_DEFUN([AC_CHECK_ORACLE], [
 	oradir="no"
 	if test "$ORACLE_HOME" != "" && test "$CONFIG_ISDNLOG_ORACLE" = "y" ; then
 		AC_MSG_CHECKING([for Oracle in ${ORACLE_HOME}])
@@ -134,7 +134,7 @@
 	if test "$oradir" != "no" ; then
 		AC_MSG_RESULT("yes")
 		ORACLE=1
-		AC_DEFINE_UNQUOTED(ORACLE,1)
+		AC_DEFINE_UNQUOTED(ORACLE,1,[Define to 1 if oracle should b used])
 	else
 		AC_MSG_RESULT("no ORACLE DISABLED")
 	fi
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/acinclude.m4 isdnutils-dfsg-3.25.1.3.5/isdnlog/client/acinclude.m4
--- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/acinclude.m4	2012-07-06 02:27:19.000000000 -0400
+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/client/acinclude.m4	2014-11-19 00:41:00.459401135 -0500
@@ -15,7 +15,7 @@
 dnl PARTICULAR PURPOSE.
 
 
-AC_DEFUN(AC_FIND_FILE,
+AC_DEFUN([AC_FIND_FILE],
 [
 $3=NO
 for i in $2;
@@ -30,7 +30,7 @@
 done
 ])
 
-AC_DEFUN(AC_PATH_QT_DIRECT,
+AC_DEFUN([AC_PATH_QT_DIRECT],
 [if test "$ac_qt_includes" = NO; then
 AC_TRY_CPP([#include <qtstream.h>],
 [
@@ -40,14 +40,14 @@
 fi
 ])
 
-AC_DEFUN(AC_PATH_QT_MOC,
+AC_DEFUN([AC_PATH_QT_MOC],
 [
 AC_PATH_PROG(MOC, moc, /usr/bin/moc,
  $PATH:/usr/bin:/usr/X11R6/bin:$QTDIR/bin:/usr/lib/qt/bin:/usr/local/qt/bin)
 ])
 
 
-AC_DEFUN(AC_CREATE_KFSSTND,
+AC_DEFUN([AC_CREATE_KFSSTND],
 [
 
 kde_htmldir="\$(prefix)/share/doc/HTML"
@@ -75,59 +75,9 @@
 
 ])
 
-AC_DEFUN(K_PATH_X,
+AC_DEFUN([AC_PATH_QT_1_3],
 [
-AC_MSG_CHECKING(for X)
-AC_CACHE_VAL(ac_cv_have_x,
-[# One or both of the vars are not set, and there is no cached value.
-ac_x_includes=NO ac_x_libraries=NO
-AC_PATH_X_DIRECT
-AC_PATH_X_XMKMF
-if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
-  AC_MSG_ERROR([Can't find X. Please add the correct paths. View configure --help for usage!])
-else
-  # Record where we found X for the cache.
-  ac_cv_have_x="have_x=yes \
-                ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi])dnl
-eval "$ac_cv_have_x"
- 
-if test "$have_x" != yes; then
-  AC_MSG_RESULT($have_x)
-  no_x=yes
-else
-  # If each of the values was on the command line, it overrides each guess.
-  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-  # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes \
-                ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  AC_MSG_RESULT([libraries $x_libraries, headers $x_includes])
-fi
-
-if test -z "$x_includes" || test "x$x_includes" = xNONE; then
-  X_INCLUDES=""
-  x_includes="."; dnl better than nothing :-
- else
-  X_INCLUDES="-I$x_includes"
-fi
-
-if test -z "$x_libraries" || test "$x_libraries" = xNONE; then
-  X_LDFLAGS=""
-  x_libraries="/usr/lib"; dnl better than nothing :-
-  all_libraries=""
- else
-  X_LDFLAGS="-L$x_libraries"
-  all_libraries=$X_LDFLAGS
-fi
-
-AC_SUBST(X_INCLUDES)
-AC_SUBST(X_LDFLAGS)
-all_includes=$X_INCLUDES
-])
-AC_DEFUN(AC_PATH_QT_1_3,
-[
-AC_REQUIRE([K_PATH_X])
+AC_REQUIRE([AC_PATH_X])
 
 AC_MSG_CHECKING([for QT-1.30])
 ac_qt_includes=NO ac_qt_libraries=NO
@@ -256,12 +206,12 @@
 AC_PATH_QT_MOC
 ])
 
-AC_DEFUN(AC_PATH_QT,
+AC_DEFUN([AC_PATH_QT],
 [
 AC_PATH_QT_1_3
 ])
 
-AC_DEFUN(AC_PATH_KDE,
+AC_DEFUN([AC_PATH_KDE],
 [
 AC_REQUIRE([AC_PATH_QT])dnl
 AC_MSG_CHECKING([for KDE])
@@ -340,43 +290,7 @@
 AC_CREATE_KFSSTND
 ])
 
-dnl slightly changed version of AC_CHECK_FUNC(setenv)
-AC_DEFUN(AC_CHECK_SETENV,
-[AC_MSG_CHECKING([for setenv])
-AC_CACHE_VAL(ac_cv_func_setenv,
-[AC_LANG_C
-AC_TRY_LINK(
-dnl Don't include <ctype.h> because on OSF/1 3.0 it includes <sys/types.h>
-dnl which includes <sys/select.h> which contains a prototype for
-dnl select.  Similarly for bzero.
-[#include <assert.h>
-]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
-extern "C"
-#endif
-])dnl
-[/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#include <stdlib.h>
-], [
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$1) || defined (__stub___$1)
-choke me
-#else
-setenv("TEST", "alle", 1);
-#endif
-], eval "ac_cv_func_setenv=yes", eval "ac_cv_func_setenv=no")])
-
-if test "$ac_cv_func_setenv" = "yes"; then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE_UNQUOTED(HAVE_FUNC_SETENV)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-AC_DEFUN(AC_FIND_GIF,
+AC_DEFUN([AC_FIND_GIF],
    [AC_MSG_CHECKING(for giflib)
 AC_CACHE_VAL(ac_cv_lib_gif,
 [ac_save_LIBS="$LIBS"
@@ -407,7 +321,7 @@
 fi
 ])
 
-AC_DEFUN(AC_FIND_JPEG,
+AC_DEFUN([AC_FIND_JPEG],
    [AC_MSG_CHECKING(for jpeglib)
 AC_CACHE_VAL(ac_cv_lib_jpeg,
 [ac_save_LIBS="$LIBS"
@@ -464,7 +378,7 @@
 fi
 ])
 
-AC_DEFUN(AC_CHECK_BOOL,
+AC_DEFUN([AC_CHECK_BOOL],
 [
 	AC_MSG_CHECKING(for bool)
         AC_CACHE_VAL(ac_cv_have_bool,
@@ -481,7 +395,7 @@
         fi 
 ])
 
-AC_DEFUN(AC_CHECK_GNU_EXTENSIONS,
+AC_DEFUN([AC_CHECK_GNU_EXTENSIONS],
 [
 AC_MSG_CHECKING(if you need GNU extensions)
 cat > conftest.c << EOF
@@ -502,7 +416,7 @@
 fi
 ])
 
-AC_DEFUN(AC_CHECK_WITH_GCC,
+AC_DEFUN([AC_CHECK_WITH_GCC],
 [
 AC_ARG_WITH(gcc-flags,[  --without-gcc-flags     don't use gcc flags [default=no]])
 if test "x$with_gcc_flags" = "xno"; then
@@ -513,7 +427,7 @@
 ])
 
 
-AC_DEFUN(AC_SET_DEBUG,
+AC_DEFUN([AC_SET_DEBUG],
 [
 if  test "x$ac_use_gcc_flags" = "xyes"; then
  test "$CFLAGS" = "" && CFLAGS="-g -Wall -DDEBUG" 
@@ -522,7 +436,7 @@
 fi
 ])
 
-AC_DEFUN(AC_SET_NODEBUG,
+AC_DEFUN([AC_SET_NODEBUG],
 [
 if  test "x$ac_use_gcc_flags" = "xyes"; then
  test "$CFLAGS" = "" && CFLAGS="-O2 -Wall"
@@ -531,7 +445,7 @@
 fi
 ])
 
-AC_DEFUN(AC_CHECK_DEBUG,
+AC_DEFUN([AC_CHECK_DEBUG],
 [
 AC_ARG_ENABLE(debug,[  --enable-debug 	  creates debugging code [default=no]],
 [ 
@@ -544,7 +458,7 @@
 ])
 
 dnl just a test
-AC_DEFUN(AC_CHECK_FLAGS, 
+AC_DEFUN([AC_CHECK_FLAGS], 
 [
 AC_REQUIRE([AC_CHECK_WITH_GCC])
 AC_REQUIRE([AC_CHECK_DEBUG])
@@ -554,7 +468,7 @@
 ])
 
 dnl Check for the type of the third argument of getsockname
-AC_DEFUN(AC_CHECK_KSIZE_T,
+AC_DEFUN([AC_CHECK_KSIZE_T],
 [AC_MSG_CHECKING(for the third argument of getsockname)  
 AC_CACHE_VAL(ac_cv_ksize_t_int,
 [AC_TRY_COMPILE([#include <sys/types.h>
@@ -573,7 +487,7 @@
 
 dnl This is a merge of some macros out of the gettext aclocal.m4
 dnl since we don't need anything, I took the things we need
-AC_DEFUN(AM_KDE_WITH_NLS,
+AC_DEFUN([AM_KDE_WITH_NLS],
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
@@ -586,10 +500,10 @@
     if test "$USE_NLS" = "yes"; then
       AC_DEFINE(ENABLE_NLS)
 
-      AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt,
+      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
 	[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
       AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-      AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext,
+      AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
 	[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
       AC_SUBST(MSGFMT)
 
@@ -610,57 +524,12 @@
 
   ])
 
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-# serial 1
-# Stephan Kulow: I appended a _KDE against name conflicts
-
-dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(AM_PATH_PROG_WITH_TEST_KDE,
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-
 # Check whether LC_MESSAGES is available in <locale.h>.
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
  
 # serial 1
  
-AC_DEFUN(AM_LC_MESSAGES,
+AC_DEFUN([AM_LC_MESSAGES],
   [if test $ac_cv_header_locale_h = yes; then
     AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
       [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
@@ -669,191 +538,11 @@
       AC_DEFINE(HAVE_LC_MESSAGES)
     fi
   fi])
- 
-dnl From Jim Meyering.
-dnl FIXME: migrate into libit.
-
-AC_DEFUN(AM_FUNC_OBSTACK,
-[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
- [AC_TRY_LINK([#include "obstack.h"],
-	      [struct obstack *mem;obstack_free(mem,(char *) 0)],
-	      am_cv_func_obstack=yes,
-	      am_cv_func_obstack=no)])
- if test $am_cv_func_obstack = yes; then
-   AC_DEFINE(HAVE_OBSTACK)
- else
-   LIBOBJS="$LIBOBJS obstack.o"
- fi
-])
-
-dnl From Jim Meyering.  Use this if you use the GNU error.[ch].
-dnl FIXME: Migrate into libit
-
-AC_DEFUN(AM_FUNC_ERROR_AT_LINE,
-[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
-              am_cv_lib_error_at_line=yes,
-	      am_cv_lib_error_at_line=no)])
- if test $am_cv_lib_error_at_line = no; then
-   LIBOBJS="$LIBOBJS error.o"
- fi
- AC_SUBST(LIBOBJS)dnl
-])
-
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# serial 1
-# Stephan Kulow: I put a KDE in it to avoid name conflicts
-
-AC_DEFUN(AM_KDE_GNU_GETTEXT,
-  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_ISC_POSIX])dnl
-   AC_REQUIRE([AC_PROG_RANLIB])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_C_INLINE])dnl
-   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-   AC_REQUIRE([AC_FUNC_MMAP])dnl
-   AC_REQUIRE([AM_KDE_WITH_NLS])dnl
-   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h values.h alloca.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next stpcpy])
-
-   AM_LC_MESSAGES
-
-   if test "x$CATOBJEXT" != "x"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-  ])
-
-AC_DEFUN(AC_HAVE_XPM,
- [AC_REQUIRE_CPP()dnl
-
- test -z "$XPM_LDFLAGS" && XPM_LDFLAGS=
- test -z "$XPM_INCLUDE" && XPM_INCLUDE=
-
- AC_ARG_WITH(xpm, [  --without-xpm           disable color pixmap XPM tests],
-	xpm_test=$withval, xpm_test="yes")
- if test "x$xpm_test" = xno; then
-   ac_cv_have_xpm=no
- else
-   AC_MSG_CHECKING(for XPM)
-   AC_CACHE_VAL(ac_cv_have_xpm,
-   [
-    AC_LANG_C
-    ac_save_ldflags=$LDFLAGS
-    ac_save_cflags=$CFLAGS
-    LDFLAGS="$LDFLAGS $XPM_LDFLAGS $X_LDFLAGS $QT_LDFLAGS -lXpm -lX11 -lXext"
-    CFLAGS="$CFLAGS $X_INCLUDES"
-    test ! -z "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS"
-    AC_TRY_LINK([#include <X11/xpm.h>],[],
-	ac_cv_have_xpm="yes",ac_cv_have_xpm="no")
-    LDFLAGS=$ac_save_ldflags
-    CFLAGS=$ac_save_cflags
-   ])dnl
- 
-  if test "$ac_cv_have_xpm" = no; then
-    AC_MSG_RESULT(no)
-    XPM_LDFLAGS=""
-    XPMINC=""
-    $2
-  else
-    AC_DEFINE(HAVE_XPM)
-    if test "$XPM_LDFLAGS" = ""; then
-       XPMLIB="-lXpm"
-    else
-       XPMLIB="-L$XPM_LDFLAGS -lXpm"
-    fi
-    if test "$XPM_INCLUDE" = ""; then
-       XPMINC=""
-    else
-       XPMINC="-I$XPM_INCLUDE"
-    fi
-    AC_MSG_RESULT(yes)
-    $1
-  fi
- fi
- AC_SUBST(XPMINC)
- AC_SUBST(XPMLIB)
-]) 
-
-AC_DEFUN(AC_HAVE_GL,
- [AC_REQUIRE_CPP()dnl
-
- test -z "$GL_LDFLAGS" && GL_LDFLAGS=
- test -z "$GL_INCLUDE" && GL_INCLUDE=
-
- AC_ARG_WITH(gl, [  --without-gl            disable 3D GL modes],
-	gl_test=$withval, gl_test="yes")
- if test "x$gl_test" = xno; then
-   ac_cv_have_gl=no
- else
-   AC_MSG_CHECKING(for GL)
-   AC_CACHE_VAL(ac_cv_have_gl,
-   [
-    AC_LANG_C
-    ac_save_ldflags=$LDFLAGS
-    ac_save_cflags=$CFLAGS
-    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $QT_LDFLAGS -lMesaGL -lMesaGLU -lX11 -lXext -lm"
-    CFLAGS="$CFLAGS $X_INCLUDES"
-    test ! -z "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-    AC_TRY_LINK([],[],
-	ac_cv_have_gl="yes",ac_cv_have_gl="no")
-    LDFLAGS=$ac_save_ldflags
-    CFLAGS=$ac_save_cflags
-   ])dnl
- 
-  if test "$ac_cv_have_gl" = no; then
-    AC_MSG_RESULT(no)
-    GL_LDFLAGS=""
-    GLINC=""
-    $2
-  else
-    AC_DEFINE(HAVE_GL)
-    if test "$GL_LDFLAGS" = ""; then
-       GLLIB="-lMesaGL -lMesaGLU"
-    else
-       GLLIB="-L$GL_LDFLAGS -lMesaGL -lMesaGLU"
-    fi
-    if test "$GL_INCLUDE" = ""; then
-       GLINC=""
-    else
-       GLINC="-I$GL_INCLUDE"
-    fi
-    AC_MSG_RESULT(yes)
-    $1
-  fi
- fi
- AC_SUBST(GLINC)
- AC_SUBST(GLLIB)
-]) 
 
  dnl PAM pam
  
  dnl Should test for PAM (Pluggable Authentication Modules)
- AC_DEFUN(AC_PATH_PAM_DIRECT,
+ AC_DEFUN([AC_PATH_PAM_DIRECT],
  [test -z "$pam_direct_test_library" && pam_direct_test_library=pam
  test -z "$pam_direct_test_library" && pam_direct_test_library=pam_misc
  test -z "$pam_direct_test_library" && pam_direct_test_library=dl
@@ -907,7 +596,7 @@
  LIBS="$ac_save_LIBS"
 ])
 
-AC_DEFUN(AC_PATH_PAM,
+AC_DEFUN([AC_PATH_PAM],
  [AC_REQUIRE_CPP()dnl
  
  pam_includes=NONE
@@ -959,162 +648,3 @@
  AC_SUBST(PAMLIBPATHS)
 
 ]) 
-
-
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-# serial 1
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AM_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
-AM_SANITY_CHECK
-AC_ARG_PROGRAM
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_PROG_MAKE_SET])
-
-
-# serial 1
-
-AC_DEFUN(AM_PROG_INSTALL,
-[AC_REQUIRE([AC_PROG_INSTALL])
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-AC_SUBST(INSTALL_SCRIPT)dnl
-])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN(AM_SANITY_CHECK,
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
-
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
-
-
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnlog/client/configure.ac
--- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/configure.ac	2012-07-06 02:27:19.000000000 -0400
+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/client/configure.ac	2014-11-19 00:41:00.462734397 -0500
@@ -3,12 +3,12 @@
 # I used much code from Janos Farkas
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(acinclude.m4) dnl a source file from your sub dir, but acinclude.m4 does the job
-AC_CANONICAL_SYSTEM  
+AC_INIT(kisdnlog, 0.1)
+AC_CONFIG_SRCDIR([acinclude.m4]) dnl a source file from your sub dir, but acinclude.m4 does the job
+AC_CANONICAL_TARGET  
 AC_ARG_PROGRAM
 
-dnl You have to change this
-AM_INIT_AUTOMAKE(kisdnlog, 0.1) dnl searches for some needed programs
+AM_INIT_AUTOMAKE
 
 dnl make $KDEDIR the default for the installation
 AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
@@ -26,15 +26,15 @@
 AC_PROG_LN_S
 
 dnl find out some variables 
-AC_AIX
-AC_MINIX
+AC_USE_SYSTEM_EXTENSIONS
+AC_USE_SYSTEM_EXTENSIONS
 
 dnl for NLS support. Call them in this order!
-AC_LANG_CPLUSPLUS dnl switch to C++
+AC_LANG([C++]) dnl switch to C++
 AM_KDE_WITH_NLS dnl check if nls is wanted
 
 dnl Checks for header files.
-AC_LANG_CPLUSPLUS dnl switch to C++
+AC_LANG([C++]) dnl switch to C++
 AC_HEADER_DIRENT dnl check for dirent.h
 AC_HEADER_STDC dnl check for other stdc headers. More traditional ;)
 dnl check for some more header files. You can remove some of
@@ -61,8 +61,8 @@
 
 dnl Checks for library functions. 
 AC_CHECK_FUNCS(socket vsnprintf)
-AC_CHECK_SETENV
-AC_LANG_CPLUSPLUS
+AC_CHECK_FUNC(setenv)
+AC_LANG([C++])
 AC_CHECK_FUNCS(getdomainname)
 AC_CHECK_KSIZE_T
 
@@ -74,6 +74,7 @@
 AC_SUBST(topdir)
 
 dnl add here all your Makefiles
-AC_OUTPUT(Makefile \
+AC_CONFIG_FILES([Makefile \
 	pixmaps/Makefile \
-	src/Makefile)
+	src/Makefile])
+AC_OUTPUT
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/src/Makefile.am isdnutils-dfsg-3.25.1.3.5/isdnlog/client/src/Makefile.am
--- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/src/Makefile.am	2012-07-06 02:27:19.000000000 -0400
+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/client/src/Makefile.am	2014-11-19 00:41:00.462734397 -0500
@@ -14,7 +14,7 @@
 # just set the variable
 APPSDIR = $(kde_appsdir)/Utilities
 # set the include path for X, qt and KDE
-INCLUDES= @all_includes@
+AM_CPPFLAGS = @all_includes@
 # claim, which subdirectories you want to install
 # SUBDIRS = doc
 
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnlog/configure.ac
--- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/configure.ac	2012-07-06 02:27:19.000000000 -0400
+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/configure.ac	2014-11-19 00:41:00.462734397 -0500
@@ -81,45 +81,34 @@
 dnl To make it possible to set variables in policy.h
 dnl they have to be defined with AC_DEFINE...
 dnl
-AC_DEFINE_UNQUOTED(OLDCONFDIR,"$OLDCONFDIR")
-AC_DEFINE_UNQUOTED(OLDCONFFILE,"$OLDCONFFILE")
-AC_DEFINE_UNQUOTED(DATADIR,"$datadir")
-AC_DEFINE_UNQUOTED(SERV_PORT,$SERV_PORT)
-AC_DEFINE_UNQUOTED(USERFILE,"$USERFILE")
-AC_DEFINE_UNQUOTED(LOGFILE,"$LOGFILE")
-AC_DEFINE_UNQUOTED(CHARGEFILE,"$CHARGEFILE")
-AC_DEFINE_UNQUOTED(RELOADCMD,"$RELOADCMD")
-AC_DEFINE_UNQUOTED(STOPCMD,"$STOPCMD")
-AC_DEFINE_UNQUOTED(REBOOTCMD,"$REBOOTCMD")
+AC_DEFINE_UNQUOTED(OLDCONFDIR,"$OLDCONFDIR",[Define the old config directory])
+AC_DEFINE_UNQUOTED(OLDCONFFILE,"$OLDCONFFILE",[Define the name of the old config file])
+AC_DEFINE_UNQUOTED(DATADIR,"$DATADIR",[Define the data directory])
+AC_DEFINE_UNQUOTED(SERV_PORT,$SERV_PORT,[Define to use a port other than 20011 by default])
+AC_DEFINE_UNQUOTED(USERFILE,"$USERFILE",[File for permission configuration])
+AC_DEFINE_UNQUOTED(LOGFILE,"$LOGFILE",[Logfile])
+AC_DEFINE_UNQUOTED(CHARGEFILE,"$CHARGEFILE",[Charge file])
+AC_DEFINE_UNQUOTED(RELOADCMD,"$RELOADCMD",[Command for reloading])
+AC_DEFINE_UNQUOTED(STOPCMD,"$STOPCMD",[Command for stopping])
+AC_DEFINE_UNQUOTED(REBOOTCMD,"$REBOOTCMD",[Command for rebooting])
+CHARGECOUNTRY=DE
 if test "$CONFIG_ISDN_LOG_DE" = "y" ; then
-	NATION="de"
-	NATION_MACRO="ISDN_DE"
-	AC_DEFINE(ISDN_DE)
+	CHARGECOUNTRY=DE
 fi
 if test "$CONFIG_ISDN_LOG_AT" = "y" ; then
-	NATION="at"
-	NATION_MACRO="ISDN_AT"
-	AC_DEFINE(ISDN_AT)
+	CHARGECOUNTRY=AT
 fi
 if test "$CONFIG_ISDN_LOG_CH" = "y" ; then
-	NATION="ch"
-	NATION_MACRO="ISDN_CH"
-	AC_DEFINE(ISDN_CH)
+	CHARGECOUNTRY=CH
 fi
 if test "$CONFIG_ISDN_LOG_NL" = "y" ; then
-	NATION="nl"
-	NATION_MACRO="ISDN_NL"
-	AC_DEFINE(ISDN_NL)
+	CHARGECOUNTRY=NL
 fi
 if test "$CONFIG_ISDN_LOG_LU" = "y" ; then
-	NATION="lu"
-	NATION_MACRO="ISDN_LU"
-	AC_DEFINE(ISDN_LU)
+	CHARGECOUNTRY=LU
 fi
 if test "$CONFIG_ISDN_LOG_XX" = "y" ; then
-	NATION=$CONFIG_ISDN_LOG_CC
-	NATION_MACRO="ISDN_XX"
-	AC_DEFINE(ISDN_XX)
+	CHARGECOUNTRY=XX
 fi
 
 dnl Checks for programs.
@@ -132,17 +121,17 @@
 
 dnl Checks for libraries.
 if test -e tools/cdb/i4l_cdb.c  ; then
-    AC_DEFINE(USE_CDB)
+    AC_DEFINE(USE_CDB,1,[Use CDB instead pf g?dbm? rename tools/cdb/i4l_cdb.c, if you want to use gdbm])
     CDBEXTRALIBS="tools/cdb/i4l_cdb.a"
     DBEXT=".cdb"
     RDBEXT=".cdb"
     AC_MSG_RESULT(Using 'cdb' as database)
 else
-AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM),
-	[AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM),
-		[AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB))])])
+AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM,1,[Define if you have the gdbm library (-lgdbm).]),
+	[AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM,1,[Define if you have the dbm library (-ldbm).]),
+		[AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB,1,[Define if you have the db library (-ldb).]))])])
 fi
-AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT")
+AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT",[File extension for the relational data base])
 
 dnl log database support
 AC_CHECK_POSTGRES
@@ -160,7 +149,7 @@
 dnl Manual config
 AC_ARG_WITH(isdnlib,
 	[  --with-isdnlib=DIR      Set isdn library [../lib]],
-	LIBISDNDIR=$withval; AC_DEFINE_UNQUOTED(LIBISDNDIR,"$withval"))
+	LIBISDNDIR=$withval)
 AC_ARG_WITH(area-lib,
 	[  --with-area-lib=STRING  Set area library type [area]],
 	ALIB=$withval)
@@ -198,28 +187,38 @@
 
 if test "$ALIB" = "area" ; then
 	LIBAREA=1
-	AC_DEFINE(LIBAREA)
+	AC_DEFINE(LIBAREA,1,[Define to 1 if libarea should be used])
 fi
 case "$CHARGECOUNTRY" in
 	DE)
 		NATION="de"
 		NATION_MACRO="ISDN_DE"
-		AC_DEFINE(ISDN_DE)
+		AC_DEFINE(ISDN_DE,1,[Define to 1 if you have German charge info])
 		;;
 	AT)
 		NATION="at"
 		NATION_MACRO="ISDN_AT"
-		AC_DEFINE(ISDN_AT)
+		AC_DEFINE(ISDN_AT,1,[Define to 1 if you have Austrian charge info])
 		;;
 	CH)
 		NATION="ch"
 		NATION_MACRO="ISDN_CH"
-		AC_DEFINE(ISDN_CH)
+		AC_DEFINE(ISDN_CH,1,[Define to 1 if you have Swiss charge info])
 		;;
 	NL)
 		NATION="nl"
 		NATION_MACRO="ISDN_NL"
-		AC_DEFINE(ISDN_NL)
+		AC_DEFINE(ISDN_NL,1,[Define to 1 if you have Netherlands charge info])
+		;;
+	LU)
+		NATION="lu"
+		NATION_MACRO="ISDN_LU"
+		AC_DEFINE(ISDN_LU,1,[Define to 1 if you have Luxembourg charge info])
+		;;
+	*)
+		NATION=$CONFIG_ISDN_LOG_CC
+		NATION_MACRO="ISDN_XX"
+		AC_DEFINE(ISDN_XX,1,[Define to 1 if you have a charge info for a different country])
 		;;
 esac
 
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/tools/zone/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnlog/tools/zone/configure.ac
--- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/tools/zone/configure.ac	2012-07-06 02:27:19.000000000 -0400
+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/tools/zone/configure.ac	2014-11-19 00:41:00.462734397 -0500
@@ -1,8 +1,13 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(mkzonedb.c)
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 AC_PREFIX_DEFAULT(/usr)
 
+AH_TEMPLATE(USE_CDB, [Whether or not to use our cdb])
+AH_TEMPLATE(HAVE_LIBGDBM, [Whether or not we have the GNU DataBase Manager library])
+AH_TEMPLATE(HAVE_LIBDBM, [Whether or not we have the (generic) DataBase Manager library])
+AH_TEMPLATE(HAVE_LIBDB, [Whether or not we have the DataBase library])
+
 CONFIG_MANDIR=`eval echo ${CONFIG_MANDIR:-"/usr/man"}`
 CONFIG_SBINDIR=`eval echo ${CONFIG_SBINDIR:-"/sbin"}`
 
@@ -29,7 +34,7 @@
 		[AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb;RDBEXT=".db"; AC_DEFINE(HAVE_LIBDB),
 			[AC_MSG_ERROR([No db found])])])])
 fi
-AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT")
+AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT", [The relational database file extension])
 
 dnl Checks for header files.
 AC_HEADER_STDC
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/rcapid/Makefile.am isdnutils-dfsg-3.25.1.3.5/rcapid/Makefile.am
--- isdnutils-dfsg-3.25.1.3.5.orig/rcapid/Makefile.am	2014-11-19 00:40:58.000000000 -0500
+++ isdnutils-dfsg-3.25.1.3.5/rcapid/Makefile.am	2014-11-19 00:41:00.462734397 -0500
@@ -7,9 +7,9 @@
 MAINTAINERCLEANFILES    = configure aclocal.m4 Makefile.in config.h.in \
 			  stamp-h.in comperr
 
-INCLUDES = $(all_includes)
+AM_CPPFLAGS = -I../capi20 $(all_includes)
 CFLAGS = -Wall -O2
-LDFLAGS = $(all_libraries)
+LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 LDADD = -lcapi20
 
 sbin_PROGRAMS = rcapid
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/rcapid/configure.ac isdnutils-dfsg-3.25.1.3.5/rcapid/configure.ac
--- isdnutils-dfsg-3.25.1.3.5.orig/rcapid/configure.ac	2012-07-06 02:27:19.000000000 -0400
+++ isdnutils-dfsg-3.25.1.3.5/rcapid/configure.ac	2014-11-19 00:41:00.462734397 -0500
@@ -1,6 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(rcapid.c)
-AM_INIT_AUTOMAKE(rcapid, 1.2)
+AC_INIT(rcapid, 1.2)
+AC_CONFIG_SRCDIR(rcapid.c)
+AM_INIT_AUTOMAKE
 AC_PREFIX_DEFAULT(/usr)
 
 CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"}
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/vbox3/acinclude.m4 isdnutils-dfsg-3.25.1.3.5/vbox3/acinclude.m4
--- isdnutils-dfsg-3.25.1.3.5.orig/vbox3/acinclude.m4	2012-07-06 02:27:19.000000000 -0400
+++ isdnutils-dfsg-3.25.1.3.5/vbox3/acinclude.m4	2014-11-19 00:41:00.462734397 -0500
@@ -1,5 +1,5 @@
 
-AC_DEFUN(AC_FIND_FILE,
+AC_DEFUN([AC_FIND_FILE],
 [
    $3=NO
    for i in $2;
@@ -15,7 +15,7 @@
    done
 ])
 
-AC_DEFUN(AC_PATH_PKGLOGDIR,
+AC_DEFUN([AC_PATH_PKGLOGDIR],
 [
    packagelogdir="`eval echo ${packagelogdir:-/var/log}`"
 
@@ -26,7 +26,7 @@
    AC_SUBST(packagelogdir)
 ])
 
-AC_DEFUN(AC_PATH_PKGLOCKDIR,
+AC_DEFUN([AC_PATH_PKGLOCKDIR],
 [
    packagelockdir="`eval echo ${packagelockdir:-/var/lock}`"
 
@@ -37,7 +37,7 @@
    AC_SUBST(packagelockdir)
 ])                
 
-AC_DEFUN(AC_PATH_PKGPIDDIR,
+AC_DEFUN([AC_PATH_PKGPIDDIR],
 [
    packagepiddir="`eval echo ${packagepiddir:-/var/run}`"
 
@@ -48,7 +48,7 @@
    AC_SUBST(packagepiddir)
 ])
                          
-AC_DEFUN(AC_PATH_TCL,
+AC_DEFUN([AC_PATH_TCL],
 [
    ac_tcl_inc=""
    ac_tcl_lib=""
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/vbox3/configure.ac isdnutils-dfsg-3.25.1.3.5/vbox3/configure.ac
--- isdnutils-dfsg-3.25.1.3.5.orig/vbox3/configure.ac	2012-07-06 02:27:19.000000000 -0400
+++ isdnutils-dfsg-3.25.1.3.5/vbox3/configure.ac	2014-11-19 00:41:00.462734397 -0500
@@ -3,12 +3,13 @@
 
 ## init ###################################################################
 
-AC_INIT(acinclude.m4)
+AC_INIT(vbox, 3.0B1)
+AC_CONFIG_SRCDIR([acinclude.m4])
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
 AC_ARG_PROGRAM
 
-AM_INIT_AUTOMAKE(vbox, 3.0B1)
+AM_INIT_AUTOMAKE
 
 AC_PREFIX_DEFAULT(/opt/vbox)
 
@@ -17,11 +18,11 @@
 ## programs ###############################################################
 
 AC_PROG_CC
-AC_PROG_CC_WORKS
-AC_PROG_CC_GNU
+#AC_PROG_CC_WORKS
+#AC_PROG_CC_GNU
 
 AC_PROG_RANLIB
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 
 ## libraries ##############################################################
 
@@ -54,9 +55,9 @@
 
 ## output #################################################################
 
-AC_OUTPUT(Makefile \
+AC_CONFIG_FILES([Makefile \
    vboxgetty/Makefile \
    vboxgetty/docs/Makefile \
-   vboxgetty/docs/de/Makefile \
    vboxgetty/examples/Makefile \
-   vboxgetty/examples/scripts/Makefile)
+   vboxgetty/examples/scripts/Makefile])
+AC_OUTPUT
diff -ru isdnutils-dfsg-3.25.1.3.5.orig/vbox3/vboxgetty/Makefile.am isdnutils-dfsg-3.25.1.3.5/vbox3/vboxgetty/Makefile.am
--- isdnutils-dfsg-3.25.1.3.5.orig/vbox3/vboxgetty/Makefile.am	2012-07-06 02:27:19.000000000 -0400
+++ isdnutils-dfsg-3.25.1.3.5/vbox3/vboxgetty/Makefile.am	2014-11-19 00:41:00.462734397 -0500
@@ -14,7 +14,7 @@
 
 DEFS		       += -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"$(pkgdatadir)"' -DLOGDIR='"$(packagelogdir)"' -DLOCKDIR='"$(packagelockdir)"' -DPIDDIR='"$(packagepiddir)"'
 
-INCLUDES		= $(all_includes) $(tcl_include)
+AM_CPPFLAGS		= $(all_includes) $(tcl_include)
 
 noinst_LIBRARIES	= libvboxmodem.a