]>
Commit | Line | Data |
---|---|---|
4ebb88f5 | 1 | --- snort-2.8.4.1/configure.in.orig 2009-04-21 20:42:53.000000000 +0200 |
2 | +++ snort-2.8.4.1/configure.in 2009-05-03 12:05:54.000000000 +0200 | |
3 | @@ -678,10 +678,10 @@ | |
4 | done | |
a08770b6 | 5 | fi |
4ebb88f5 | 6 | if test -z "$MYSQL_LIB_DIR"; then |
7 | - str="$i/lib/libmysqlclient.*" | |
8 | + str="$i/lib64/libmysqlclient.*" | |
9 | for j in `echo $str`; do | |
10 | if test -r "$j"; then | |
11 | - MYSQL_LIB_DIR="$i/lib" | |
12 | + MYSQL_LIB_DIR="$i/lib64" | |
13 | break 2 | |
14 | fi | |
15 | done | |
16 | @@ -731,7 +731,7 @@ | |
17 | if test "x$mysql_fail" != "xno"; then | |
18 | tmp="" | |
19 | for i in $mysql_lib_directory; do | |
20 | - tmp="$tmp $i $i/lib $i/mysql $i/mysql/lib $i/lib/mysql" | |
21 | + tmp="$tmp $i $i/lib64 $i/mysql $i/mysql/lib64 $i/lib64/mysql" | |
22 | done | |
23 | FAIL_MESSAGE("mysqlclient library (libmysqlclient.*)", $tmp) | |
24 | else | |
25 | @@ -845,10 +845,10 @@ | |
a08770b6 | 26 | fi |
27 | else | |
28 | ||
29 | - str="$ODBC_DIR/lib/libodbc.*" | |
30 | + str="$ODBC_DIR/lib64/libodbc.*" | |
31 | for j in `echo $str`; do | |
4ebb88f5 | 32 | if test -r "$j"; then |
a08770b6 | 33 | - ODBC_LIB_DIR="$ODBC_DIR/lib" |
34 | + ODBC_LIB_DIR="$ODBC_DIR/lib64" | |
35 | ODBC_LIB="odbc" | |
36 | fi | |
37 | done | |
4ebb88f5 | 38 | @@ -865,7 +865,7 @@ |
a08770b6 | 39 | |
40 | if test -z "$ODBC_LIB_DIR"; then | |
4ebb88f5 | 41 | if test "x$odbc_fail" != "xno"; then |
a08770b6 | 42 | - FAIL_MESSAGE("odbc library (libodbc)", "$ODBC_DIR/lib") |
43 | + FAIL_MESSAGE("odbc library (libodbc)", "$ODBC_DIR/lib64") | |
44 | else | |
45 | AC_MSG_RESULT(no) | |
46 | fi | |
4ebb88f5 | 47 | @@ -948,7 +948,7 @@ |
3878cbed AM |
48 | |
49 | if test -z "$POSTGRESQL_DIR"; then | |
50 | for dir in $postgresql_directory; do | |
4ebb88f5 | 51 | - for i in "lib" "lib/pgsql"; do |
52 | + for i in "lib64" "lib64/pgsql"; do | |
3878cbed AM |
53 | str="$dir/$i/libpq.*" |
54 | for j in `echo $str`; do | |
55 | if test -r $j; then | |
4ebb88f5 | 56 | @@ -959,13 +959,13 @@ |
57 | done | |
58 | done | |
59 | else | |
60 | - POSTGRESQL_LIB_DIR="$POSTGRESQL_DIR/lib" | |
61 | + POSTGRESQL_LIB_DIR="$POSTGRESQL_DIR/lib64" | |
62 | fi | |
63 | ||
64 | if test -z "$POSTGRESQL_LIB_DIR"; then | |
65 | if test "$postgresql_fail" != "no"; then | |
66 | FAIL_MESSAGE("postgresql library libpq", | |
67 | - "$POSTGRESQL_DIR/lib $POSTGRESQL_DIR/lib/pgsql") | |
68 | + "$POSTGRESQL_DIR/lib64 $POSTGRESQL_DIR/lib64/pgsql") | |
69 | else | |
70 | AC_MSG_RESULT(no); | |
71 | fi | |
72 | @@ -1024,7 +1024,7 @@ | |
73 | for i in "rdbms/demo" "rdbms/public" "network/public"; do | |
a08770b6 | 74 | ORACLE_CPP_FLAGS="$ORACLE_CPP_FLAGS -I$ORACLE_DIR/$i" |
75 | done | |
76 | - ORACLE_LIB_DIR="$ORACLE_DIR/lib" | |
77 | + ORACLE_LIB_DIR="$ORACLE_DIR/lib64" | |
78 | AC_MSG_RESULT(yes) | |
79 | ||
80 | LDFLAGS="${LDFLAGS} -L${ORACLE_LIB_DIR}" | |
be53c82d | 81 | diff -Nur snort-2.8.4.1-orig/src/dynamic-examples/dynamic-preprocessor/Makefile.am snort-2.8.4.1/src/dynamic-examples/dynamic-preprocessor/Makefile.am |
82 | --- snort-2.8.4.1-orig/src/dynamic-examples/dynamic-preprocessor/Makefile.am 2007-10-11 18:07:25.000000000 +0200 | |
83 | +++ snort-2.8.4.1/src/dynamic-examples/dynamic-preprocessor/Makefile.am 2009-05-03 20:26:49.000000000 +0200 | |
84 | @@ -3,7 +3,7 @@ | |
85 | ||
86 | INCLUDES = -I../include | |
87 | ||
88 | -noinst_libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor | |
89 | +noinst_libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor | |
90 | ||
91 | noinst_lib_LTLIBRARIES = lib_sfdynamic_preprocessor_example.la | |
92 | ||
93 | diff -Nur snort-2.8.4.1-orig/src/dynamic-examples/dynamic-rule/Makefile.am snort-2.8.4.1/src/dynamic-examples/dynamic-rule/Makefile.am | |
94 | --- snort-2.8.4.1-orig/src/dynamic-examples/dynamic-rule/Makefile.am 2007-10-11 18:07:25.000000000 +0200 | |
95 | +++ snort-2.8.4.1/src/dynamic-examples/dynamic-rule/Makefile.am 2009-05-03 20:26:42.000000000 +0200 | |
96 | @@ -3,7 +3,7 @@ | |
97 | ||
98 | INCLUDES = -I../include | |
99 | ||
100 | -noinst_libdir = ${exec_prefix}/lib/snort_dynamicrules | |
101 | +noinst_libdir = ${exec_prefix}/lib64/snort_dynamicrules | |
102 | ||
103 | noinst_lib_LTLIBRARIES = lib_sfdynamic_example_rule.la | |
104 | ||
105 | diff -Nur snort-2.8.4.1-orig/src/dynamic-plugins/sf_engine/Makefile.am snort-2.8.4.1/src/dynamic-plugins/sf_engine/Makefile.am | |
106 | --- snort-2.8.4.1-orig/src/dynamic-plugins/sf_engine/Makefile.am 2008-10-06 18:33:00.000000000 +0200 | |
107 | +++ snort-2.8.4.1/src/dynamic-plugins/sf_engine/Makefile.am 2009-05-03 20:26:56.000000000 +0200 | |
108 | @@ -5,7 +5,7 @@ | |
109 | ||
110 | lib_LTLIBRARIES = libsf_engine.la | |
111 | ||
112 | -libdir = ${exec_prefix}/lib/snort_dynamicengine | |
113 | +libdir = ${exec_prefix}/lib64/snort_dynamicengine | |
114 | ||
115 | libsf_engine_la_LDFLAGS = -export-dynamic | |
116 | ||
117 | diff -Nur snort-2.8.4.1-orig/src/dynamic-preprocessors/dcerpc/Makefile.am snort-2.8.4.1/src/dynamic-preprocessors/dcerpc/Makefile.am | |
118 | --- snort-2.8.4.1-orig/src/dynamic-preprocessors/dcerpc/Makefile.am 2009-01-26 22:50:11.000000000 +0100 | |
119 | +++ snort-2.8.4.1/src/dynamic-preprocessors/dcerpc/Makefile.am 2009-05-03 20:24:21.000000000 +0200 | |
120 | @@ -3,7 +3,7 @@ | |
121 | ||
122 | INCLUDES = -I../include | |
123 | ||
124 | -libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor | |
125 | +libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor | |
126 | ||
127 | lib_LTLIBRARIES = libsf_dcerpc_preproc.la | |
128 | ||
129 | diff -Nur snort-2.8.4.1-orig/src/dynamic-preprocessors/dcerpc2/Makefile.am snort-2.8.4.1/src/dynamic-preprocessors/dcerpc2/Makefile.am | |
130 | --- snort-2.8.4.1-orig/src/dynamic-preprocessors/dcerpc2/Makefile.am 2009-01-26 22:50:13.000000000 +0100 | |
131 | +++ snort-2.8.4.1/src/dynamic-preprocessors/dcerpc2/Makefile.am 2009-05-03 20:24:36.000000000 +0200 | |
132 | @@ -3,7 +3,7 @@ | |
133 | ||
134 | INCLUDES = -I../include -I$(srcdir)/includes | |
135 | ||
136 | -libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor | |
137 | +libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor | |
138 | ||
139 | lib_LTLIBRARIES = libsf_dce2_preproc.la | |
140 | ||
141 | diff -Nur snort-2.8.4.1-orig/src/dynamic-preprocessors/dns/Makefile.am snort-2.8.4.1/src/dynamic-preprocessors/dns/Makefile.am | |
142 | --- snort-2.8.4.1-orig/src/dynamic-preprocessors/dns/Makefile.am 2009-01-26 22:50:17.000000000 +0100 | |
143 | +++ snort-2.8.4.1/src/dynamic-preprocessors/dns/Makefile.am 2009-05-03 20:24:46.000000000 +0200 | |
144 | @@ -3,7 +3,7 @@ | |
145 | ||
146 | INCLUDES = -I../include | |
147 | ||
148 | -libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor | |
149 | +libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor | |
150 | ||
151 | lib_LTLIBRARIES = libsf_dns_preproc.la | |
152 | ||
153 | diff -Nur snort-2.8.4.1-orig/src/dynamic-preprocessors/ftptelnet/Makefile.am snort-2.8.4.1/src/dynamic-preprocessors/ftptelnet/Makefile.am | |
154 | --- snort-2.8.4.1-orig/src/dynamic-preprocessors/ftptelnet/Makefile.am 2009-01-26 22:50:18.000000000 +0100 | |
155 | +++ snort-2.8.4.1/src/dynamic-preprocessors/ftptelnet/Makefile.am 2009-05-03 20:25:13.000000000 +0200 | |
156 | @@ -3,7 +3,7 @@ | |
157 | ||
158 | INCLUDES = -I../include -I./includes | |
159 | ||
160 | -libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor | |
161 | +libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor | |
162 | ||
163 | lib_LTLIBRARIES = libsf_ftptelnet_preproc.la | |
164 | ||
165 | diff -Nur snort-2.8.4.1-orig/src/dynamic-preprocessors/smtp/Makefile.am snort-2.8.4.1/src/dynamic-preprocessors/smtp/Makefile.am | |
166 | --- snort-2.8.4.1-orig/src/dynamic-preprocessors/smtp/Makefile.am 2009-01-26 22:50:22.000000000 +0100 | |
167 | +++ snort-2.8.4.1/src/dynamic-preprocessors/smtp/Makefile.am 2009-05-03 20:25:35.000000000 +0200 | |
168 | @@ -3,7 +3,7 @@ | |
169 | ||
170 | INCLUDES = -I../include -I${top_srcdir}/src/dynamic-preprocessors/libs | |
171 | ||
172 | -libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor | |
173 | +libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor | |
174 | ||
175 | lib_LTLIBRARIES = libsf_smtp_preproc.la | |
176 | ||
177 | diff -Nur snort-2.8.4.1-orig/src/dynamic-preprocessors/ssh/Makefile.am snort-2.8.4.1/src/dynamic-preprocessors/ssh/Makefile.am | |
178 | --- snort-2.8.4.1-orig/src/dynamic-preprocessors/ssh/Makefile.am 2009-01-26 22:50:24.000000000 +0100 | |
179 | +++ snort-2.8.4.1/src/dynamic-preprocessors/ssh/Makefile.am 2009-05-03 20:25:43.000000000 +0200 | |
180 | @@ -3,7 +3,7 @@ | |
181 | ||
182 | INCLUDES = -I../include | |
183 | ||
184 | -libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor | |
185 | +libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor | |
186 | ||
187 | lib_LTLIBRARIES = libsf_ssh_preproc.la | |
188 | ||
189 | diff -Nur snort-2.8.4.1-orig/src/dynamic-preprocessors/ssl/Makefile.am snort-2.8.4.1/src/dynamic-preprocessors/ssl/Makefile.am | |
190 | --- snort-2.8.4.1-orig/src/dynamic-preprocessors/ssl/Makefile.am 2009-01-26 22:50:24.000000000 +0100 | |
191 | +++ snort-2.8.4.1/src/dynamic-preprocessors/ssl/Makefile.am 2009-05-03 20:25:57.000000000 +0200 | |
192 | @@ -3,7 +3,7 @@ | |
193 | ||
194 | INCLUDES = -I../include -I${top_srcdir}/src/dynamic-preprocessors/libs | |
195 | ||
196 | -libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor | |
197 | +libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor | |
198 | ||
199 | lib_LTLIBRARIES = libsf_ssl_preproc.la | |
200 |