[MINC-users] perllib patch try 2
Yasunari Tosa
tosa@nmr.mgh.harvard.edu
Mon Apr 12 09:53:04 2004
This is a multi-part message in MIME format.
--------------040803000103080507060205
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Hi, MNI people:
Sorry, I missed one more fix in configure. Attached is the patch for
N3-1.08.
(The previous patch did not pass configure on Perl.)
Here is the example.
Note that the location of the perllibdir is fixed when I installed
mni_perllib-0.07 and GetOpt by
perl Makefile.PL PREFIX=/usr/pubsw/packages/mni/1.2
on RedHat 9.0.
N3-1.08>patch -p1 < ../patch-N3-1.08.txt
patching file configure
patching file Makefile.in
patching file src/NUcorrect/field2imp.in
patching file src/NUcorrect/imp2field.in
patching file src/NUcorrect/make_template.in
patching file src/NUcorrect/nu_estimate.in
patching file src/NUcorrect/nu_estimate_np_and_em.in
patching file src/NUcorrect/nu_evaluate.in
patching file src/NUcorrect/resample_labels.in
patching file src/NUcorrect/sharpen_volume.in
N3-1.08> configure --prefix=/usr/pubsw/packages/mni/1.2
--perllibdir=/usr/pubsw/packages/mni/1.2/lib/perl5/site_perl/5.8.0
I hope that this is the final version of N3-patch ;-)
Tosa
--
Yasunari Tosa, Ph.D.
R&D Engineer email: tosa@nmr.mgh.harvard.edu
Mass. General Hospital NMR Center phone:
Building 149
13th Street fax :
Charlestown, MA 02129
--------------040803000103080507060205
Content-Type: text/plain;
name="patch-N3-1.08.txt"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline;
filename="patch-N3-1.08.txt"
*** N3-1.08/configure 2004-03-09 10:27:01.000000000 -0500
--- N3-1.08-tosa/configure 2004-04-12 09:03:38.000000000 -0400
***************
*** 271,277 ****
PACKAGE_STRING=3D
PACKAGE_BUGREPORT=3D
=20
! ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACK=
AGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_t=
ransform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir=
localstatedir libdir includedir oldincludedir infodir mandir build_alias=
host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM I=
NSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUT=
OMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRI=
P_PROGRAM AWK SET_MAKE am__leading_dot LN_S CC CFLAGS LDFLAGS CPPFLAGS ac=
_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE =
AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFL=
AGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB =
ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_ven=
dor host_os version time date user machine long_version F77 FFLAGS ac_ct_=
F77 FLIBS BLAS_LIBS LAPACK_LIBS PERL modeldir LIBOBJS LTLIBOBJS'
ac_subst_files=3D''
=20
# Initialize some variables set by options.
--- 271,277 ----
PACKAGE_STRING=3D
PACKAGE_BUGREPORT=3D
=20
! ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACK=
AGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_t=
ransform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir=
localstatedir libdir includedir oldincludedir infodir mandir build_alias=
host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM I=
NSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUT=
OMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRI=
P_PROGRAM AWK SET_MAKE am__leading_dot LN_S CC CFLAGS LDFLAGS CPPFLAGS ac=
_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE =
AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFL=
AGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB =
ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_ven=
dor host_os version time date user machine long_version F77 FFLAGS ac_ct_=
F77 FLIBS BLAS_LIBS LAPACK_LIBS PERL perllibdir modeldir LIBOBJS LTLIBOBJ=
S'
ac_subst_files=3D''
=20
# Initialize some variables set by options.
***************
*** 460,465 ****
--- 460,468 ----
| --oldin=3D* | --oldi=3D* | --old=3D* | --ol=3D* | --o=3D*)
oldincludedir=3D$ac_optarg ;;
=20
+ --perllibdir=3D* )
+ perllibdir=3D$ac_optarg;;
+=20
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
ac_prev=3Dprefix ;;
-prefix=3D* | --prefix=3D* | --prefi=3D* | --pref=3D* | --pre=3D* | -=
-pr=3D* | --p=3D*)
***************
*** 6451,6457 ****
=20
=20
if test -z "$modeldir"; then
! modeldir=3D`$PERL -e 'use MNI::DataDir; print MNI::DataDir::install_dir=
("N3");'`
fi
if test -z "$modeldir"; then
{ { echo "$as_me:$LINENO: error: \"Cannot determine model installation =
directory\"" >&5
--- 6454,6460 ----
=20
=20
if test -z "$modeldir"; then
! modeldir=3D`$PERL -e "use lib '$perllibdir'; use MNI::DataDir; print MN=
I::DataDir::install_dir('N3');"`
fi
if test -z "$modeldir"; then
{ { echo "$as_me:$LINENO: error: \"Cannot determine model installation =
directory\"" >&5
***************
*** 7176,7181 ****
--- 7179,7185 ----
s,@modeldir@,$modeldir,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+ s,@perllibdir@,$perllibdir,;t t
CEOF
=20
_ACEOF
*** N3-1.08/Makefile.in 2004-03-09 10:27:00.000000000 -0500
--- N3-1.08-tosa/Makefile.in 2004-04-12 08:53:38.000000000 -0400
***************
*** 82,87 ****
--- 82,88 ----
PACKAGE_VERSION =3D @PACKAGE_VERSION@
PATH_SEPARATOR =3D @PATH_SEPARATOR@
PERL =3D @PERL@
+ perllibdir=3D @perllibdir@
RANLIB =3D @RANLIB@
SET_MAKE =3D @SET_MAKE@
SHELL =3D @SHELL@
*** N3-1.08/src/NUcorrect/field2imp.in 2003-04-16 10:29:34.000000000 -040=
0
--- N3-1.08-tosa/src/NUcorrect/field2imp.in 2004-04-12 08:53:38.000000000=
-0400
***************
*** 1,4 ****
--- 1,5 ----
#!xPERLx -w
+ use lib "xINCDIRx";
#----------------------------------------------------------------------=
-----
#@COPYRIGHT :
# Copyright 1996, John G. Sled,=20
*** N3-1.08/src/NUcorrect/imp2field.in 2003-04-16 10:29:34.000000000 -040=
0
--- N3-1.08-tosa/src/NUcorrect/imp2field.in 2004-04-12 08:53:38.000000000=
-0400
***************
*** 1,4 ****
--- 1,5 ----
#!xPERLx -w
+ use lib "xINCDIRx";
#----------------------------------------------------------------------=
-----
#@COPYRIGHT :
# Copyright 1996, John G. Sled,=20
*** N3-1.08/src/NUcorrect/make_template.in 2004-02-05 11:01:12.000000000 =
-0500
--- N3-1.08-tosa/src/NUcorrect/make_template.in 2004-04-12 08:53:38.00000=
0000 -0400
***************
*** 1,4 ****
--- 1,5 ----
#!xPERLx -w
+ use lib "xINCDIRx";
#----------------------------------------------------------------------=
-----
#@COPYRIGHT :
# Copyright 1996, John G. Sled,=20
*** N3-1.08/src/NUcorrect/nu_estimate.in 2003-04-16 10:29:34.000000000 -0=
400
--- N3-1.08-tosa/src/NUcorrect/nu_estimate.in 2004-04-12 08:53:38.0000000=
00 -0400
***************
*** 1,4 ****
--- 1,5 ----
#!xPERLx -w
+ use lib "xINCDIRx";
#----------------------------------------------------------------------=
-----
#@COPYRIGHT :
# Copyright 1996, John G. Sled,=20
*** N3-1.08/src/NUcorrect/nu_estimate_np_and_em.in 2003-04-16 10:29:34.00=
0000000 -0400
--- N3-1.08-tosa/src/NUcorrect/nu_estimate_np_and_em.in 2004-04-12 08:53:=
38.000000000 -0400
***************
*** 1,4 ****
--- 1,5 ----
#!xPERLx -w
+ use lib "xINCDIRx";
#----------------------------------------------------------------------=
-----
#@COPYRIGHT :
# Copyright 1996, John G. Sled,=20
*** N3-1.08/src/NUcorrect/nu_evaluate.in 2003-05-29 13:14:24.000000000 -0=
400
--- N3-1.08-tosa/src/NUcorrect/nu_evaluate.in 2004-04-12 08:53:38.0000000=
00 -0400
***************
*** 1,4 ****
--- 1,5 ----
#!xPERLx -w
+ use lib "xINCDIRx";
#----------------------------------------------------------------------=
-----
#@COPYRIGHT :
# Copyright 1996, John G. Sled,=20
*** N3-1.08/src/NUcorrect/resample_labels.in 2003-04-16 10:29:34.00000000=
0 -0400
--- N3-1.08-tosa/src/NUcorrect/resample_labels.in 2004-04-12 08:53:38.000=
000000 -0400
***************
*** 1,4 ****
--- 1,5 ----
#!xPERLx
+ use lib "xINCDIRx";
=20
# ------------------------------ MNI Header ---------------------------=
-------
#@NAME : resample_labels
*** N3-1.08/src/NUcorrect/sharpen_volume.in 2003-04-16 10:29:34.000000000=
-0400
--- N3-1.08-tosa/src/NUcorrect/sharpen_volume.in 2004-04-12 08:53:38.0000=
00000 -0400
***************
*** 1,4 ****
--- 1,5 ----
#!xPERLx -w
+ use lib "xINCDIRx";
#----------------------------------------------------------------------=
-----
#@COPYRIGHT :
# Copyright 1996, John G. Sled,=20
--------------040803000103080507060205--