summaryrefslogtreecommitdiff
path: root/misc/gnome-utils/patches/patch-ac
blob: a8689de671e20f29e00294345eb9958537444804 (plain)
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
$NetBSD: patch-ac,v 1.4 2001/10/13 08:30:25 rh Exp $

--- configure.orig	Fri Oct  5 07:22:36 2001
+++ configure
@@ -5223,13 +5223,13 @@
 if { (eval echo configure:5224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
-		   DATADIRNAME=share
+		   DATADIRNAME=${LOCALEDIR}
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   CATOBJEXT=.mo
-		   DATADIRNAME=lib
+		   DATADIRNAME=${LOCALEDIR}
 fi
 rm -f conftest*
 		INSTOBJEXT=.mo
@@ -5458,7 +5458,7 @@
       # We need to process the po/ directory.
       POSUB=po
     else
-      DATADIRNAME=share
+      DATADIRNAME=${LOCALEDIR}
       nls_cv_header_intl=intl/libintl.h
       nls_cv_header_libgt=intl/libgettext.h
     fi
@@ -6468,125 +6468,8 @@
 fi
 
 
-build_gfloppy=true
-ac_safe=`echo "linux/fd.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for linux/fd.h""... $ac_c" 1>&6
-echo "configure:6475: checking for linux/fd.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6480 "configure"
-#include "confdefs.h"
-#include <linux/fd.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_LINUX_FD_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-build_gfloppy=false
-                echo "configure: warning: *** gfloppy will not be built." 1>&2
-fi
-
-# Check for the ext2fs library
-echo $ac_n "checking for ext2fs_mkdir in -lext2fs""... $ac_c" 1>&6
-echo "configure:6513: checking for ext2fs_mkdir in -lext2fs" >&5
-ac_lib_var=`echo ext2fs'_'ext2fs_mkdir | 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="-lext2fs  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 6521 "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 ext2fs_mkdir();
-
-int main() {
-ext2fs_mkdir()
-; return 0; }
-EOF
-if { (eval echo configure:6532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
-  x_libs="-lext2fs"
-else
-  echo "$ac_t""no" 1>&6
 build_gfloppy=false
-  echo "configure: warning: 
-*** libext2fs not found. You need e2fsprogs and e2fsprogs-devel installed to build gfloppy." 1>&2
-fi
 
-# check for ext2fs header specific includes
-ac_safe=`echo "ext2fs/ext2_io.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for ext2fs/ext2_io.h""... $ac_c" 1>&6
-echo "configure:6558: checking for ext2fs/ext2_io.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6563 "configure"
-#include "confdefs.h"
-#include <ext2fs/ext2_io.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-build_gfloppy=false
-  echo "configure: warning: 
-*** ext2fs/ext2_io.h not found.  You need e2fsprogs-devel installed." 1>&2
-fi