diff options
Diffstat (limited to 'print/lyx/patches/patch-aa')
-rw-r--r-- | print/lyx/patches/patch-aa | 53 |
1 files changed, 35 insertions, 18 deletions
diff --git a/print/lyx/patches/patch-aa b/print/lyx/patches/patch-aa index fad0002e169..e5545847206 100644 --- a/print/lyx/patches/patch-aa +++ b/print/lyx/patches/patch-aa @@ -1,31 +1,48 @@ -$NetBSD: patch-aa,v 1.8 2002/04/18 23:55:27 fredb Exp $ +$NetBSD: patch-aa,v 1.9 2002/05/29 07:36:31 martti Exp $ ---- configure.orig Fri Aug 3 07:21:35 2001 -+++ configure -@@ -8175,7 +8175,7 @@ +--- configure.orig Fri May 3 22:53:34 2002 ++++ configure Tue May 21 12:15:00 2002 +@@ -9743,7 +9743,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" --LIBS="-lforms $LYX_LIBS $LIBS" -+LIBS="-lforms -ljpeg -lXpm $LYX_LIBS $LIBS" +-LIBS="-lforms $LIBS" ++LIBS="-lforms -ljpeg -lXpm $LIBS" cat > conftest.$ac_ext <<EOF - #line 8181 "configure" + #line 9749 "configure" #include "confdefs.h" -@@ -8206,7 +8206,7 @@ +@@ -9774,7 +9774,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 -- LYX_LIBS="-lforms $LYX_LIBS" -+ LYX_LIBS="-lforms -ljpeg -lXpm $LYX_LIBS" +- XFORMS_LIB="-lforms" ++ XFORMS_LIB="-lforms -ljpeg -lXpm" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for fl_initialize in -lxforms""... $ac_c" 1>&6 -@@ -9764,7 +9764,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share +@@ -9954,6 +9954,7 @@ + " + lyx_warning=yes ;; + 0.89*) ;; ++ 0.9*) ;; + *) + lyx_warning_txt="$lyx_warning_txt + == Version $lyx_cv_xfversion of xforms might not be compatible with LyX, +@@ -10159,7 +10160,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lforms $LIBS" ++LIBS="-lforms -ljpeg -lXpm $LIBS" + cat > conftest.$ac_ext <<EOF + #line 10165 "configure" + #include "confdefs.h" +@@ -10190,7 +10191,7 @@ fi - rm -f conftest* - INSTOBJEXT=.mo + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- XFORMS_LIB="-lforms" ++ XFORMS_LIB="-lforms -ljpeg -lXpm" + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for fl_initialize in -lxforms""... $ac_c" 1>&6 |