From: Michael Rasmussen Date: Wed, 23 Oct 2024 16:41:13 +0000 (+0200) Subject: start scanner X-Git-Url: http://git.datanom.net/lensdb.git/commitdiff_plain/50ae33599984f5b350902a434400976982f17a2d?ds=inline start scanner Signed-off-by: Michael Rasmussen --- diff --git a/Makefile.am b/Makefile.am index 325a4a9..420aa24 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,8 @@ AUTOMAKE_OPTIONS = gnu ACLOCAL_AMFLAGS = -I m4 SUBDIRS = \ - src + src \ + lib EXTRA_DIST = \ AUTHORS \ diff --git a/configure.ac b/configure.ac index 25112f7..4245496 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,6 @@ AC_CANONICAL_TARGET AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([gnu no-dist-gzip dist-bzip2 1.10]) -AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE CFLAGS="-Wall" @@ -32,14 +31,41 @@ AC_SUBST(GOBJECT_REQUIRED) AC_SUBST(GTK_REQUIRED) AC_SUBST(SQLITE3_REQUIRED) +AC_CONFIG_HEADERS(config.h) + # Checks for programs. AC_PROG_CC AC_PROG_CPP +AC_PROG_INSTALL +AC_PROG_LN_S +AC_PROG_MAKE_SET +AC_PROG_CPP LT_INIT if test -n "$lt_prog_compiler_pic"; then CFLAGS="$CFLAGS $lt_prog_compiler_pic" fi +AC_PROG_CXX +AC_PATH_PROG(REAL_CXX, $CXX) +HAVE_CXX=no +if test -n "$REAL_CXX"; then + HAVE_CXX=yes +fi + +AC_SYS_LARGEFILE + +enable_exif_scanner=yes +AC_MSG_CHECKING([whether to build EXIF scanner]) +if test x"$HAVE_CXX" = xno; then + AC_MSG_RESULT(no) + AC_MSG_ERROR("Auto read EXIF cannot be built; missing $dependencies_missing") + enable_exif_scanner=no +else + AC_MSG_RESULT(yes) +fi + +AM_CONDITIONAL(BUILD_EXIF_SCANNER, test x"$enable_exif_scanner" != xno) + PKG_PROG_PKG_CONFIG AC_LIB_PREFIX @@ -69,11 +95,14 @@ AC_CHECK_HEADER([assert.h], # Checks for library functions. AC_CONFIG_FILES([ - Makefile - src/Makefile + Makefile + src/Makefile + lib/Makefile ]) AC_OUTPUT +echo "" +echo "$PACKAGE $VERSION" echo " Configuration: @@ -81,3 +110,8 @@ Configuration: Compiler: ${CC} $($CC -dumpversion) CFLAGS: ${CFLAGS} " +echo "" +echo "The binary will be installed in $prefix/bin" +echo "" +echo "Configure finished, type 'make' to build." + diff --git a/lib/Makefile.am b/lib/Makefile.am new file mode 100644 index 0000000..bb28425 --- /dev/null +++ b/lib/Makefile.am @@ -0,0 +1,17 @@ +AUTOMAKE_OPTIONS = gnu + +IFLAGS = \ + -I${top_srcdir} \ + -I${top_builddir} + +if BUILD_EXIF_SCANNER +noinst_LIBRARIES = libscanner.a + +libscanner_a_SOURCES = \ + main.cpp + +libscanner_a_LIBADD = \ + $(LIBOBJS) \ + $(ALLOCA) + +endif diff --git a/lib/main.cpp b/lib/main.cpp new file mode 100644 index 0000000..ad1d704 --- /dev/null +++ b/lib/main.cpp @@ -0,0 +1,3 @@ + int main(int argc, char** argv) { + return 0; + }