reorder patches to fix php4 build
[openwrt/svn-archive/archive.git] / admin / syslog-ng / patches / 01-no_lfl.patch
1 diff -urN syslog-ng-1.6.9/Makefile.in syslog-ng-1.6.9.new/Makefile.in
2 --- syslog-ng-1.6.9/Makefile.in 2005-11-23 09:58:28.000000000 +0100
3 +++ syslog-ng-1.6.9.new/Makefile.in 2006-03-23 19:02:04.000000000 +0100
4 @@ -64,7 +64,7 @@
5 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
6 LDFLAGS = @LDFLAGS@
7 LEX = @LEX@
8 -LEXLIB = @LEXLIB@
9 +LEXLIB =
10 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
11 LIBOBJS = @LIBOBJS@
12 LIBOL_DIR = @LIBOL_DIR@
13 diff -urN syslog-ng-1.6.9/configure syslog-ng-1.6.9.new/configure
14 --- syslog-ng-1.6.9/configure 2005-11-23 09:58:29.000000000 +0100
15 +++ syslog-ng-1.6.9.new/configure 2006-03-23 21:56:43.000000000 +0100
16 @@ -3160,7 +3160,7 @@
17 echo $ECHO_N "(cached) $ECHO_C" >&6
18 else
19 ac_check_lib_save_LIBS=$LIBS
20 -LIBS="-lfl $LIBS"
21 +LIBS="$LIBS"
22 cat >conftest.$ac_ext <<_ACEOF
23 /* confdefs.h. */
24 _ACEOF
25 diff -urN syslog-ng-1.6.9/src/Makefile.in syslog-ng-1.6.9.new/src/Makefile.in
26 --- syslog-ng-1.6.9/src/Makefile.in 2005-11-23 09:58:37.000000000 +0100
27 +++ syslog-ng-1.6.9.new/src/Makefile.in 2006-03-23 19:02:27.000000000 +0100
28 @@ -64,7 +64,7 @@
29 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
30 LDFLAGS = @LDFLAGS@
31 LEX = @LEX@
32 -LEXLIB = @LEXLIB@
33 +LEXLIB =
34 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
35 LIBOBJS = @LIBOBJS@
36 LIBOL_DIR = @LIBOL_DIR@
37 diff -urN syslog-ng-1.6.9/src/cfg-lex.c syslog-ng-1.6.9.new/src/cfg-lex.c
38 --- syslog-ng-1.6.9/src/cfg-lex.c 2005-11-15 19:41:46.000000000 +0100
39 +++ syslog-ng-1.6.9.new/src/cfg-lex.c 2006-03-23 19:03:25.000000000 +0100
40 @@ -666,7 +666,9 @@
41 #ifdef __cplusplus
42 extern "C" int yywrap (void );
43 #else
44 -extern int yywrap (void );
45 +int yywrap (void ) {
46 + return 1;
47 +}
48 #endif
49 #endif
50