]>
Commit | Line | Data |
---|---|---|
ed34ec95 | 1 | --- apt-0.3.19cnc52/buildlib/tools.m4~ Wed Aug 1 23:31:58 2001 |
2 | +++ apt-0.3.19cnc52/buildlib/tools.m4 Wed Aug 15 03:38:11 2001 | |
3 | @@ -1,4 +1,4 @@ | |
4 | -AC_DEFUN(ah_HAVE_GETCONF, | |
5 | +AC_DEFUN([ah_HAVE_GETCONF], | |
6 | [AC_ARG_WITH(getconf, | |
7 | [ --with-getconf Enable automagical buildtime configuration], | |
8 | [if test "$withval" = "yes"; then | |
9 | @@ -14,7 +14,7 @@ | |
10 | ]) | |
11 | ||
12 | dnl ah_GET_CONF(variable, value ..., [default]) | |
13 | -AC_DEFUN(ah_GET_GETCONF, | |
14 | +AC_DEFUN([ah_GET_GETCONF], | |
15 | [AC_REQUIRE([ah_HAVE_GETCONF]) | |
16 | if test ! -z "$GETCONF";then | |
17 | old_args="[$]@" | |
18 | @@ -28,68 +28,8 @@ | |
19 | eval $1="$3" | |
20 | fi | |
21 | ]) | |
22 | -AC_DEFUN(ah_NUM_CPUS, | |
23 | - [AC_MSG_CHECKING([number of cpus]) | |
24 | - AC_ARG_WITH(cpus, | |
25 | - [ --with-cpus The number of cpus to be used for building(see --with-procs, default 1)], | |
26 | - [ | |
27 | - if test "$withval" = "yes"; then | |
28 | - ah_GET_GETCONF(NUM_CPUS, SC_NPROCESSORS_ONLN _NPROCESSORS_ONLN, 1) | |
29 | - elif test ! "$withval" = "no";then | |
30 | - NUM_CPUS=$withval | |
31 | - elif test "$withval" = "no";then | |
32 | - NUM_CPUS=1 | |
33 | - fi], | |
34 | - [ah_GET_GETCONF(NUM_CPUS, SC_NPROCESSORS_ONLN _NPROCESSORS_ONLN, 1)] | |
35 | - ) | |
36 | - ah_NUM_CPUS_msg="$NUM_CPUS" | |
37 | - if test "$NUM_CPUS" = "0"; then | |
38 | - # broken getconf, time to bitch. | |
39 | - ah_NUM_CPUS_msg="found 0 cpus. Has someone done a lobotomy?" | |
40 | - NUM_CPUS=1 | |
41 | - fi | |
42 | - if test $NUM_CPUS = 1 ;then | |
43 | - default_PROC_MULTIPLY=1 | |
44 | - else | |
45 | - default_PROC_MULTIPLY=2 | |
46 | - fi | |
47 | - AC_MSG_RESULT([$ah_NUM_CPUS_msg]) | |
48 | - AC_SUBST(NUM_CPUS) | |
49 | -]) | |
50 | -AC_DEFUN(ah_PROC_MULTIPLY, | |
51 | - [AC_REQUIRE([ah_NUM_CPUS]) | |
52 | - AC_MSG_CHECKING([processor multiplier]) | |
53 | - AC_ARG_WITH(proc-multiply, | |
54 | - [ --with-proc-multiply Multiply this * number of cpus for parallel making(default 2).], | |
55 | - [if test "$withval" = "yes"; then | |
56 | - PROC_MULTIPLY=$default_PROC_MULTIPLY | |
57 | - elif test ! "$withval" = "no";then | |
58 | - PROC_MULTIPLY=$withval | |
59 | - fi], | |
60 | - [PROC_MULTIPLY=$default_PROC_MULTIPLY] | |
61 | - ) | |
62 | - AC_MSG_RESULT([$PROC_MULTIPLY]) | |
63 | - AC_SUBST(PROC_MULTIPLY) | |
64 | -]) | |
65 | - | |
66 | -AC_DEFUN(ah_NUM_PROCS, | |
67 | - [AC_REQUIRE([ah_PROC_MULTIPLY]) | |
68 | - AC_REQUIRE([ah_NUM_CPUS]) | |
69 | - AC_MSG_CHECKING([number of processes to run during make]) | |
70 | - AC_ARG_WITH(procs, | |
71 | - [ --with-procs The number of processes to run in parallel during make(num_cpus * multiplier).], | |
72 | - [if test "$withval" = "yes"; then | |
73 | - NUM_PROCS=`expr $NUM_CPUS \* $PROC_MULTIPLY` | |
74 | - elif test ! "$withval" = "no";then | |
75 | - NUM_PROCS=$withval | |
76 | - fi], | |
77 | - [NUM_PROCS=`expr $NUM_CPUS \* $PROC_MULTIPLY`] | |
78 | - ) | |
79 | - AC_MSG_RESULT([$NUM_PROCS]) | |
80 | - AC_SUBST(NUM_PROCS) | |
81 | -]) | |
82 | ||
83 | -AC_DEFUN(rc_GLIBC_VER, | |
84 | +AC_DEFUN([rc_GLIBC_VER], | |
85 | [AC_MSG_CHECKING([glibc version]) | |
86 | dummy=if$$ | |
87 | cat <<_GLIBC_>$dummy.c | |
88 | @@ -110,7 +50,7 @@ | |
89 | AC_SUBST(GLIBC_VER) | |
90 | ]) | |
91 | ||
92 | -AC_DEFUN(rc_LIBSTDCPP_VER, | |
93 | +AC_DEFUN([rc_LIBSTDCPP_VER], | |
94 | [AC_MSG_CHECKING([libstdc++ version]) | |
95 | dummy=if$$ | |
96 | cat <<_LIBSTDCPP_>$dummy.cc | |
97 | @@ -136,7 +76,7 @@ | |
98 | AC_SUBST(LIBSTDCPP_VER) | |
99 | ]) | |
100 | ||
101 | -AC_DEFUN(ah_GCC3DEP,[ | |
102 | +AC_DEFUN([ah_GCC3DEP],[ | |
103 | AC_MSG_CHECKING(if $CXX -MD works) | |
104 | touch gcc3dep.cc | |
105 | ${CXX-c++} -MD -o gcc3dep_test.o -c gcc3dep.cc | |
106 | --- apt-0.3.19cnc52/configure.in~ Thu Aug 2 18:28:45 2001 | |
107 | +++ apt-0.3.19cnc52/configure.in Wed Aug 15 03:40:32 2001 | |
108 | @@ -203,7 +203,6 @@ | |
109 | dnl Check for YODL | |
110 | dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","") | |
111 | ||
112 | -ah_NUM_PROCS | |
113 | rc_GLIBC_VER | |
114 | rc_LIBSTDCPP_VER | |
115 | ah_GCC3DEP |