diff options
Diffstat (limited to 'palm/imgvtopgm/files/patch-aa')
| -rw-r--r-- | palm/imgvtopgm/files/patch-aa | 109 |
1 files changed, 107 insertions, 2 deletions
diff --git a/palm/imgvtopgm/files/patch-aa b/palm/imgvtopgm/files/patch-aa index b9d8d5208a12..24d9d860783d 100644 --- a/palm/imgvtopgm/files/patch-aa +++ b/palm/imgvtopgm/files/patch-aa @@ -1,5 +1,23 @@ ---- configure- Tue May 9 00:19:53 2000 -+++ configure Tue May 9 00:21:16 2000 +--- configure.orig Thu May 13 01:54:50 1999 ++++ configure Sat Jul 6 13:45:25 2002 +@@ -2248,7 +2248,7 @@ + mu_pnm_save_CPPFLAGS="$CPPFLAGS" + mu_pnm_save_LDFLAGS="$LDFLAGS" + +- LIBS="-lpbm $LIBS" ++ LIBS="-lnetpbm $LIBS" + CFLAGS="$X_CFLAGS $CFLAGS" + CPPFLAGS="$X_CFLAGS $CPPFLAGS" + LDFLAGS="$X_LDFLAGS $LDFLAGS" +@@ -2299,7 +2299,7 @@ + /usr/lib/* \ + /usr/local/lib/*; do + if test -d "$dir" \ +- && test "`ls $dir/libpbm.* 2>/dev/null`" != ""; then ++ && test "`ls $dir/libnetpbm.* 2>/dev/null`" != ""; then + mu_cv_pnm_libraries="$dir" + break + fi @@ -2330,11 +2330,10 @@ X_CFLAGS="-I$pnm_includes $X_CFLAGS" fi @@ -13,3 +31,90 @@ fi pnm_libraries_result="$pnm_libraries" +@@ -2358,14 +2357,14 @@ + LDFLAGS="$LDFLAGS $X_LIBS" + + PBM_LIBS="" +-echo $ac_n "checking for pbm_init in -lpbm""... $ac_c" 1>&6 +-echo "configure:2363: checking for pbm_init in -lpbm" >&5 ++echo $ac_n "checking for pbm_init in -lnetpbm""... $ac_c" 1>&6 ++echo "configure:2363: checking for pbm_init in -lnetpbm" >&5 + ac_lib_var=`echo pbm'_'pbm_init | 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="-lpbm $LIBS" ++LIBS="-lnetpbm $LIBS" + cat > conftest.$ac_ext <<EOF + #line 2371 "configure" + #include "confdefs.h" +@@ -2393,66 +2392,19 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- PBM_LIBS="$PNM_LIBS -lpbm" ++ PBM_LIBS="$PNM_LIBS -lnetpbm" + else + echo "$ac_t""no" 1>&6 + fi + + if test "$PBM_LIBS" = ""; then +-{ echo "configure: error: The PBM library '-lpbm' could not be found. ++{ echo "configure: error: The PBM library '-lnetpbm' could not be found. + Please use the configure options '--with-pnm-includes=DIR' + and '--with-pnm-libraries=DIR' to specify the netpbm location. + See the 'config.log' file for further diagnostics." 1>&2; exit 1; } + fi + + +-PGM_LIBS="" +-echo $ac_n "checking for pgm_init in -lpgm""... $ac_c" 1>&6 +-echo "configure:2412: checking for pgm_init in -lpgm" >&5 +-ac_lib_var=`echo pgm'_'pgm_init | 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="-lpgm $PNM_LIBS ${PBM_LIBS} $LIBS" +-cat > conftest.$ac_ext <<EOF +-#line 2420 "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 pgm_init(); +- +-int main() { +-pgm_init() +-; return 0; } +-EOF +-if { (eval echo configure:2431: \"$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 +- PGM_LIBS="$PNM_LIBS -lpgm" +-else +- echo "$ac_t""no" 1>&6 +-fi +- +-if test "$PGM_LIBS" = ""; then +-{ echo "configure: error: The PGM library '-lpgm' could not be found. +- Please use the configure options '--with-pnm-includes=DIR' +- and '--with-pnm-libraries=DIR' to specify the netpbm location. +- See the 'config.log' file for further diagnostics." 1>&2; exit 1; } +-fi + + + echo $ac_n "checking whether we need -DSYSV""... $ac_c" 1>&6 |