xmedcon-link.patch

   1 --- xmedcon-0.10.2/source/Makefile.am.orig      2007-11-14 23:27:55.000000000 +0100
   2 +++ xmedcon-0.10.2/source/Makefile.am   2008-01-20 02:27:04.854377348 +0100
   3 @@ -92,7 +92,7 @@
   4  xmedcon_LDADD = $(APPICON_OBJ) libmdc.la
   5  xmedcon_LDFLAGS = -mwindows $(GDK_PIXBUF_LIBS) -lm
   6  else
   7 -xmedcon_LDADD =  libmdc.la
   8 +xmedcon_LDADD =  libmdc.la $(XMEDCON_GTK_LIBS)
   9  xmedcon_LDFLAGS = $(GDK_PIXBUF_LIBS) -lm
  10  endif
  11
  12 @@ -213,7 +213,7 @@
  13  libmdc_la_LIBADD = $(ENABLED_FRMTS_OBJS) \
  14                     $(DICM_LIB) $(LJPG_LIB) \
  15                     $(ZLIB_LIB) $(PNG_LIB) $(NIFTI_LIB) \
  16 -                   $(TPC_LIB) $(XMEDCON_GLIB_LIBS) $(XMEDCON_GTK_LIBS)
  17 +                   $(TPC_LIB) $(XMEDCON_GLIB_LIBS)
  18  libmdc_la_DEPENDENCIES = $(ENABLED_FRMTS_OBJS)
  19  EXTRA_libmdc_la_SOURCES = $(ALL_FRMTS_SOURCES)
  20
  21 --- xmedcon-0.10.2/configure.in.orig    2007-12-03 22:16:56.000000000 +0100
  22 +++ xmedcon-0.10.2/configure.in 2008-01-20 13:30:40.735355096 +0100
  23 @@ -530,16 +530,21 @@
  24     [  --with-nifti-prefix=PFX   Prefix where NIFTI library is installed (optional)]
  25   , nifti_prefix="$withval", nifti_prefix="")
  26  if test x"$nifti_prefix" != "x"; then
  27 -    ZNZ_LDFLAGS="-L$nifti_prefix/lib -lznz"
  28 -    NIFTI_LDFLAGS="-L$nifti_prefix/lib -lniftiio $ZNZ_LDFLAGS"
  29 +    if test "$nifti_prefix" != "/usr"; then
  30 +       nifti_lib="-L$nifti_prefix/lib"
  31 +    else
  32 +       nifti_lib=
  33 +    fi
  34 +    ZNZ_LDFLAGS="$nifti_lib -lznz"
  35 +    NIFTI_LDFLAGS="$nifti_lib -lniftiio $ZNZ_LDFLAGS"
  36      NIFTI_CFLAGS=""
  37      AC_CHECK_FILE($nifti_prefix/include/nifti/nifti1_io.h,NIFTI_CFLAGS="-I$nifti_prefix/include/nifti",NIFTI_CFLAGS="-I$nifti_prefix/include")
  38      LDFLAGS="$LDFLAGS -lm $NIFTI_LDFLAGS $ZLIB_LDFLAGS"
  39      CPPFLAGS="$CPPFLAGS $NIFTI_CFLAGS $ZLIB_LDFLAGS"
  40  else
  41 -    ZNZ_LDFLAGS="-L../libs/nifti -lznz"
  42 -    NIFTI_LDFLAGS="-L../libs/nifti -lniftiio $ZNZ_LDFLAGS"
  43 -    NIFTI_CFLAGS="-I../libs/nifti"
  44 +    ZNZ_LDFLAGS="\$(top_builddir)/libs/nifti/libznz.la"
  45 +    NIFTI_LDFLAGS="\$(top_builddir)/libs/nifti/libniftiio.la $ZNZ_LDFLAGS"
  46 +    NIFTI_CFLAGS="-I\$(top_srcdir)/libs/nifti"
  47  fi
  48
  49  dnl Check for installed libniftiio