2
===================================================================
3
RCS file: /cvs/tools/config_office/configure.in,v
4
retrieving revision 1.221
5
diff -u -r1.221 configure.in
6
--- config_office/configure.in 4 Oct 2007 07:48:20 -0000 1.221
7
+++ config_office/configure.in 17 Oct 2007 12:12:45 -0000
10
Usage: --with-stlport4=<absolute path to stlport4 home>
12
- Warning!!, --without-stlport4 is possible with
13
- gcc >= 3.3.3, but will break ABI compatability
14
-], WITH_STLPORT=$withval , WITH_STLPORT=yes)
15
+ Warning!!, disabling with --without-stlport4 or
16
+ enabling with --with-stlport4 on a platform that
17
+ defaults to the opposite will break ABI compatability
18
+], WITH_STLPORT=$withval , WITH_STLPORT=auto)
20
[ --with-jdk-home if you have installed JDK 1.3 or later on your system
21
please supply the path here.
22
@@ -2059,6 +2060,30 @@
25
dnl ===================================================================
26
+dnl Checks for what the default STL should be
27
+dnl ===================================================================
28
+ AC_MSG_CHECKING([what the default STL should be])
29
+ DEFAULT_TO_STLPORT="yes"
30
+ if test "$_os" = "Linux"; then
31
+ case "$build_cpu" in
33
+ DEFAULT_TO_STLPORT="yes"
36
+ DEFAULT_TO_STLPORT="no"
40
+ if test "$DEFAULT_TO_STLPORT" = "yes"; then
41
+ AC_MSG_RESULT([stlport])
43
+ AC_MSG_RESULT([gcc])
45
+ if test "$WITH_STLPORT" = "auto"; then
46
+ WITH_STLPORT=$DEFAULT_TO_STLPORT
49
+dnl ===================================================================
50
dnl Checks for STLPORT4
51
dnl ===================================================================
52
AC_MSG_CHECKING([for STLport4 headers])
53
@@ -2066,9 +2091,17 @@
55
if test "$WITH_STLPORT" = "yes"; then
56
AC_MSG_RESULT([using internal stlport.])
57
+ if test "$DEFAULT_TO_STLPORT" != "yes"; then
58
+ AC_MSG_WARN([using stlport. Warning breaks your ABI compatability!])
59
+ echo "using stlport. Warning breaks your ABI compatability!" >>warn
61
elif test "$WITH_STLPORT" = "no"; then
62
- AC_MSG_RESULT([use system STL instead, Warning breaks your ABI compatability!])
63
+ AC_MSG_RESULT([use system STL])
65
+ if test "$DEFAULT_TO_STLPORT" != "no"; then
66
+ AC_MSG_WARN([using system STL. Warning breaks your ABI compatability!])
67
+ echo "using system STL. Warning breaks your ABI compatability!" >>warn
70
STLPORT4=$WITH_STLPORT
71
if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
72
@@ -2113,6 +2146,10 @@
76
+ if test "$DEFAULT_TO_STLPORT" != "yes"; then
77
+ AC_MSG_WARN([using stlport. Warning breaks your ABI compatability!])
78
+ echo "using stlport. Warning breaks your ABI compatability!" >>warn
83
@@ -2145,23 +2182,42 @@
87
+dnl Check whether there's a C pre-processor.
88
+if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
91
+dnl Check whether there's a C++ pre-processor.
92
+if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
96
dnl ===================================================================
98
+dnl system stl sanity tests
99
dnl ===================================================================
100
if test "$USE_SYSTEM_STL" = "YES"; then
101
- AC_MSG_CHECKING([if hash_map will be in __gnu_cxx namespace])
103
+ AC_MSG_CHECKING([if hash_map will be in __gnu_cxx namespace])
105
AC_TRY_COMPILE([#include <ext/hash_map>
106
using namespace __gnu_cxx;
107
],[hash_map<int, int> t; return 0;],
108
ac_cv_cxx_have_ext_hash_map=yes, ac_cv_cxx_have_ext_hash_map=no)
111
if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then
112
- AC_MSG_ERROR([Can't find hash_map. Try with stlport enabled])
113
+ AC_MSG_ERROR([Can't find hash_map. Try with --with-stlport])
115
AC_MSG_RESULT([$ac_cv_cxx_have_ext_hash_map])
118
+ if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
119
+ AC_MSG_CHECKING([if STL headers are visibility safe])
120
+ AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
121
+ AC_MSG_RESULT([$stlvisok])
122
+ if test "$stlvisok" = "no"; then
123
+ AC_MSG_ERROR([Your gcc STL headers are not visibility safe. Try with --with-stlport])
129
dnl ===================================================================
130
@@ -2547,14 +2603,6 @@
131
dnl ===================================================================
132
dnl Checks for programs.
133
dnl ===================================================================
134
-dnl Check whether there's a C pre-processor.
135
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
138
-dnl Check whether there's a C++ pre-processor.
139
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
143
dnl ===================================================================
144
dnl Check whether we already have dmake
145
Index: settings/settings.mk
146
===================================================================
147
RCS file: /cvs/api/odk/settings/settings.mk,v
148
retrieving revision 1.23
149
diff -u -r1.23 settings.mk
150
--- odk/settings/settings.mk 31 Jul 2007 13:58:07 -0000 1.23
151
+++ odk/settings/settings.mk 18 Oct 2007 13:41:31 -0000
152
@@ -229,10 +229,12 @@
153
PACKAGE_LIB_DIR=linux_x86.plt
154
UNOPKG_PLATFORM=Linux_x86
156
+STLPORTLIB=-lstlport_gcc
158
ifeq "$(PROCTYPE)" "x86_64"
159
PACKAGE_LIB_DIR=linux_x86_64.plt
160
UNOPKG_PLATFORM=Linux_x86_64
162
# needs deeper investigation for intel 64 bit
166
SALHELPERLIB=-luno_salhelper$(COMID)
169
-STLPORTLIB=-lstlport_gcc