View | Details | Raw Unified | Return to bug 40253 | Differences between
and this patch

Collapse All | Expand All

(-)files/patch-aa (-2 / +107 lines)
Lines 1-5 Link Here
1
--- configure-	Tue May  9 00:19:53 2000
1
--- configure.orig	Thu May 13 01:54:50 1999
2
+++ configure	Tue May  9 00:21:16 2000
2
+++ configure	Sat Jul  6 13:45:25 2002
3
@@ -2248,7 +2248,7 @@
4
 			mu_pnm_save_CPPFLAGS="$CPPFLAGS"
5
 			mu_pnm_save_LDFLAGS="$LDFLAGS"
6
 
7
-			LIBS="-lpbm $LIBS"
8
+			LIBS="-lnetpbm $LIBS"
9
 			CFLAGS="$X_CFLAGS $CFLAGS"
10
 			CPPFLAGS="$X_CFLAGS $CPPFLAGS"
11
 			LDFLAGS="$X_LDFLAGS $LDFLAGS"
12
@@ -2299,7 +2299,7 @@
13
 						/usr/lib/* \
14
 						/usr/local/lib/*; do
15
 					if test -d "$dir" \
16
-					&& test "`ls $dir/libpbm.* 2>/dev/null`" != ""; then
17
+					&& test "`ls $dir/libnetpbm.* 2>/dev/null`" != ""; then
18
 						mu_cv_pnm_libraries="$dir"
19
 						break
20
 					fi
3
@@ -2330,11 +2330,10 @@
21
@@ -2330,11 +2330,10 @@
4
 		X_CFLAGS="-I$pnm_includes $X_CFLAGS"
22
 		X_CFLAGS="-I$pnm_includes $X_CFLAGS"
5
 	fi
23
 	fi
Lines 13-15 Link Here
13
 	fi
31
 	fi
14
 
32
 
15
 	pnm_libraries_result="$pnm_libraries"
33
 	pnm_libraries_result="$pnm_libraries"
34
@@ -2358,14 +2357,14 @@
35
 LDFLAGS="$LDFLAGS $X_LIBS"
36
 
37
 PBM_LIBS=""
38
-echo $ac_n "checking for pbm_init in -lpbm""... $ac_c" 1>&6
39
-echo "configure:2363: checking for pbm_init in -lpbm" >&5
40
+echo $ac_n "checking for pbm_init in -lnetpbm""... $ac_c" 1>&6
41
+echo "configure:2363: checking for pbm_init in -lnetpbm" >&5
42
 ac_lib_var=`echo pbm'_'pbm_init | sed 'y%./+-%__p_%'`
43
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44
   echo $ac_n "(cached) $ac_c" 1>&6
45
 else
46
   ac_save_LIBS="$LIBS"
47
-LIBS="-lpbm  $LIBS"
48
+LIBS="-lnetpbm  $LIBS"
49
 cat > conftest.$ac_ext <<EOF
50
 #line 2371 "configure"
51
 #include "confdefs.h"
52
@@ -2393,66 +2392,19 @@
53
 fi
54
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
55
   echo "$ac_t""yes" 1>&6
56
-  PBM_LIBS="$PNM_LIBS -lpbm"
57
+  PBM_LIBS="$PNM_LIBS -lnetpbm"
58
 else
59
   echo "$ac_t""no" 1>&6
60
 fi
61
 
62
 if test "$PBM_LIBS" = ""; then
63
-{ echo "configure: error: The PBM library '-lpbm' could not be found.
64
+{ echo "configure: error: The PBM library '-lnetpbm' could not be found.
65
 		Please use the configure options '--with-pnm-includes=DIR'
66
 		and '--with-pnm-libraries=DIR' to specify the netpbm location.
67
 		See the 'config.log' file for further diagnostics." 1>&2; exit 1; }
68
 fi
69
 
70
 
71
-PGM_LIBS=""
72
-echo $ac_n "checking for pgm_init in -lpgm""... $ac_c" 1>&6
73
-echo "configure:2412: checking for pgm_init in -lpgm" >&5
74
-ac_lib_var=`echo pgm'_'pgm_init | sed 'y%./+-%__p_%'`
75
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
76
-  echo $ac_n "(cached) $ac_c" 1>&6
77
-else
78
-  ac_save_LIBS="$LIBS"
79
-LIBS="-lpgm $PNM_LIBS ${PBM_LIBS} $LIBS"
80
-cat > conftest.$ac_ext <<EOF
81
-#line 2420 "configure"
82
-#include "confdefs.h"
83
-/* Override any gcc2 internal prototype to avoid an error.  */
84
-/* We use char because int might match the return type of a gcc2
85
-    builtin and then its argument prototype would still apply.  */
86
-char pgm_init();
87
-
88
-int main() {
89
-pgm_init()
90
-; return 0; }
91
-EOF
92
-if { (eval echo configure:2431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
93
-  rm -rf conftest*
94
-  eval "ac_cv_lib_$ac_lib_var=yes"
95
-else
96
-  echo "configure: failed program was:" >&5
97
-  cat conftest.$ac_ext >&5
98
-  rm -rf conftest*
99
-  eval "ac_cv_lib_$ac_lib_var=no"
100
-fi
101
-rm -f conftest*
102
-LIBS="$ac_save_LIBS"
103
-
104
-fi
105
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
106
-  echo "$ac_t""yes" 1>&6
107
-  PGM_LIBS="$PNM_LIBS -lpgm"
108
-else
109
-  echo "$ac_t""no" 1>&6
110
-fi
111
-
112
-if test "$PGM_LIBS" = ""; then
113
-{ echo "configure: error: The PGM library '-lpgm' could not be found.
114
-		Please use the configure options '--with-pnm-includes=DIR'
115
-		and '--with-pnm-libraries=DIR' to specify the netpbm location.
116
-		See the 'config.log' file for further diagnostics." 1>&2; exit 1; }
117
-fi
118
 
119
 
120
 echo $ac_n "checking whether we need -DSYSV""... $ac_c" 1>&6

Return to bug 40253