Fri, 16 Jan 2009 10:58:21 +0100
Correct and improve code logic, buildconf, and packaging. In particular:
1. Use descriptive variable names <var>libs instead of just <var>.
2. Although Nokia states in all Qt builds that 'NOTE: When linking
against OpenSSL, you can override the default library names
through OPENSSL_LIBS.' and even gives an example, their own
configuration logic rejects such an attempt. Correct this by
hard coding the OpenSSL library string in the configure script.
3. Consistently use the whitespace substitution [\t ] throughout.
4. Patch the buggy INCPATH of SQL plugin Qmake project files.
5. Add the 'x11' configuration variable to the qtconfig Qmake
project using the src/gui/gui.pro file as a model. This is
needed for qtconfig although not in other tools, because
the qtconfig buildconf indirectly includes qt_x11_p.h which
is dependent on X11 headers.
6. Avoid 'ld.so: fatal: hardware capability unsupported: SSE2 AMD_3DNow'
on platforms for which the config.tests/unix/[3dnow|sse2] succeed
although unsopported at run time by testing for the x86-64
instruction set at build time and regulating hardware capabilities.
7. Correctly install the desinger plugin by explicitly building it.
8. Remove custom plugin installation logic which is unnecessary.
9. Correct removal of temporary paths from shared object files.
1 Index: aqbanking-2.3.3/src/libs/aqbanking/Makefile.in
2 --- aqbanking-2.3.3/src/libs/aqbanking/Makefile.in.orig 2006-01-28 00:56:18 +0100
3 +++ aqbanking-2.3.3/src/libs/aqbanking/Makefile.in 2006-01-28 09:50:06 +0100
4 @@ -525,7 +525,7 @@
5 wcb.c\
6 msgengine.c
8 -libaqbanking_la_LIBADD = $(gwenhywfar_libs) \
9 +libaqbanking_la_LIBADD = \
10 jobs/libjobs.la \
11 types/libtypes.la
13 @@ -537,7 +537,7 @@
14 libaqbanking_la_DEPENDENCIES = jobs/libjobs.la types/libtypes.la \
15 $(am__append_1)
16 testlib_SOURCES = testlib.c
17 -testlib_LDADD = libaqbanking.la
18 +testlib_LDADD = libaqbanking.la $(gwenhywfar_libs)
19 TESTS = testlib
20 all: all-recursive
22 Index: aqbanking-2.3.3/src/plugins/bankinfo/generic/Makefile.in
23 --- aqbanking-2.3.3/src/plugins/bankinfo/generic/Makefile.in.orig 2006-01-28 00:56:42 +0100
24 +++ aqbanking-2.3.3/src/plugins/bankinfo/generic/Makefile.in 2006-01-28 09:49:40 +0100
25 @@ -476,7 +476,7 @@
26 libbankinfo_la_SOURCES = \
27 generic.c
29 -libbankinfo_la_LIBADD = -L$(top_builddir)/src/libs/aqbanking $(aqbanking_internal_libs) $(gwenhywfar_libs)
30 +libbankinfo_la_LIBADD =
31 libbankinfo_la_LDFLAGS = $(STRIPALL)
32 at_files = at/blz.idx at/bic.idx at/namloc.idx at/banks.data
33 ch_files = ch/blz.idx ch/bic.idx ch/namloc.idx ch/banks.data
34 Index: openhbci-0.9.18/src/openhbci/openhbci-config.in.in
35 --- openhbci-0.9.18/src/openhbci/openhbci-config.in.in.orig 2003-05-18 23:46:36 +0200
36 +++ openhbci-0.9.18/src/openhbci/openhbci-config.in.in 2006-01-28 09:49:40 +0100
37 @@ -9,7 +9,7 @@
38 result="$result @PROGRAM_INCLUDES@ -I$dir/include"
39 ;;
40 --libraries)
41 - result="$result -L$dir/lib @OPENHBCI_LIB@"
42 + result="$result -L$dir/lib @OPENHBCI_LIB@ -lgwenhywfar"
43 ;;
44 --plugins)
45 result="$result @PLUGIN_PATH@/@OPENHBCI_SO_VERSION@"
46 Index: openhbci2-1.9.4/src/openhbci-tng/openhbci2-config.in.in
47 --- openhbci2-1.9.4/src/openhbci-tng/openhbci2-config.in.in.orig 2004-05-20 03:33:53 +0200
48 +++ openhbci2-1.9.4/src/openhbci-tng/openhbci2-config.in.in 2006-01-28 09:49:40 +0100
49 @@ -9,7 +9,7 @@
50 result="$result @PROGRAM_INCLUDES@ -I$dir/include"
51 ;;
52 --libraries)
53 - result="$result -L$dir/lib @OPENHBCI_LIB@"
54 + result="$result -L$dir/lib @OPENHBCI_LIB@ -lgwenhywfar"
55 ;;
56 --plugins)
57 result="$result @PLUGIN_PATH@/@OPENHBCI_SO_EFFECTIVE_VERSION@"
58 Index: openhbci2-1.9.4/src/tools/hbcixml/Makefile.in
59 --- openhbci2-1.9.4/src/tools/hbcixml/Makefile.in.orig 2006-01-20 12:09:55 +0100
60 +++ openhbci2-1.9.4/src/tools/hbcixml/Makefile.in 2006-01-28 09:49:40 +0100
61 @@ -218,7 +218,7 @@
62 INCLUDES = -I../../../ -I../../../openhbci2 @PROGRAM_INCLUDES@ -I../../plugins/msg-xml
63 noinst_HEADERS = loganalyzer.h
64 hbcixml_SOURCES = hbcixml.cpp loganalyzer.cpp
65 -hbcixml_LDADD = -L../../openhbci-tng -L../../openhbci-tng/openhbci-core @PROGRAM_LIBS@ ../../plugins/msg-xml/libmsgxml.la
66 +hbcixml_LDADD = -L../../openhbci-tng -L../../openhbci-tng/openhbci-core @PROGRAM_LIBS@ ../../plugins/msg-xml/libmsgxml.la $(gwenhywfar_libs)
67 all: all-am
69 .SUFFIXES: