[UFRaw-CVS] ufraw Makefile.am,1.35,1.36 configure.ac,1.68,1.69

[Niels K. B. J. <nk...@us...>]

Update of /cvsroot/ufraw/ufraw
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv17439

Modified Files:
	Makefile.am configure.ac 
Log Message:
Fix CinePaint plug-in installation.

Index: configure.ac
===================================================================
RCS file: /cvsroot/ufraw/ufraw/configure.ac,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** configure.ac	22 Mar 2007 16:20:42 -0000	1.68
--- configure.ac	23 Mar 2007 14:10:22 -0000	1.69
***************
*** 76,80 ****
      GIMP_LIBDIR=`$pkg_prefix --variable=gimplibdir gimp-2.0` ],
    [ have_gimp=no
!     GIMP_LIBIR=
      AC_MSG_RESULT($GIMP_PKG_ERRORS) ] )
  AM_CONDITIONAL(MAKE_GIMP, test $have_gimp = yes)
--- 76,80 ----
      GIMP_LIBDIR=`$pkg_prefix --variable=gimplibdir gimp-2.0` ],
    [ have_gimp=no
!     GIMP_LIBDIR=
      AC_MSG_RESULT($GIMP_PKG_ERRORS) ] )
  AM_CONDITIONAL(MAKE_GIMP, test $have_gimp = yes)
***************
*** 83,87 ****
  AC_SUBST(GIMP_LIBDIR)
  
! PKG_CHECK_MODULES(CINEPAINT, cinepaint-gtk >= 0.21,
    [ have_cinepaint=yes
      CINEPAINT_LIBDIR=`$pkg_prefix --variable=libdir cinepaint-gtk`
--- 83,87 ----
  AC_SUBST(GIMP_LIBDIR)
  
! PKG_CHECK_MODULES(CINEPAINT, cinepaint-gtk >= 0.22,
    [ have_cinepaint=yes
      CINEPAINT_LIBDIR=`$pkg_prefix --variable=libdir cinepaint-gtk`
***************
*** 89,94 ****
    [ have_cinepaint=no
      CINEPAINT_LIBDIR=
!     AC_MSG_RESULT($CINEPAINT_PKG_ERRORS) ] )
  AM_CONDITIONAL(MAKE_CINEPAINT, test $have_cinepaint = yes)
  AC_SUBST(CINEPAINT_CFLAGS)
  AC_SUBST(CINEPAINT_LIBS)
--- 89,105 ----
    [ have_cinepaint=no
      CINEPAINT_LIBDIR=
!     CINEPAINT_PROGRAMPLUGINDIR= ] )
  AM_CONDITIONAL(MAKE_CINEPAINT, test $have_cinepaint = yes)
+ if test $have_cinepaint = no; then
+   PKG_CHECK_MODULES(CINEPAINT, cinepaint-gtk >= 0.21,
+     [ have_cinepaint_021=yes
+       CINEPAINT_LIBDIR=`$pkg_prefix --variable=libdir cinepaint-gtk`
+       CINEPAINT_PROGRAMPLUGINDIR= ],
+     [ have_cinepaint_021=no
+       CINEPAINT_LIBDIR=
+       CINEPAINT_PROGRAMPLUGINDIR=
+       AC_MSG_RESULT($CINEPAINT_PKG_ERRORS) ] )
+ fi
+ AM_CONDITIONAL(MAKE_CINEPAINT_021, test $have_cinepaint_021 = yes)
  AC_SUBST(CINEPAINT_CFLAGS)
  AC_SUBST(CINEPAINT_LIBS)
***************
*** 221,225 ****
  AC_MSG_NOTICE(====================== summary =====================)
  AC_MSG_NOTICE(build GIMP plug-in: $have_gimp)
! AC_MSG_NOTICE(build CinePaint plug-in: $have_cinepaint)
  AC_MSG_NOTICE(EXIF support using exiv2: $have_exiv2)
  AC_MSG_NOTICE(JPEG support: $have_jpeg)
--- 232,240 ----
  AC_MSG_NOTICE(====================== summary =====================)
  AC_MSG_NOTICE(build GIMP plug-in: $have_gimp)
! if test $have_cinepaint = yes; then
!   AC_MSG_NOTICE(build CinePaint plug-in: $have_cinepaint)
! else
!   AC_MSG_NOTICE(build CinePaint plug-in: $have_cinepaint_021)
! fi
  AC_MSG_NOTICE(EXIF support using exiv2: $have_exiv2)
  AC_MSG_NOTICE(JPEG support: $have_jpeg)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/ufraw/ufraw/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Makefile.am	22 Mar 2007 16:13:23 -0000	1.35
--- Makefile.am	23 Mar 2007 14:10:19 -0000	1.36
***************
*** 19,22 ****
--- 19,27 ----
  endif
  
+ if MAKE_CINEPAINT_021
+   cinepaintbin_PROGRAMS = cinepaint-ufraw
+   cinepaintbindir = $(CINEPAINT_LIBDIR)/cinepaint/`cinepainttool --version`/plug-ins
+ endif
+ 
  POD2MAN= @POD2MAN@
  man_MANS = ufraw.1
***************
*** 81,84 ****
--- 86,96 ----
  endif
  
+ if MAKE_CINEPAINT_021
+   cinepaint_ufraw_SOURCES = ufraw-gimp.c
+   cinepaint_ufraw_CPPFLAGS = $(AM_CPPFLAGS) $(CINEPAINT_CFLAGS) \
+ 				-DUFRAW_CINEPAINT
+   cinepaint_ufraw_LDADD = $(LDADD) $(CINEPAINT_LIBS) $(GTK_LIBS)
+ endif
+ 
  if MAKE_EXTRAS
    dcraw_SOURCES = dcraw.cc