summaryrefslogtreecommitdiff
path: root/misc/gnomeutils2/files/patch-aa
blob: 23b35a0f70cbfb6590517cda72c6dbbfd7a1ab45 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
--- configure.orig	Wed Sep 23 00:11:28 1998
+++ configure	Fri Oct  2 22:58:32 1998
@@ -940,12 +940,12 @@
 
 
 	if test "$no_gnome_config" = "yes"; then
-          echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
-echo "configure:945: checking for gnomeConf.sh file in $gnome_prefix" >&5
-	  if test -f $gnome_prefix/gnomeConf.sh; then
+          echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
+echo "configure:945: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
+	  if test -f $prefix/share/gnome/gnomeConf.sh; then
 	    echo "$ac_t""found" 1>&6
-	    echo "loading gnome configuration from $gnome_prefix/gnomeConf.sh"
-	    . $gnome_prefix/gnomeConf.sh
+	    echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh"
+	    . $prefix/share/gnome/gnomeConf.sh
 	    
 	  else
 	    echo "$ac_t""not found" 1>&6
@@ -2745,239 +2745,6 @@
 
 
 PROGRAMS_GNCAL="gncal"
-
-
-  for ac_prog in $OBJC egcs
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2756: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJC"; then
-  ac_cv_prog_OBJC="$OBJC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJC="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-OBJC="$ac_cv_prog_OBJC"
-if test -n "$OBJC"; then
-  echo "$ac_t""$OBJC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$OBJC" && break
-done
-test -n "$OBJC" || OBJC=""""
-
-  if test "x$OBJC" = "x" ; then
-    for ac_prog in $OBJC gcc
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2791: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJC"; then
-  ac_cv_prog_OBJC="$OBJC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJC="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-OBJC="$ac_cv_prog_OBJC"
-if test -n "$OBJC"; then
-  echo "$ac_t""$OBJC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$OBJC" && break
-done
-test -n "$OBJC" || OBJC=""""
-
-  fi
-
-  
-
-  OBJC_LIBS="-lobjc $PTHREAD_LIB"
-  echo $ac_n "checking for sched_yield""... $ac_c" 1>&6
-echo "configure:2826: checking for sched_yield" >&5
-if eval "test \"`echo '$''{'ac_cv_func_sched_yield'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2831 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sched_yield(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sched_yield();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_sched_yield) || defined (__stub___sched_yield)
-choke me
-#else
-sched_yield();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_sched_yield=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_sched_yield=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'sched_yield`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-
-    echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
-echo "configure:2873: checking for sched_yield in -lposix4" >&5
-ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lposix4 $OBJC_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2881 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sched_yield();
-
-int main() {
-sched_yield()
-; return 0; }
-EOF
-if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  OBJC_LIBS="$OBJC_LIBS -lposix4"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-  
-
-  echo $ac_n "checking if Objective C compiler ($OBJC) works""... $ac_c" 1>&6
-echo "configure:2917: checking if Objective C compiler ($OBJC) works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_objc_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    if test -n "$OBJC"; then
-      cat > conftest.m <<EOF
-#include <objc/Object.h>
-@interface myRandomObj : Object
-{
-}
-@end
-@implementation myRandomObj
-@end
-int main () {
-  /* No, you are not seeing double.  Remember that square brackets
-     are the autoconf m4 quotes.  */
-  id myid = [myRandomObj alloc];
-  [myid free];
-  return 0;
-}
-EOF
-
-      $OBJC -o conftest $LDFLAGS conftest.m $OBJC_LIBS 1>&5 2>&1
-      result=$?
-      rm -f conftest*
-
-      if test $result -eq 0; then
-        ac_cv_prog_objc_works=yes
-      fi
-    else
-      ac_cv_prog_objc_works=no
-    fi
-  
-fi
-
-echo "$ac_t""$ac_cv_prog_objc_works" 1>&6
-
-  
-
-if test x$ac_cv_prog_objc_works = xyes; then
-  OBJECTIVE_C_TRUE=
-  OBJECTIVE_C_FALSE='#'
-else
-  OBJECTIVE_C_TRUE='#'
-  OBJECTIVE_C_FALSE=
-fi
-    OBJECTIVE_C=$ac_cv_prog_objc_works
-
-if test $OBJECTIVE_C = yes; then
-  
-        echo $ac_n "checking for obGnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
-echo "configure:2969: checking for obGnomeConf.sh file in $gnome_prefix" >&5
-	if test -f $gnome_prefix/obGnomeConf.sh; then
-	    . $gnome_prefix/obGnomeConf.sh
-	    echo "$ac_t""found" 1>&6
-	else
-	    echo "$ac_t""not found" 1>&6
-	    echo "configure: warning: Could not find the obGnomeConf.sh file that is generated by gnome-objc install" 1>&2
-	fi
-	
-	
-	
-
-fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
 echo "configure:2984: checking for working const" >&5