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
4 -AC_DEFUN(ah_HAVE_GETCONF,
5 +AC_DEFUN([ah_HAVE_GETCONF],
7 [ --with-getconf Enable automagical buildtime configuration],
8 [if test "$withval" = "yes"; then
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
22 -AC_DEFUN(ah_NUM_CPUS,
23 - [AC_MSG_CHECKING([number of cpus])
25 - [ --with-cpus The number of cpus to be used for building(see --with-procs, default 1)],
27 - if test "$withval" = "yes"; then
28 - ah_GET_GETCONF(NUM_CPUS, SC_NPROCESSORS_ONLN _NPROCESSORS_ONLN, 1)
29 - elif test ! "$withval" = "no";then
31 - elif test "$withval" = "no";then
34 - [ah_GET_GETCONF(NUM_CPUS, SC_NPROCESSORS_ONLN _NPROCESSORS_ONLN, 1)]
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?"
42 - if test $NUM_CPUS = 1 ;then
43 - default_PROC_MULTIPLY=1
45 - default_PROC_MULTIPLY=2
47 - AC_MSG_RESULT([$ah_NUM_CPUS_msg])
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
60 - [PROC_MULTIPLY=$default_PROC_MULTIPLY]
62 - AC_MSG_RESULT([$PROC_MULTIPLY])
63 - AC_SUBST(PROC_MULTIPLY)
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])
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
77 - [NUM_PROCS=`expr $NUM_CPUS \* $PROC_MULTIPLY`]
79 - AC_MSG_RESULT([$NUM_PROCS])
83 -AC_DEFUN(rc_GLIBC_VER,
84 +AC_DEFUN([rc_GLIBC_VER],
85 [AC_MSG_CHECKING([glibc version])
87 cat <<_GLIBC_>$dummy.c
92 -AC_DEFUN(rc_LIBSTDCPP_VER,
93 +AC_DEFUN([rc_LIBSTDCPP_VER],
94 [AC_MSG_CHECKING([libstdc++ version])
96 cat <<_LIBSTDCPP_>$dummy.cc
98 AC_SUBST(LIBSTDCPP_VER)
101 -AC_DEFUN(ah_GCC3DEP,[
102 +AC_DEFUN([ah_GCC3DEP],[
103 AC_MSG_CHECKING(if $CXX -MD works)
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
109 AM_GNU_GETTEXT_VERSION([0.11.4])