tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1--- pilot-link/configure.ac
2+++ pilot-link/configure.ac
3@@ -63,8 +63,8 @@
4 dnl Eat -Werror so configure will run properly, if the user provided it
5 enable_werror=no
6 save_CFLAGS="$CFLAGS"
7-CFLAGS=$(echo $save_CFLAGS | sed -e s/-Werror//g)
8-CXXFLAGS=$(echo $save_CXXFLAGS | sed -e s/-Werror//g)
9+CFLAGS=$(echo "$save_CFLAGS" | sed -e 's/-Werror[^=]//g')
10+CXXFLAGS=$(echo "$save_CXXFLAGS" | sed -e 's/-Werror[^=]//g')
11 if test "x$CFLAGS" != "x$save_CFLAGS"; then
12 dnl -Werror was set; treat it as implicit --enable-werror below
13 enable_werror="yes"
14@@ -392,11 +392,8 @@
15 dnl Determine if system popt is good enough
16 save_LIBS="$LIBS"
17 AC_CHECK_HEADER(popt.h,
18- AC_CHECK_DECL(POPT_BIT_SET,
19- AC_CHECK_LIB(popt, poptStrippedArgv,,
20- [with_included_popt="yes"]),
21- [with_included_popt="yes"],
22- [#include <popt.h>]),
23+ AC_CHECK_LIB(popt, poptStrippedArgv,,
24+ [with_included_popt="yes"]),
25 [with_included_popt="yes"]
26 )
27 LIBS="$save_LIBS"