1 based on http://github.com/mcr/libpcap/commit/d1a3a92fab103210ab5f61780a731bce9a8909b5
2 --- configure.in.orig 2010-04-08 14:13:14.128949704 +0200
3 +++ configure.in 2010-04-08 14:08:22.642391622 +0200
8 +AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS)
10 AC_LBL_C_INIT(V_CCOPT, V_INCLS)
13 --- aclocal.m4.orig 2010-04-08 14:16:43.134795418 +0200
14 +++ aclocal.m4 2010-04-08 14:19:50.183311589 +0200
19 -dnl Determine which compiler we're using (cc or gcc)
20 -dnl If using gcc, determine the version number
21 -dnl If using cc, require that it support ansi prototypes
22 -dnl If using gcc, use -O2 (otherwise use -O)
23 -dnl If using cc, explicitly specify /usr/local/include
27 +dnl Do whatever AC_LBL_C_INIT work is necessary before using AC_PROG_CC.
28 dnl AC_LBL_C_INIT(copt, incls)
37 +dnl It appears that newer versions of autoconf (2.64 and later) will,
38 +dnl if you use AC_TRY_COMPILE in a macro, stick AC_PROG_CC at the
39 +dnl beginning of the macro, even if the macro itself calls AC_PROG_CC.
40 +dnl See section 20.8 "Expanded Before Required" in the Autoconf
43 +dnl This causes a steaming heap of fail in our case, as we were, in
44 +dnl AC_LBL_C_INIT, doing the tests we now do in AC_LBL_C_PREPARE,
45 +dnl calling AC_PROG_CC, and then doing the tests we now do in
48 -AC_DEFUN(AC_LBL_C_INIT,
50 - AC_BEFORE([$0], [AC_PROG_CC])
51 - AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
52 - AC_BEFORE([$0], [AC_LBL_DEVEL])
53 +AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC,
55 AC_ARG_WITH(gcc, [ --without-gcc don't use gcc])
57 if test "${srcdir}" != "." ; then
66 +dnl Determine which compiler we're using (cc or gcc)
67 +dnl If using gcc, determine the version number
68 +dnl If using cc, require that it support ansi prototypes
69 +dnl If using gcc, use -O2 (otherwise use -O)
70 +dnl If using cc, explicitly specify /usr/local/include
74 +dnl AC_LBL_C_INIT(copt, incls)
82 +dnl ac_cv_lbl_gcc_vers
85 +AC_DEFUN(AC_LBL_C_INIT,
87 + AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
88 + AC_BEFORE([$0], [AC_LBL_DEVEL])
89 if test "$GCC" != yes ; then
90 AC_MSG_CHECKING(that $CC handles ansi prototypes)
91 AC_CACHE_VAL(ac_cv_lbl_cc_ansi_prototypes,