]>
Commit | Line | Data |
---|---|---|
71d0ff61 JB |
1 | --- dpkg-1.6.15/configure.in.orig Fri Oct 19 22:48:16 2001 |
2 | +++ dpkg-1.6.15/configure.in Fri Oct 19 22:50:56 2001 | |
3 | @@ -49,8 +49,8 @@ | |
4 | fi | |
5 | AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) | |
6 | AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]) | |
7 | -AC_REQUIRE([AC_ARG_PROGRAM]) | |
8 | -AC_REQUIRE([AC_PROG_MAKE_SET]) | |
9 | +AC_ARG_PROGRAM | |
10 | +AC_PROG_MAKE_SET | |
11 | ||
12 | AC_MSG_CHECKING(dpkg version) | |
13 | AC_MSG_RESULT($VERSION) | |
14 | diff -Nur dpkg-1.6.15.orig/acinclude.m4 dpkg-1.6.15/acinclude.m4 | |
15 | --- dpkg-1.6.15.orig/acinclude.m4 Thu Jan 1 01:00:00 1970 | |
16 | +++ dpkg-1.6.15/acinclude.m4 Fri Oct 19 22:54:18 2001 | |
17 | @@ -0,0 +1,91 @@ | |
18 | +dnl Bunch of extra macros to make dpkg more portable | |
19 | +dnl Copyright (C) 1999 Wichert Akkerman <wakkerma@debian.org> | |
20 | +dnl | |
21 | +dnl This program is free software; you can redistribute it and/or modify | |
22 | +dnl it under the terms of the GNU General Public License as published by | |
23 | +dnl the Free Software Foundation; either version 2, or (at your option) | |
24 | +dnl any later version. | |
25 | +dnl | |
26 | +dnl This program is distributed in the hope that it will be useful, | |
27 | +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of | |
28 | +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
29 | +dnl GNU General Public License for more details. | |
30 | +dnl | |
31 | +dnl You should have received a copy of the GNU General Public License | |
32 | +dnl along with this program; if not, write to the Free Software | |
33 | +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
34 | +dnl 02111-1307, USA. | |
35 | + | |
36 | +AC_DEFUN(AC_HAVE_SYSINFO, | |
37 | +[AC_CACHE_CHECK(whether sysinfo is available, | |
38 | + ac_cv_func_sysinfo, | |
39 | +[ AC_CHECK_FUNC(sysinfo,ac_cv_func_sysinfo=yes,ac_cv_func_sysinfo=no)]) | |
40 | +if test "$ac_cv_func_sysinfo" = "yes" ; then | |
41 | + AC_DEFINE(HAVE_SYSINFO) | |
42 | +fi | |
43 | +]) | |
44 | + | |
45 | +AC_DEFUN(AC_MEMINFO_IN_SYSINFO, | |
46 | +[AC_REQUIRE([AC_HAVE_SYSINFO])dnl | |
47 | + if test "$ac_cv_header_sys_sysinfo" = "" ; then | |
48 | + AC_CHECK_HEADERS(sys/sysinfo.h) | |
49 | + fi | |
50 | + AC_CACHE_CHECK(whether struct sysinfo contains memory information, | |
51 | + ac_cv_meminfo_in_sysinfo, | |
52 | +[AC_TRY_COMPILE([ | |
53 | +#ifdef HAVE_SYS_SYSINFO_H | |
54 | +#include <sys/sysinfo.h> | |
55 | +#endif | |
56 | +], [struct sysinfo si ; si.freeram;si.sharedram;si.bufferram;], | |
57 | + ac_cv_meminfo_in_sysinfo=yes, ac_cv_meminfo_in_sysinfo=no)]) | |
58 | + if test "$ac_cv_have_sysinfo_meminfo" = yes ; then | |
59 | + AC_DEFINE(MEMINFO_IN_SYSINFO) | |
60 | + fi | |
61 | +]) | |
62 | + | |
63 | + | |
64 | + | |
65 | +dnl Moved from configure.in, modified to use AC_DEFUN | |
66 | +dnl -- Tom Lees <tom@lpsg.demon.co.uk> | |
67 | + | |
68 | +dnl DPKG_CACHED_TRY_COMPILE(<description>,<cachevar>,<include>,<program>,<ifyes>,<ifno>) | |
69 | +AC_DEFUN(DPKG_CACHED_TRY_COMPILE,[ | |
70 | + AC_MSG_CHECKING($1) | |
71 | + AC_CACHE_VAL($2,[ | |
72 | + AC_TRY_COMPILE([$3],[$4],[$2=yes],[$2=no]) | |
73 | + ]) | |
74 | + if test "x$$2" = xyes; then | |
75 | + true | |
76 | + $5 | |
77 | + else | |
78 | + true | |
79 | + $6 | |
80 | + fi | |
81 | +]) | |
82 | + | |
83 | +dnl DPKG_C_GCC_TRY_WARNS(<warnings>,<cachevar>) | |
84 | +AC_DEFUN(DPKG_C_GCC_TRY_WARNS,[ | |
85 | + AC_MSG_CHECKING([GCC warning flag(s) $1]) | |
86 | + if test "${GCC-no}" = yes | |
87 | + then | |
88 | + AC_CACHE_VAL($2,[ | |
89 | + oldcflags="${CFLAGS-}" | |
90 | + CFLAGS="${CFLAGS-} ${CWARNS} $1 -Werror" | |
91 | + AC_TRY_COMPILE([ | |
92 | +#include <string.h> | |
93 | +#include <stdio.h> | |
94 | +],[ | |
95 | + strcmp("a","b"); fprintf(stdout,"test ok\n"); | |
96 | +], [$2=yes], [$2=no]) | |
97 | + CFLAGS="${oldcflags}"]) | |
98 | + if test "x$$2" = xyes; then | |
99 | + CWARNS="${CWARNS} $1" | |
100 | + AC_MSG_RESULT(ok) | |
101 | + else | |
102 | + $2='' | |
103 | + AC_MSG_RESULT(no) | |
104 | + fi | |
105 | + else | |
106 | + AC_MSG_RESULT(no, not using GCC) | |
107 | + fi | |
108 | +]) |