--CE+1k2dSO48ffgeK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline
I've attached my proposed changes for acinclude.m4 and configure.in -- Pete On Sat, Sep 08, 2001 at 03:48:37PM +0200, Oliver Rauch wrote: > Peter Fales wrote: > > > I need to make some changes to acinclude.m4, configure.in, Makefile.in, > > etc. to support the gphoto2 backend. Is it correct for me to rebuild > > the generated files like aclocal.m4, configure, Makefile, etc. and > > commit those changes to CVS? > > Hi Peter, > > you should commit aclocal.m4 and the new generated configure file. > The Makfiles should not be committed (they are generated by configure). > > Please take care while doing any changes in the configuration > files like acloacl.m4, configure.in etc because this can > break compilation on some systems very easy. If you are not > sure if your changes do not make any problems please post > the changes to the list before you commit them to the CVS > so some people can take a look at it at first. > > Bye > Oliver > > -- > Homepage: http://www.rauch-domain.de > sane-umax: http://www.rauch-domain.de/sane-umax > xsane: http://www.xsane.org > E-Mail: mailto:[email protected] > _______________________________________________ > Sane-devel mailing list > [email protected] > http://www.mostang.com/mailman/listinfo/sane-devel --CE+1k2dSO48ffgeK Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="acinclude.m4.patch" --- acinclude.m4 Sat Sep 8 11:38:57 2001 +++ acinclude.m4.new Fri Sep 7 22:28:28 2001 @@ -94,7 +94,8 @@ ]) # -# Checks for jpeg library >= v6B (61), needed for DC210 and DC240 backends. +# Checks for jpeg library >= v6B (61), needed for DC210, DC240, and +# GPHOTO2 backends. AC_DEFUN(SANE_CHECK_JPEG, [ AC_CHECK_LIB(jpeg,jpeg_start_decompress, @@ -186,3 +187,11 @@ AC_CHECK_TYPE(u_int, unsigned int) AC_CHECK_TYPE(u_long, unsigned long) ]) + +# +# Checks for gphoto2 - needed by the gphoto2 backend. +AC_DEFUN(SANE_CHECK_GPHOTO2, +[ + AC_CHECK_TOOL(GPHOTO2, gphoto2, false) +]) + --CE+1k2dSO48ffgeK Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="configure.in.patch" --- configure.in Sat Sep 8 11:38:59 2001 +++ configure.in.new Thu Sep 6 22:06:49 2001 @@ -170,6 +170,8 @@ SANE_CHECK_JPEG +SANE_CHECK_GPHOTO2 + dnl IRIX sometimes has SYSVR3/4 network DSOs, but we do not need or want dnl to use them! if test "`uname`" != "IRIX" -a "`uname`" != "IRIX64"; then @@ -219,6 +221,18 @@ AC_SUBST(DC210) AC_SUBST(DC240) AC_SUBST(DJPEG) + + +if test "${ac_cv_prog_GPHOTO2}" = "false" \ + -o "${sane_cv_use_libjpeg}" != "yes"; then + echo "disabling GPHOTO2 backend (failed to find gphoto2 or JPEG lib)" + GPHOTO2= +else + echo "enabling GPHOTO2 backend" + GPHOTO2=gphoto2 +fi +AC_SUBST(GPHOTO2) + if test "${ac_cv_header_sys_scanio_h}" = "no"; then echo "disabling PINT backend" PINT= --CE+1k2dSO48ffgeK--
