1
Index: ubuntu/configure
2
===================================================================
3
--- ubuntu.orig/configure 2009-09-15 13:26:58.948411300 +0200
4
+++ ubuntu/configure 2009-09-15 13:31:51.000000000 +0200
26
# Initialize some variables set by options.
27
@@ -1313,6 +1319,10 @@
28
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
29
you have headers in a nonstandard directory <include dir>
31
+ PKG_CONFIG path to pkg-config utility
33
+ C compiler flags for AXIS2C, overriding pkg-config
34
+ AXIS2C_LIBS linker flags for AXIS2C, overriding pkg-config
36
Use these variables to override the choices made by `configure' or to help
37
it to find libraries and programs with nonstandard names/locations.
38
@@ -3528,13 +3538,13 @@
39
for x in `ls ${AXIS2C_HOME}/include`; do
40
INCLUDES="${INCLUDES} -I${AXIS2C_HOME}/include/$x"
42
- LIBS="-L${AXIS2C_HOME}/lib -L${AXIS2C_HOME}/modules/rampart ${LIBS}"
43
+ LIBS="-L${AXIS2C_HOME}/lib ${LIBS}"
46
if test -n "${LIBVIRT_HOME}" ; then
47
if test -d "${LIBVIRT_HOME}"/include ; then
48
INCLUDES="${INCLUDES} -I${LIBVIRT_HOME}/include"
49
- LIBS="-L${LIBVIRT_HOME}/lib -L${AXIS2C_HOME}/modules/rampart ${LIBS}"
50
+ LIBS="-L${LIBVIRT_HOME}/lib ${LIBS}"
54
@@ -4452,340 +4462,202 @@
56
# Checks for libraries.
57
# FIXME: Replace `main' with a function in the library
58
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -laxis2_axiom" >&5
59
-$as_echo_n "checking for main in -laxis2_axiom... " >&6; }
60
-if test "${ac_cv_lib_axis2_axiom_main+set}" = set; then :
61
- $as_echo_n "(cached) " >&6
63
- ac_check_lib_save_LIBS=$LIBS
64
-LIBS="-laxis2_axiom $LIBS"
65
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
66
-/* end confdefs.h. */
77
-if ac_fn_c_try_link "$LINENO"; then :
78
- ac_cv_lib_axis2_axiom_main=yes
80
- ac_cv_lib_axis2_axiom_main=no
82
-rm -f core conftest.err conftest.$ac_objext \
83
- conftest$ac_exeext conftest.$ac_ext
84
-LIBS=$ac_check_lib_save_LIBS
86
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_axis2_axiom_main" >&5
87
-$as_echo "$ac_cv_lib_axis2_axiom_main" >&6; }
88
-if test "x$ac_cv_lib_axis2_axiom_main" = x""yes; then :
89
- cat >>confdefs.h <<_ACEOF
90
-#define HAVE_LIBAXIS2_AXIOM 1
93
- LIBS="-laxis2_axiom $LIBS"
96
- as_fn_error "Cannot find axis2 libs!" "$LINENO" 5
99
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -laxis2_engine" >&5
100
-$as_echo_n "checking for main in -laxis2_engine... " >&6; }
101
-if test "${ac_cv_lib_axis2_engine_main+set}" = set; then :
102
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
103
+ if test -n "$ac_tool_prefix"; then
104
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
105
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
106
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
107
+$as_echo_n "checking for $ac_word... " >&6; }
108
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
109
$as_echo_n "(cached) " >&6
111
- ac_check_lib_save_LIBS=$LIBS
112
-LIBS="-laxis2_engine $LIBS"
113
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
114
-/* end confdefs.h. */
116
+ case $PKG_CONFIG in
118
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
121
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
125
+ test -z "$as_dir" && as_dir=.
126
+ for ac_exec_ext in '' $ac_executable_extensions; do
127
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
128
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
129
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
144
-if ac_fn_c_try_link "$LINENO"; then :
145
- ac_cv_lib_axis2_engine_main=yes
147
- ac_cv_lib_axis2_engine_main=no
151
-rm -f core conftest.err conftest.$ac_objext \
152
- conftest$ac_exeext conftest.$ac_ext
153
-LIBS=$ac_check_lib_save_LIBS
154
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
155
+if test -n "$PKG_CONFIG"; then
156
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
157
+$as_echo "$PKG_CONFIG" >&6; }
159
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
160
+$as_echo "no" >&6; }
162
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_axis2_engine_main" >&5
163
-$as_echo "$ac_cv_lib_axis2_engine_main" >&6; }
164
-if test "x$ac_cv_lib_axis2_engine_main" = x""yes; then :
165
- cat >>confdefs.h <<_ACEOF
166
-#define HAVE_LIBAXIS2_ENGINE 1
169
- LIBS="-laxis2_engine $LIBS"
172
- as_fn_error "Cannot find axis2 libs!" "$LINENO" 5
175
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -laxis2_http_common" >&5
176
-$as_echo_n "checking for main in -laxis2_http_common... " >&6; }
177
-if test "${ac_cv_lib_axis2_http_common_main+set}" = set; then :
178
+if test -z "$ac_cv_path_PKG_CONFIG"; then
179
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
180
+ # Extract the first word of "pkg-config", so it can be a program name with args.
181
+set dummy pkg-config; ac_word=$2
182
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
183
+$as_echo_n "checking for $ac_word... " >&6; }
184
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
185
$as_echo_n "(cached) " >&6
187
- ac_check_lib_save_LIBS=$LIBS
188
-LIBS="-laxis2_http_common $LIBS"
189
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
190
-/* end confdefs.h. */
192
+ case $ac_pt_PKG_CONFIG in
194
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
197
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
201
+ test -z "$as_dir" && as_dir=.
202
+ for ac_exec_ext in '' $ac_executable_extensions; do
203
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
204
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
205
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
220
-if ac_fn_c_try_link "$LINENO"; then :
221
- ac_cv_lib_axis2_http_common_main=yes
223
- ac_cv_lib_axis2_http_common_main=no
225
-rm -f core conftest.err conftest.$ac_objext \
226
- conftest$ac_exeext conftest.$ac_ext
227
-LIBS=$ac_check_lib_save_LIBS
231
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_axis2_http_common_main" >&5
232
-$as_echo "$ac_cv_lib_axis2_http_common_main" >&6; }
233
-if test "x$ac_cv_lib_axis2_http_common_main" = x""yes; then :
234
- cat >>confdefs.h <<_ACEOF
235
-#define HAVE_LIBAXIS2_HTTP_COMMON 1
238
- LIBS="-laxis2_http_common $LIBS"
240
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
241
+if test -n "$ac_pt_PKG_CONFIG"; then
242
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
243
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
245
- as_fn_error "Cannot find axis2 libs!" "$LINENO" 5
246
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
247
+$as_echo "no" >&6; }
250
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -laxis2_http_receiver" >&5
251
-$as_echo_n "checking for main in -laxis2_http_receiver... " >&6; }
252
-if test "${ac_cv_lib_axis2_http_receiver_main+set}" = set; then :
253
- $as_echo_n "(cached) " >&6
255
- ac_check_lib_save_LIBS=$LIBS
256
-LIBS="-laxis2_http_receiver $LIBS"
257
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
258
-/* end confdefs.h. */
269
-if ac_fn_c_try_link "$LINENO"; then :
270
- ac_cv_lib_axis2_http_receiver_main=yes
271
+ if test "x$ac_pt_PKG_CONFIG" = x; then
274
+ case $cross_compiling:$ac_tool_warned in
276
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
277
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
278
+ac_tool_warned=yes ;;
280
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
283
- ac_cv_lib_axis2_http_receiver_main=no
284
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
286
-rm -f core conftest.err conftest.$ac_objext \
287
- conftest$ac_exeext conftest.$ac_ext
288
-LIBS=$ac_check_lib_save_LIBS
290
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_axis2_http_receiver_main" >&5
291
-$as_echo "$ac_cv_lib_axis2_http_receiver_main" >&6; }
292
-if test "x$ac_cv_lib_axis2_http_receiver_main" = x""yes; then :
293
- cat >>confdefs.h <<_ACEOF
294
-#define HAVE_LIBAXIS2_HTTP_RECEIVER 1
297
- LIBS="-laxis2_http_receiver $LIBS"
300
- as_fn_error "Cannot find axis2 libs!" "$LINENO" 5
302
+if test -n "$PKG_CONFIG"; then
303
+ _pkg_min_version=0.9.0
304
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
305
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
306
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
307
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
308
+$as_echo "yes" >&6; }
310
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
311
+$as_echo "no" >&6; }
315
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -laxis2_http_sender" >&5
316
-$as_echo_n "checking for main in -laxis2_http_sender... " >&6; }
317
-if test "${ac_cv_lib_axis2_http_sender_main+set}" = set; then :
318
- $as_echo_n "(cached) " >&6
320
- ac_check_lib_save_LIBS=$LIBS
321
-LIBS="-laxis2_http_sender $LIBS"
322
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
323
-/* end confdefs.h. */
334
-if ac_fn_c_try_link "$LINENO"; then :
335
- ac_cv_lib_axis2_http_sender_main=yes
337
- ac_cv_lib_axis2_http_sender_main=no
339
-rm -f core conftest.err conftest.$ac_objext \
340
- conftest$ac_exeext conftest.$ac_ext
341
-LIBS=$ac_check_lib_save_LIBS
343
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_axis2_http_sender_main" >&5
344
-$as_echo "$ac_cv_lib_axis2_http_sender_main" >&6; }
345
-if test "x$ac_cv_lib_axis2_http_sender_main" = x""yes; then :
346
- cat >>confdefs.h <<_ACEOF
347
-#define HAVE_LIBAXIS2_HTTP_SENDER 1
350
- LIBS="-laxis2_http_sender $LIBS"
353
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AXIS2C" >&5
354
+$as_echo_n "checking for AXIS2C... " >&6; }
356
+if test -n "$PKG_CONFIG"; then
357
+ if test -n "$AXIS2C_CFLAGS"; then
358
+ pkg_cv_AXIS2C_CFLAGS="$AXIS2C_CFLAGS"
360
+ if test -n "$PKG_CONFIG" && \
361
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"axis2c\""; } >&5
362
+ ($PKG_CONFIG --exists --print-errors "axis2c") 2>&5
364
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
365
+ test $ac_status = 0; }; then
366
+ pkg_cv_AXIS2C_CFLAGS=`$PKG_CONFIG --cflags "axis2c" 2>/dev/null`
368
- as_fn_error "Cannot find axis2 libs!" "$LINENO" 5
372
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lguththila" >&5
373
-$as_echo_n "checking for main in -lguththila... " >&6; }
374
-if test "${ac_cv_lib_guththila_main+set}" = set; then :
375
- $as_echo_n "(cached) " >&6
377
- ac_check_lib_save_LIBS=$LIBS
378
-LIBS="-lguththila $LIBS"
379
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
380
-/* end confdefs.h. */
391
-if ac_fn_c_try_link "$LINENO"; then :
392
- ac_cv_lib_guththila_main=yes
395
- ac_cv_lib_guththila_main=no
398
-rm -f core conftest.err conftest.$ac_objext \
399
- conftest$ac_exeext conftest.$ac_ext
400
-LIBS=$ac_check_lib_save_LIBS
402
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_guththila_main" >&5
403
-$as_echo "$ac_cv_lib_guththila_main" >&6; }
404
-if test "x$ac_cv_lib_guththila_main" = x""yes; then :
405
- cat >>confdefs.h <<_ACEOF
406
-#define HAVE_LIBGUTHTHILA 1
409
- LIBS="-lguththila $LIBS"
411
+if test -n "$PKG_CONFIG"; then
412
+ if test -n "$AXIS2C_LIBS"; then
413
+ pkg_cv_AXIS2C_LIBS="$AXIS2C_LIBS"
415
+ if test -n "$PKG_CONFIG" && \
416
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"axis2c\""; } >&5
417
+ ($PKG_CONFIG --exists --print-errors "axis2c") 2>&5
419
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
420
+ test $ac_status = 0; }; then
421
+ pkg_cv_AXIS2C_LIBS=`$PKG_CONFIG --libs "axis2c" 2>/dev/null`
423
- as_fn_error "Cannot find libguththila!" "$LINENO" 5
427
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for axiom_xml_reader_init in -laxis2_parser" >&5
428
-$as_echo_n "checking for axiom_xml_reader_init in -laxis2_parser... " >&6; }
429
-if test "${ac_cv_lib_axis2_parser_axiom_xml_reader_init+set}" = set; then :
430
- $as_echo_n "(cached) " >&6
432
- ac_check_lib_save_LIBS=$LIBS
433
-LIBS="-laxis2_parser $LIBS"
434
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
435
-/* end confdefs.h. */
437
-/* Override any GCC internal prototype to avoid an error.
438
- Use char because int might match the return type of a GCC
439
- builtin and then its argument prototype would still apply. */
443
-char axiom_xml_reader_init ();
447
-return axiom_xml_reader_init ();
452
-if ac_fn_c_try_link "$LINENO"; then :
453
- ac_cv_lib_axis2_parser_axiom_xml_reader_init=yes
456
- ac_cv_lib_axis2_parser_axiom_xml_reader_init=no
459
-rm -f core conftest.err conftest.$ac_objext \
460
- conftest$ac_exeext conftest.$ac_ext
461
-LIBS=$ac_check_lib_save_LIBS
463
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_axis2_parser_axiom_xml_reader_init" >&5
464
-$as_echo "$ac_cv_lib_axis2_parser_axiom_xml_reader_init" >&6; }
465
-if test "x$ac_cv_lib_axis2_parser_axiom_xml_reader_init" = x""yes; then :
466
- cat >>confdefs.h <<_ACEOF
467
-#define HAVE_LIBAXIS2_PARSER 1
470
- LIBS="-laxis2_parser $LIBS"
473
- as_fn_error "Cannot find axis2 libs!" "$LINENO" 5
476
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -laxutil" >&5
477
-$as_echo_n "checking for main in -laxutil... " >&6; }
478
-if test "${ac_cv_lib_axutil_main+set}" = set; then :
479
- $as_echo_n "(cached) " >&6
481
- ac_check_lib_save_LIBS=$LIBS
482
-LIBS="-laxutil $LIBS"
483
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
484
-/* end confdefs.h. */
486
+if test $pkg_failed = yes; then
496
-if ac_fn_c_try_link "$LINENO"; then :
497
- ac_cv_lib_axutil_main=yes
498
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
499
+ _pkg_short_errors_supported=yes
501
- ac_cv_lib_axutil_main=no
503
-rm -f core conftest.err conftest.$ac_objext \
504
- conftest$ac_exeext conftest.$ac_ext
505
-LIBS=$ac_check_lib_save_LIBS
506
+ _pkg_short_errors_supported=no
508
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_axutil_main" >&5
509
-$as_echo "$ac_cv_lib_axutil_main" >&6; }
510
-if test "x$ac_cv_lib_axutil_main" = x""yes; then :
511
- cat >>confdefs.h <<_ACEOF
512
-#define HAVE_LIBAXUTIL 1
515
- LIBS="-laxutil $LIBS"
516
+ if test $_pkg_short_errors_supported = yes; then
517
+ AXIS2C_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "axis2c"`
519
+ AXIS2C_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "axis2c"`
521
+ # Put the nasty error message in config.log where it belongs
522
+ echo "$AXIS2C_PKG_ERRORS" >&5
525
- as_fn_error "Cannot find libaxutil" "$LINENO" 5
526
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
527
+$as_echo "no" >&6; }
528
+ as_fn_error "Cannot find axis2 libs!" "$LINENO" 5
529
+elif test $pkg_failed = untried; then
530
+ as_fn_error "Cannot find axis2 libs!" "$LINENO" 5
532
+ AXIS2C_CFLAGS=$pkg_cv_AXIS2C_CFLAGS
533
+ AXIS2C_LIBS=$pkg_cv_AXIS2C_LIBS
534
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
535
+$as_echo "yes" >&6; }
539
+AXIS2C_LIBS="-Wl,--rpath=$(pkg-config axis2c --variable=libdir) $AXIS2C_LIBS"
540
+#AC_CHECK_LIB([axis2_axiom],[main],,AC_MSG_ERROR([Cannot find axis2 libs!]))
541
+#AC_CHECK_LIB([axis2_engine],[main],,AC_MSG_ERROR([Cannot find axis2 libs!]))
542
+#AC_CHECK_LIB([axis2_http_common],[main],,AC_MSG_ERROR([Cannot find axis2 libs!]))
543
+#AC_CHECK_LIB([axis2_http_receiver],[main],,AC_MSG_ERROR([Cannot find axis2 libs!]))
544
+#AC_CHECK_LIB([axis2_http_sender],[main],,AC_MSG_ERROR([Cannot find axis2 libs!]))
545
+#AC_CHECK_LIB([guththila],[main],,AC_MSG_ERROR([Cannot find libguththila!]))
546
+#AC_CHECK_LIB([axis2_parser],[axiom_xml_reader_init],,AC_MSG_ERROR([Cannot find axis2 libs!]))
547
+#AC_CHECK_LIB([axutil],[main],,AC_MSG_ERROR([Cannot find libaxutil]))
548
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lm" >&5
549
$as_echo_n "checking for main in -lm... " >&6; }
550
if test "${ac_cv_lib_m_main+set}" = set; then :
551
@@ -4825,6 +4697,7 @@
555
+#AC_CHECK_LIB([mod_rampart],[main],,AC_MSG_ERROR([Cannot find libmod_rampart]),[$AXIS2C_LIBS])
556
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmod_rampart" >&5
557
$as_echo_n "checking for main in -lmod_rampart... " >&6; }
558
if test "${ac_cv_lib_mod_rampart_main+set}" = set; then :
559
@@ -4866,47 +4739,6 @@
560
as_fn_error "Cannot find libmod_rampart" "$LINENO" 5
563
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lneethi" >&5
564
-$as_echo_n "checking for main in -lneethi... " >&6; }
565
-if test "${ac_cv_lib_neethi_main+set}" = set; then :
566
- $as_echo_n "(cached) " >&6
568
- ac_check_lib_save_LIBS=$LIBS
569
-LIBS="-lneethi $LIBS"
570
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
571
-/* end confdefs.h. */
582
-if ac_fn_c_try_link "$LINENO"; then :
583
- ac_cv_lib_neethi_main=yes
585
- ac_cv_lib_neethi_main=no
587
-rm -f core conftest.err conftest.$ac_objext \
588
- conftest$ac_exeext conftest.$ac_ext
589
-LIBS=$ac_check_lib_save_LIBS
591
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_neethi_main" >&5
592
-$as_echo "$ac_cv_lib_neethi_main" >&6; }
593
-if test "x$ac_cv_lib_neethi_main" = x""yes; then :
594
- cat >>confdefs.h <<_ACEOF
595
-#define HAVE_LIBNEETHI 1
598
- LIBS="-lneethi $LIBS"
601
- as_fn_error "Cannot find libneethi!" "$LINENO" 5
604
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5
605
$as_echo_n "checking for main in -lpthread... " >&6; }
606
if test "${ac_cv_lib_pthread_main+set}" = set; then :
607
Index: ubuntu/Makedefs.in
608
===================================================================
609
--- ubuntu.orig/Makedefs.in 2009-09-15 13:26:58.936436663 +0200
610
+++ ubuntu/Makedefs.in 2009-09-15 13:31:00.380409658 +0200
614
JAVA_HOME = @JAVA_HOME@
615
+AXIS2C_LIBS = @AXIS2C_LIBS@
617
# compile time configurations
618
euca_theme = @INTERFACE_THEME@
619
Index: ubuntu/configure.ac
620
===================================================================
621
--- ubuntu.orig/configure.ac 2009-09-15 13:26:59.012412035 +0200
622
+++ ubuntu/configure.ac 2009-09-15 13:31:00.380409658 +0200
623
@@ -167,19 +167,19 @@
625
# Checks for libraries.
626
# FIXME: Replace `main' with a function in the library
627
-AC_CHECK_LIB([axis2_axiom],[main],,AC_MSG_ERROR([Cannot find axis2 libs!]))
628
-AC_CHECK_LIB([axis2_engine],[main],,AC_MSG_ERROR([Cannot find axis2 libs!]))
629
-AC_CHECK_LIB([axis2_http_common],[main],,AC_MSG_ERROR([Cannot find axis2 libs!]))
630
-AC_CHECK_LIB([axis2_http_receiver],[main],,AC_MSG_ERROR([Cannot find axis2 libs!]))
631
-AC_CHECK_LIB([axis2_http_sender],[main],,AC_MSG_ERROR([Cannot find axis2 libs!]))
632
-AC_CHECK_LIB([guththila],[main],,AC_MSG_ERROR([Cannot find libguththila!]))
633
-AC_CHECK_LIB([axis2_parser],[axiom_xml_reader_init],,AC_MSG_ERROR([Cannot find axis2 libs!]))
634
-AC_CHECK_LIB([axutil],[main],,AC_MSG_ERROR([Cannot find libaxutil]))
635
+PKG_CHECK_MODULES([AXIS2C], [axis2c],,AC_MSG_ERROR([Cannot find axis2 libs!]))
636
+AXIS2C_LIBS="-Wl,--rpath=$(pkg-config axis2c --variable=libdir) $AXIS2C_LIBS"
637
+#AC_CHECK_LIB([axis2_axiom],[main],,AC_MSG_ERROR([Cannot find axis2 libs!]))
638
+#AC_CHECK_LIB([axis2_engine],[main],,AC_MSG_ERROR([Cannot find axis2 libs!]))
639
+#AC_CHECK_LIB([axis2_http_common],[main],,AC_MSG_ERROR([Cannot find axis2 libs!]))
640
+#AC_CHECK_LIB([axis2_http_receiver],[main],,AC_MSG_ERROR([Cannot find axis2 libs!]))
641
+#AC_CHECK_LIB([axis2_http_sender],[main],,AC_MSG_ERROR([Cannot find axis2 libs!]))
642
+#AC_CHECK_LIB([guththila],[main],,AC_MSG_ERROR([Cannot find libguththila!]))
643
+#AC_CHECK_LIB([axis2_parser],[axiom_xml_reader_init],,AC_MSG_ERROR([Cannot find axis2 libs!]))
644
+#AC_CHECK_LIB([axutil],[main],,AC_MSG_ERROR([Cannot find libaxutil]))
645
AC_CHECK_LIB([m],[main])
646
+#AC_CHECK_LIB([mod_rampart],[main],,AC_MSG_ERROR([Cannot find libmod_rampart]),[$AXIS2C_LIBS])
647
AC_CHECK_LIB([mod_rampart],[main],,AC_MSG_ERROR([Cannot find libmod_rampart]))
648
-AC_CHECK_LIB([neethi],[main],,AC_MSG_ERROR([Cannot find libneethi!]))
649
-AC_CHECK_LIB([omxmlsec],[main],,AC_MSG_ERROR([Cannot find libomxmlsec!]))
650
-AC_CHECK_LIB([oxstokens],[main],,AC_MSG_ERROR([Cannot find liboxstokens!]))
651
AC_CHECK_LIB([pthread],[main])
652
AC_CHECK_LIB([rt],[main])
653
AC_CHECK_LIB([virt],[main],true,AC_MSG_ERROR([Cannot find libvirt!]))
654
Index: ubuntu/cluster/Makefile
655
===================================================================
656
--- ubuntu.orig/cluster/Makefile 2009-09-15 13:31:00.244446364 +0200
657
+++ ubuntu/cluster/Makefile 2009-09-15 13:31:00.380409658 +0200
659
SCLIBS=../storage/storage.o
660
VNLIBS=../net/vnetwork.o ../util/misc.o
661
WSSECLIBS=../util/euca_auth.o
662
-CC_LIBS = ${LIBS} -lcurl
663
+CC_LIBS = ${LIBS} -lcurl ${AXIS2C_LIBS}
667
Index: ubuntu/gatherlog/Makefile
668
===================================================================
669
--- ubuntu.orig/gatherlog/Makefile 2009-09-15 13:31:00.244446364 +0200
670
+++ ubuntu/gatherlog/Makefile 2009-09-15 13:31:00.380409658 +0200
672
SERVICE_NAME=EucalyptusGL
674
#WSDL2C=$(AXIS2C_HOME)/bin/tools/wsdl2c/WSDL2C.sh
675
+GL_LIBS = $(LIBS) $(AXIS2C_LIBS)
680
server: $(SERVICE_SO)
682
$(SERVICE_SO): generated/stubs gl-client-marshal-adb.o server-marshal.o handlers.o $(AXIS2C_HOME)/lib/libaxutil.so
683
- $(CC) -shared generated/*.o server-marshal.o handlers.o $(WSSECLIBS) -L$(AXIS2C_HOME)/lib $(LIBS) ../util/misc.o ../util/euca_auth.o ./gl-client-marshal-adb.o -o $(SERVICE_SO)
684
+ $(CC) -shared generated/*.o server-marshal.o handlers.o $(WSSECLIBS) -L$(AXIS2C_HOME)/lib $(GL_LIBS) ../util/misc.o ../util/euca_auth.o ./gl-client-marshal-adb.o -o $(SERVICE_SO)
688
$(CLIENT): generated/stubs $(CLIENT).c gl-client-marshal-adb.c handlers.o $(AXIS2C_HOME)/lib/libaxutil.so
689
- $(CC) -o $(CLIENT) $(CFLAGS) $(INCLUDES) $(LIBS) generated/adb_*.o generated/axis2_stub_*.o ../util/misc.o ../util/euca_auth.o $(CLIENT).c gl-client-marshal-adb.c -DMODE=1
690
+ $(CC) -o $(CLIENT) $(CFLAGS) $(INCLUDES) $(GL_LIBS) generated/adb_*.o generated/axis2_stub_*.o ../util/misc.o ../util/euca_auth.o $(CLIENT).c gl-client-marshal-adb.c -DMODE=1
693
$(INSTALL) -d $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
694
Index: ubuntu/node/Makefile
695
===================================================================
696
--- ubuntu.orig/node/Makefile 2009-09-15 13:31:00.244446364 +0200
697
+++ ubuntu/node/Makefile 2009-09-15 13:31:00.384406884 +0200
699
SERVICE_NAME=EucalyptusNC
701
#WSDL2C=$(AXIS2C_HOME)/bin/tools/wsdl2c/WSDL2C.sh
702
-NC_LIBS = $(LIBS) -lvirt -lcurl
703
+NC_LIBS = $(LIBS) -lvirt -lcurl $(AXIS2C_LIBS)
704
NC_HANDLERS=handlers_xen.o handlers_kvm.o handlers_default.o
706
all: server client clientlib test_nc test
707
Index: ubuntu/util/euca_auth.h
708
===================================================================
709
--- ubuntu.orig/util/euca_auth.h 2009-09-15 13:26:58.996408603 +0200
710
+++ ubuntu/util/euca_auth.h 2009-09-15 13:31:00.384406884 +0200
712
#include "oxs_axiom.h"
713
#include "oxs_x509_cert.h"
714
#include "oxs_key_mgr.h"
715
+#include "axis2_op.h"
716
#include "rampart_handler_util.h"
717
#include "rampart_sec_processed_result.h"
718
#include "rampart_error.h"
719
Index: ubuntu/util/euca_auth.c
720
===================================================================
721
--- ubuntu.orig/util/euca_auth.c 2009-09-15 13:26:58.992411447 +0200
722
+++ ubuntu/util/euca_auth.c 2009-09-15 13:31:00.384406884 +0200
724
#include "oxs_axiom.h"
725
#include "oxs_x509_cert.h"
726
#include "oxs_key_mgr.h"
727
+#include "rampart_context.h"
728
#include "rampart_handler_util.h"
729
#include "rampart_sec_processed_result.h"
730
#include "rampart_error.h"
added
removed
debian/patches/04-axis2c-1.6.0-rampart-1.3.0.patch
