Commit 2bb5ed65 authored by Olaf Meeuwissen's avatar Olaf Meeuwissen

Merge branch 'genesys-enable-cxx' into 'master'

Use C++ for the genesys backend

See merge request !61
parents 2a116229 185303a1
Pipeline #62145151 failed with stages
in 9 minutes and 10 seconds
......@@ -265,6 +265,10 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -290,6 +294,7 @@ GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GS = @GS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_GPHOTO2 = @HAVE_GPHOTO2@
IEEE1284_LIBS = @IEEE1284_LIBS@
INSTALL = @INSTALL@
......@@ -386,6 +391,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
......
......@@ -26,14 +26,15 @@ dnl
AC_DEFUN([SANE_SET_AM_CFLAGS],
[
if test "${ac_cv_c_compiler_gnu}" = "yes"; then
DEFAULT_CFLAGS="\
DEFAULT_WARNINGS="\
-Wall"
EXTRA_WARNINGS="\
-Wextra \
-pedantic"
for flag in $DEFAULT_CFLAGS; do
for flag in $DEFAULT_WARNINGS; do
JAPHAR_GREP_AM_CFLAGS($flag, [ AM_CFLAGS="$AM_CFLAGS $flag" ])
JAPHAR_GREP_AM_CXXFLAGS($flag, [ AM_CXXFLAGS="$AM_CXXFLAGS $flag" ])
done
AC_ARG_ENABLE(warnings,
......@@ -43,6 +44,7 @@ if test "${ac_cv_c_compiler_gnu}" = "yes"; then
if eval "test x$enable_warnings = xyes"; then
for flag in $EXTRA_WARNINGS; do
JAPHAR_GREP_AM_CFLAGS($flag, [ AM_CFLAGS="$AM_CFLAGS $flag" ])
JAPHAR_GREP_AM_CXXFLAGS($flag, [ AM_CXXFLAGS="$AM_CXXFLAGS $flag" ])
done
fi
],
......@@ -50,11 +52,23 @@ if test "${ac_cv_c_compiler_gnu}" = "yes"; then
# Warnings enabled by default (development)
for flag in $EXTRA_WARNINGS; do
JAPHAR_GREP_AM_CFLAGS($flag, [ AM_CFLAGS="$AM_CFLAGS $flag" ])
JAPHAR_GREP_AM_CXXFLAGS($flag, [ AM_CXXFLAGS="$AM_CXXFLAGS $flag" ])
done
fi])
fi # ac_cv_c_compiler_gnu
])
# SANE_SET_AM_CXXFLAGS()
# Set default AM_CXXFLAGS.
AC_DEFUN([SANE_SET_AM_CXXFLAGS],
[
AX_CXX_COMPILE_STDCXX_11([noext], [optional])
if test "${ac_cv_cxx_compiler_gnu}" = "yes" -a "${ax_cv_cxx_compile_cxx11}" = "yes"; then
AM_CXXFLAGS="$AM_CXXFLAGS -std=c++11"
fi # ac_cv_cxx_compiler_gnu
])
dnl SANE_CHECK_MISSING_HEADERS
dnl Do some sanity checks. It doesn't make sense to proceed if those headers
dnl aren't present.
......@@ -393,6 +407,20 @@ AC_DEFUN([JAPHAR_GREP_AM_CFLAGS],
esac
])
dnl
dnl JAPHAR_GREP_AM_CXXFLAGS(flag, cmd_if_missing, cmd_if_present)
dnl
AC_DEFUN([JAPHAR_GREP_AM_CXXFLAGS],
[case "$AM_CXXFLAGS" in
"$1" | "$1 "* | *" $1" | *" $1 "* )
ifelse($#, 3, [$3], [:])
;;
*)
$2
;;
esac
])
dnl
dnl SANE_CHECK_U_TYPES
dnl
......@@ -566,6 +594,13 @@ for be in ${BACKENDS}; do
fi
;;
genesys)
if test "${ax_cv_cxx_compile_cxx11}" != "yes"; then
echo "*** $be backend requires C++11 support - $DISABLE_MSG"
backend_supported="no"
fi
;;
mustek_pp)
if test "${sane_cv_use_libieee1284}" != "yes" && test "${enable_parport_directio}" != "yes"; then
echo "*** $be backend requires libieee1284 or parport-directio libraries - $DISABLE_MSG"
......
This diff is collapsed.
......@@ -29,6 +29,10 @@ EXTRA_DIST += stubs.c
$(AM_V_at)rm -f $@
$(AM_V_at)$(LN_S) $(srcdir)/stubs.c $@
%-s.cc: $(srcdir)/stubs.c
$(AM_V_at)rm -f $@
$(AM_V_at)$(LN_S) $(srcdir)/stubs.c $@
dll-preload.h:
$(AM_V_at)rm -f $@
$(AM_V_at)list="$(PRELOADABLE_BACKENDS)"; for be in $$list; do \
......@@ -476,16 +480,16 @@ libsane_fujitsu_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_fujitsu_la_LIBADD = $(COMMON_LIBS) libfujitsu.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_magic.lo $(MATH_LIB) $(SCSI_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
EXTRA_DIST += fujitsu.conf.in
libgenesys_la_SOURCES = genesys.c genesys.h genesys_gl646.c genesys_gl646.h genesys_gl841.c genesys_gl841.h genesys_gl843.c genesys_gl843.h genesys_gl846.c genesys_gl846.h genesys_gl847.c genesys_gl847.h genesys_gl124.c genesys_gl124.h genesys_low.c genesys_low.h
libgenesys_la_SOURCES = genesys.cc genesys.h genesys_gl646.cc genesys_gl646.h genesys_gl841.cc genesys_gl841.h genesys_gl843.cc genesys_gl843.h genesys_gl846.cc genesys_gl846.h genesys_gl847.cc genesys_gl847.h genesys_gl124.cc genesys_gl124.h genesys_low.cc genesys_low.h
libgenesys_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=genesys
nodist_libsane_genesys_la_SOURCES = genesys-s.c
nodist_libsane_genesys_la_SOURCES = genesys-s.cc
libsane_genesys_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=genesys
libsane_genesys_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_genesys_la_LIBADD = $(COMMON_LIBS) libgenesys.la ../sanei/sanei_magic.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo $(MATH_LIB) $(USB_LIBS) $(RESMGR_LIBS)
EXTRA_DIST += genesys.conf.in
# TODO: Why are this distributed but not compiled?
EXTRA_DIST += genesys_conv.c genesys_conv_hlp.c genesys_devices.c
EXTRA_DIST += genesys_conv.cc genesys_conv_hlp.cc genesys_devices.cc
libgphoto2_i_la_SOURCES = gphoto2.c gphoto2.h
libgphoto2_i_la_CPPFLAGS = $(AM_CPPFLAGS) $(GPHOTO2_CPPFLAGS) -DBACKEND_NAME=gphoto2
......
This diff is collapsed.
......@@ -63,7 +63,7 @@
#include "genesys.h"
#include "../include/sane/sanei_config.h"
#include "../include/sane/sanei_magic.h"
#include "genesys_devices.c"
#include "genesys_devices.cc"
static SANE_Int num_devices = 0;
static Genesys_Device *first_dev = 0;
......@@ -4108,7 +4108,7 @@ sanei_genesys_buffer_consume (Genesys_Buffer * buf, size_t size)
}
#include "genesys_conv.c"
#include "genesys_conv.cc"
static SANE_Status accurate_line_read(Genesys_Device * dev,
SANE_Byte *buffer,
......
......@@ -54,7 +54,7 @@
#define FUNC_NAME(f) f ## _8
#include "genesys_conv_hlp.c"
#include "genesys_conv_hlp.cc"
#undef FUNC_NAME
......@@ -69,7 +69,7 @@
#define FUNC_NAME(f) f ## _16
#include "genesys_conv_hlp.c"
#include "genesys_conv_hlp.cc"
#undef FUNC_NAME
......
......@@ -5,6 +5,10 @@
/* Now define the wrappers (we could use aliases here, but go for
robustness for now...: */
#ifdef __cplusplus
extern "C" {
#endif
SANE_Status
sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
{
......@@ -83,3 +87,7 @@ sane_exit (void)
{
ENTRY(exit) ();
}
#ifdef __cplusplus
} // extern "C"
#endif
This diff is collapsed.
......@@ -40,6 +40,7 @@ dnl ******************************************************************
dnl Set up the compiler and linker
dnl ******************************************************************
AC_PROG_CC
AC_PROG_CXX
AM_PROG_CC_C_O
sane_save_CC=$CC
AC_PROG_CC_C99 dnl enables extensions to ISO C99 :-(
......@@ -80,6 +81,7 @@ dnl ***********************************************************************
dnl set compiler/linker flags
dnl ***********************************************************************
SANE_SET_AM_CFLAGS([$is_release])
SANE_SET_AM_CXXFLAGS
SANE_SET_AM_LDFLAGS
dnl ***********************************************************************
......
......@@ -195,6 +195,10 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -220,6 +224,7 @@ GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GS = @GS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_GPHOTO2 = @HAVE_GPHOTO2@
IEEE1284_LIBS = @IEEE1284_LIBS@
INSTALL = @INSTALL@
......@@ -316,6 +321,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
......
......@@ -225,6 +225,10 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -250,6 +254,7 @@ GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GS = @GS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_GPHOTO2 = @HAVE_GPHOTO2@
IEEE1284_LIBS = @IEEE1284_LIBS@
INSTALL = @INSTALL@
......@@ -346,6 +351,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
......
......@@ -201,6 +201,10 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -226,6 +230,7 @@ GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GS = @GS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_GPHOTO2 = @HAVE_GPHOTO2@
IEEE1284_LIBS = @IEEE1284_LIBS@
INSTALL = @INSTALL@
......@@ -322,6 +327,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
......
......@@ -70,6 +70,9 @@
the CoreFoundation framework. */
#undef HAVE_CFPREFERENCESCOPYAPPVALUE
/* define if the compiler supports basic C++11 syntax */
#undef HAVE_CXX11
/* Define if the GNU dcgettext() function is already present or preinstalled.
*/
#undef HAVE_DCGETTEXT
......
......@@ -89,6 +89,10 @@
#include <sane/sane.h>
#ifdef __cplusplus
extern "C" {
#endif
/** @name Public macros and functions
* @{
*/
......@@ -167,5 +171,8 @@ extern SANE_Status sanei_check_value (const SANE_Option_Descriptor * opt,
extern SANE_Status sanei_constrain_value (const SANE_Option_Descriptor * opt,
void * value, SANE_Word * info);
#ifdef __cplusplus
} // extern "C"
#endif
#endif /* sanei_h */
......@@ -113,6 +113,10 @@
/** @name Declaration of entry points:
* @{
*/
#ifdef __cplusplus
extern "C" {
#endif
extern SANE_Status ENTRY(init) (SANE_Int *, SANE_Auth_Callback);
extern SANE_Status ENTRY(get_devices) (const SANE_Device ***, SANE_Bool);
extern SANE_Status ENTRY(open) (SANE_String_Const, SANE_Handle *);
......@@ -130,6 +134,10 @@ extern void ENTRY(cancel) (SANE_Handle);
extern void ENTRY(close) (SANE_Handle);
extern void ENTRY(exit) (void);
#ifdef __cplusplus
} // extern "C"
#endif
#ifndef STUBS
/* Now redirect sane_* calls to backend's functions: */
......
......@@ -52,6 +52,10 @@
#include <stdio.h>
#include <sane/sane.h>
#ifdef __cplusplus
extern "C" {
#endif
/** Search configuration file \a name along directory list and return file
* pointer if such a file exists.
*
......@@ -172,4 +176,8 @@ extern SANE_Status sanei_configure_attach (
*/
extern const char *sanei_config_get_paths (void);
#ifdef __cplusplus
} // extern "C"
#endif
#endif /* sanei_config_h */
......@@ -9,6 +9,10 @@
#include <sane/sanei.h>
#ifdef __cplusplus
extern "C" {
#endif
/** @name Public macros
* These macros can be used in backends and other SANE-related
* code.
......@@ -150,4 +154,8 @@ extern void sanei_init_debug (const char * backend, int * debug_level_var);
#endif /* NDEBUG */
#ifdef __cplusplus
} // extern "C"
#endif
#endif /* _SANEI_DEBUG_H */
......@@ -57,6 +57,10 @@
#ifndef SANEI_MAGIC_H
#define SANEI_MAGIC_H
#ifdef __cplusplus
extern "C" {
#endif
/** Initialize sanei_magic.
*
* Call this before any other sanei_magic function.
......@@ -219,4 +223,8 @@ extern SANE_Status
sanei_magic_turn(SANE_Parameters * params, SANE_Byte * buffer,
int angle);
#ifdef __cplusplus
} // extern "C"
#endif
#endif /* SANEI_MAGIC_H */
......@@ -68,6 +68,10 @@
#include <stdlib.h> /* for size_t */
#ifdef __cplusplus
extern "C" {
#endif
/* USB spec defines */
#ifndef USB_CLASS_PER_INTERFACE
/* Also defined in libusb */
......@@ -521,5 +525,9 @@ sanei_usb_set_altinterface (SANE_Int dn, SANE_Int alternate);
extern SANE_Status
sanei_usb_get_descriptor( SANE_Int dn, struct sanei_usb_dev_descriptor *desc );
#ifdef __cplusplus
} // extern "C"
#endif
/*------------------------------------------------------*/
#endif /* sanei_usb_h */
......@@ -245,6 +245,10 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -270,6 +274,7 @@ GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GS = @GS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_GPHOTO2 = @HAVE_GPHOTO2@
IEEE1284_LIBS = @IEEE1284_LIBS@
INSTALL = @INSTALL@
......@@ -366,6 +371,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
......
......@@ -206,6 +206,10 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -231,6 +235,7 @@ GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GS = @GS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_GPHOTO2 = @HAVE_GPHOTO2@
IEEE1284_LIBS = @IEEE1284_LIBS@
INSTALL = @INSTALL@
......@@ -327,6 +332,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
......
......@@ -28,7 +28,7 @@ backend/epson2.h
backend/fujitsu.c
backend/fujitsu.h
backend/genesys.c
backend/genesys.cc
backend/gt68xx.c
backend/gt68xx_low.h
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -218,6 +218,10 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -243,6 +247,7 @@ GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GS = @GS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_GPHOTO2 = @HAVE_GPHOTO2@
IEEE1284_LIBS = @IEEE1284_LIBS@
INSTALL = @INSTALL@
......@@ -339,6 +344,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
......
......@@ -213,6 +213,10 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -238,6 +242,7 @@ GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GS = @GS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_GPHOTO2 = @HAVE_GPHOTO2@
IEEE1284_LIBS = @IEEE1284_LIBS@
INSTALL = @INSTALL@
......@@ -334,6 +339,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
......
......@@ -429,6 +429,10 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -454,6 +458,7 @@ GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GS = @GS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_GPHOTO2 = @HAVE_GPHOTO2@
IEEE1284_LIBS = @IEEE1284_LIBS@
INSTALL = @INSTALL@
......@@ -550,6 +555,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
......
......@@ -153,6 +153,10 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -178,6 +182,7 @@ GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GS = @GS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_GPHOTO2 = @HAVE_GPHOTO2@
IEEE1284_LIBS = @IEEE1284_LIBS@
INSTALL = @INSTALL@
......@@ -274,6 +279,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
......
......@@ -264,6 +264,10 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -289,6 +293,7 @@ GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
GPHOTO2_LIBS = @GPHOTO2_LIBS@
GREP = @GREP@
GS = @GS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_GPHOTO2 = @HAVE_GPHOTO2@
IEEE1284_LIBS = @IEEE1284_LIBS@
INSTALL = @INSTALL@
......@@ -385,6 +390,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment