| blob | 685869bad5c072ae841e27f2ca1b987be3cfe0a9 |
1 Created from the patched (FixVersionDetection.diff) configure.in, ignoring
2 unrelated hunks (thus invalidating some hard-coded line numbers). This way
3 we do not add a dependency on autoconf-2.13.
5 diff --git a/js/src/configure b/js/src/configure
6 --- a/js/src/configure
7 +++ b/js/src/configure
8 @@ -1662,70 +1662,6 @@ esac
10 fi
12 -MOZILLA_VERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir`
13 -MOZILLA_UAVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --uaversion`
14 -MOZILLA_SYMBOLVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --symbolversion`
15 -
16 -cat >> confdefs.pytmp <<EOF
17 - (''' MOZILLA_VERSION ''', r''' "$MOZILLA_VERSION" ''')
18 -EOF
19 -cat >> confdefs.h <<EOF
20 -#define MOZILLA_VERSION "$MOZILLA_VERSION"
21 -EOF
22 -
23 -cat >> confdefs.pytmp <<EOF
24 - (''' MOZILLA_VERSION_U ''', r''' $MOZILLA_VERSION ''')
25 -EOF
26 -cat >> confdefs.h <<EOF
27 -#define MOZILLA_VERSION_U $MOZILLA_VERSION
28 -EOF
29 -
30 -cat >> confdefs.pytmp <<EOF
31 - (''' MOZILLA_UAVERSION ''', r''' "$MOZILLA_UAVERSION" ''')
32 -EOF
33 -cat >> confdefs.h <<EOF
34 -#define MOZILLA_UAVERSION "$MOZILLA_UAVERSION"
35 -EOF
36 -
37 -
38 -
39 -# Separate version into components for use in shared object naming etc
40 -
41 -MOZJS_MAJOR_VERSION=`echo $MOZILLA_VERSION | sed "s|\(^[0-9]*\)\.[0-9]*.*|\1|"`
42 -MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.\([0-9]*\).*|\1|"`
43 -MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"`
44 -IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'`
45 -
46 -JS_SHELL_NAME=js
47 -JS_CONFIG_NAME=js-config
48 -
49 -
50 -if test -n "$IS_ALPHA"; then
51 -
52 - MOZJS_ALPHA=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9\.]*\([^0-9]\).*|\1|"`
53 -
54 -fi
55 -cat >> confdefs.pytmp <<EOF
56 - (''' MOZJS_MAJOR_VERSION ''', r''' $MOZJS_MAJOR_VERSION ''')
57 -EOF
58 -cat >> confdefs.h <<EOF
59 -#define MOZJS_MAJOR_VERSION $MOZJS_MAJOR_VERSION
60 -EOF
61 -
62 -cat >> confdefs.pytmp <<EOF
63 - (''' MOZJS_MINOR_VERSION ''', r''' $MOZJS_MINOR_VERSION ''')
64 -EOF
65 -cat >> confdefs.h <<EOF
66 -#define MOZJS_MINOR_VERSION $MOZJS_MINOR_VERSION
67 -EOF
68 -
69 -
70 -
71 -
72 -
73 -
74 -
75 -
77 AR_FLAGS='crs $@'
79 @@ -5731,6 +5565,71 @@ XCFLAGS="$X_CFLAGS"
81 fi # COMPILE_ENVIRONMENT
83 +MOZILLA_VERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir`
84 +MOZILLA_UAVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --uaversion`
85 +MOZILLA_SYMBOLVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --symbolversion`
86 +
87 +cat >> confdefs.pytmp <<EOF
88 + (''' MOZILLA_VERSION ''', r''' "$MOZILLA_VERSION" ''')
89 +EOF
90 +cat >> confdefs.h <<EOF
91 +#define MOZILLA_VERSION "$MOZILLA_VERSION"
92 +EOF
93 +
94 +cat >> confdefs.pytmp <<EOF
95 + (''' MOZILLA_VERSION_U ''', r''' $MOZILLA_VERSION ''')
96 +EOF
97 +cat >> confdefs.h <<EOF
98 +#define MOZILLA_VERSION_U $MOZILLA_VERSION
99 +EOF
100 +
101 +cat >> confdefs.pytmp <<EOF
102 + (''' MOZILLA_UAVERSION ''', r''' "$MOZILLA_UAVERSION" ''')
103 +EOF
104 +cat >> confdefs.h <<EOF
105 +#define MOZILLA_UAVERSION "$MOZILLA_UAVERSION"
106 +EOF
107 +
108 +
109 +
110 +# Separate version into components for use in shared object naming etc
111 +
112 +MOZJS_MAJOR_VERSION=`echo $MOZILLA_VERSION | sed "s|\(^[0-9]*\)\.[0-9]*.*|\1|"`
113 +MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.\([0-9]*\).*|\1|"`
114 +MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"`
115 +IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'`
116 +
117 +JS_SHELL_NAME=js
118 +JS_CONFIG_NAME=js-config
119 +
120 +
121 +if test -n "$IS_ALPHA"; then
122 +
123 + MOZJS_ALPHA=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9\.]*\([^0-9]\).*|\1|"`
124 +
125 +fi
126 +cat >> confdefs.pytmp <<EOF
127 + (''' MOZJS_MAJOR_VERSION ''', r''' $MOZJS_MAJOR_VERSION ''')
128 +EOF
129 +cat >> confdefs.h <<EOF
130 +#define MOZJS_MAJOR_VERSION $MOZJS_MAJOR_VERSION
131 +EOF
132 +
133 +cat >> confdefs.pytmp <<EOF
134 + (''' MOZJS_MINOR_VERSION ''', r''' $MOZJS_MINOR_VERSION ''')
135 +EOF
136 +cat >> confdefs.h <<EOF
137 +#define MOZJS_MINOR_VERSION $MOZJS_MINOR_VERSION
138 +EOF
139 +
140 +
141 +
142 +
143 +
144 +
145 +
146 +
147 +
148 AS_BIN=$AS
149 AR_LIST='$(AR) t'
150 AR_EXTRACT='$(AR) x'
151 @@ -16003,13 +15908,6 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
152 (''' ANDROID_NDK ''', r''' $ANDROID_NDK ''')
153 (''' ANDROID_TOOLCHAIN ''', r''' $ANDROID_TOOLCHAIN ''')
154 (''' ANDROID_PLATFORM ''', r''' $ANDROID_PLATFORM ''')
155 - (''' MOZILLA_SYMBOLVERSION ''', r''' $MOZILLA_SYMBOLVERSION ''')
156 - (''' JS_SHELL_NAME ''', r''' $JS_SHELL_NAME ''')
157 - (''' JS_CONFIG_NAME ''', r''' $JS_CONFIG_NAME ''')
158 - (''' MOZJS_MAJOR_VERSION ''', r''' $MOZJS_MAJOR_VERSION ''')
159 - (''' MOZJS_MINOR_VERSION ''', r''' $MOZJS_MINOR_VERSION ''')
160 - (''' MOZJS_PATCH_VERSION ''', r''' $MOZJS_PATCH_VERSION ''')
161 - (''' MOZJS_ALPHA ''', r''' $MOZJS_ALPHA ''')
162 (''' HOST_CC ''', r''' $HOST_CC ''')
163 (''' HOST_CXX ''', r''' $HOST_CXX ''')
164 (''' HOST_RANLIB ''', r''' $HOST_RANLIB ''')
165 @@ -16061,6 +15959,13 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
166 (''' X_PRE_LIBS ''', r''' $X_PRE_LIBS ''')
167 (''' X_LIBS ''', r''' $X_LIBS ''')
168 (''' X_EXTRA_LIBS ''', r''' $X_EXTRA_LIBS ''')
169 + (''' MOZILLA_SYMBOLVERSION ''', r''' $MOZILLA_SYMBOLVERSION ''')
170 + (''' JS_SHELL_NAME ''', r''' $JS_SHELL_NAME ''')
171 + (''' JS_CONFIG_NAME ''', r''' $JS_CONFIG_NAME ''')
172 + (''' MOZJS_MAJOR_VERSION ''', r''' $MOZJS_MAJOR_VERSION ''')
173 + (''' MOZJS_MINOR_VERSION ''', r''' $MOZJS_MINOR_VERSION ''')
174 + (''' MOZJS_PATCH_VERSION ''', r''' $MOZJS_PATCH_VERSION ''')
175 + (''' MOZJS_ALPHA ''', r''' $MOZJS_ALPHA ''')
176 (''' SOLARIS_SUNPRO_CC ''', r''' $SOLARIS_SUNPRO_CC ''')
177 (''' SOLARIS_SUNPRO_CXX ''', r''' $SOLARIS_SUNPRO_CXX ''')
178 (''' MOZ_THUMB2 ''', r''' $MOZ_THUMB2 ''')