Add debugging checkpoints

3 files changed, 84 insertions, 2 deletions

diff --git a/gphoto-m4/gp-check-library.m4 b/gphoto-m4/gp-check-library.m4
index 2737d8d20..a25915e2a 100644
--- a/gphoto-m4/gp-check-library.m4
+++ b/gphoto-m4/gp-check-library.m4
@@ -134,6 +134,8 @@ if test "x${[$1][_LIBS]}" = "x" && test "x${[$1][_CFLAGS]}" = "x"; then
 	fi
 	if test "x${[try_][$1]}" = "xauto"; then [try_][$1]=autodetect; fi
 	AC_MSG_RESULT([${try_][$1][}])
+	AC_MSG_CHECKING([checkpoint N])
+	AC_MSG_RESULT([apparently])
 	m4_popdef([gp_lib_arg])dnl
 	if test "x${[try_][$1]}" = "xautodetect"; then
 		# OK, we have to autodetect.
@@ -145,6 +147,8 @@ if test "x${[$1][_LIBS]}" = "x" && test "x${[$1][_CFLAGS]}" = "x"; then
 				[PKG_CHECK_MODULES([$1],[$2],     [have_][$1][=yes],[:])]
 			)
 		fi
+		AC_MSG_CHECKING([checkpoint O])
+		AC_MSG_RESULT([apparently])
 		# If pkg-config didn't find anything, try the libfoo-config program
 		# certain known libraries ship with.
 		if test "x${[have_][$1]}" = "xno"; then
@@ -156,6 +160,8 @@ if test "x${[$1][_LIBS]}" = "x" && test "x${[$1][_CFLAGS]}" = "x"; then
 				[$2],[libxml-2.0],[xml2-config],
 				[none])])dnl
 			AC_MSG_RESULT([gp_lib_config])
+			AC_MSG_CHECKING([checkpoint P])
+			AC_MSG_RESULT([apparently])
 			AC_PATH_PROG([$1][_CONFIG_PROG],[gp_lib_config])
 			if test -n "${[$1][_CONFIG_PROG]}" &&
 				test "${[$1][_CONFIG_PROG]}" != "none"; then
@@ -212,6 +218,8 @@ It must be one of ">=", ">", "<", "<=", "=".
 			fi
 			m4_popdef([gp_lib_config])dnl
 		fi
+		AC_MSG_CHECKING([checkpoint Q])
+		AC_MSG_RESULT([apparently])
 		m4_ifval([$3],[# Version requirement given, so we do not rely on probing.],[
 		# Neither pkg-config, nor the libfoo-config program have found anything.
 		# So let's just probe the system.
@@ -251,6 +259,8 @@ No version checks will be performed if it is found using any other method.])
 			fi
 		fi
 		])
+		AC_MSG_CHECKING([checkpoint R])
+		AC_MSG_RESULT([apparently])
 	elif test "x${[try_][$1]}" = "xno"; then
 		:
 	else
@@ -279,6 +289,8 @@ No version checks will be performed if it is found using any other method.])
 ])
 		fi
 	fi
+	AC_MSG_CHECKING([checkpoint S])
+	AC_MSG_RESULT([apparently])
 elif test "x${[$1][_LIBS]}" != "x" && test "x${[$1][_CFLAGS]}" != "x"; then
 	AC_MSG_RESULT([user-defined])
 	userdef_[$1]=yes
@@ -420,9 +432,13 @@ dnl
 dnl ####################################################################
 dnl
 AC_DEFUN([GP_CHECK_LIBRARY],[dnl
+AC_MSG_CHECKING([checkpoint D])
+AC_MSG_RESULT([apparently])
 m4_if([$4], [mandatory],        [_GP_CHECK_LIBRARY_SYNTAX_ERROR($0)],
       [$4], [default-enabled],  [_GP_CHECK_LIBRARY_SYNTAX_ERROR($0)],
       [$4], [default-disabled], [_GP_CHECK_LIBRARY_SYNTAX_ERROR($0)])dnl
+AC_MSG_CHECKING([checkpoint E])
+AC_MSG_RESULT([apparently])
 m4_if([$8], [], [dnl
       _GP_CHECK_LIBRARY([$1],[$2],[$3],[$4],[$5],[$6],[$7],[mandatory],[$9])],
       [$8], [default-on], [dnl
@@ -437,6 +453,8 @@ m4_if([$8], [], [dnl
 Illegal argument 6 to $0: `$6'
 It must be one of "default-on", "default-off", "mandatory".
 ])m4_exit(1)])dnl
+AC_MSG_CHECKING([checkpoint F])
+AC_MSG_RESULT([apparently])
 ])dnl
 dnl
 m4_pattern_disallow([GP_CHECK_LIBRARY])
diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac
index 6af8bd914..242142069 100644
--- a/libgphoto2_port/configure.ac
+++ b/libgphoto2_port/configure.ac
@@ -226,8 +226,13 @@ dnl	     a file.
 dnl	     libexif is available from
 dnl	     http://www.sourceforge.net/projects/libexif
 dnl ---------------------------------------------------------------------------
+AC_MSG_CHECKING([checkpoint S])
+AC_MSG_RESULT([apparently])
+
 GP_CHECK_LIBRARY([LIBEXIF],[libexif],[>= 0.6.13],
 		 [libexif/exif-data.h],[exif_data_new],[
+AC_MSG_CHECKING([checkpoint T])
+AC_MSG_RESULT([apparently])
 AC_MSG_CHECKING([whether we use a version of libexif with ExifData.ifd[[]]])
 # Check for libexif version
 dnl FIXME: Use AC_CHECK_MEMBER?
@@ -248,11 +253,20 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
    AC_DEFINE([HAVE_LIBEXIF_IFD],1,
 	     [whether we use a version of libexif with ExifData.ifd[[]]])
    AC_MSG_RESULT([yes])
-], [
+   AC_MSG_CHECKING([checkpoint U])
+   AC_MSG_RESULT([apparently])
+], [dnl
    AC_MSG_RESULT([no])
+   AC_MSG_CHECKING([checkpoint V])
+   AC_MSG_RESULT([apparently])
 ])
 CPPFLAGS="$CPPFLAGS_save"
-],[],[default-on],[http://www.sourceforge.net/projects/libexif])dnl
+   AC_MSG_CHECKING([checkpoint W])
+   AC_MSG_RESULT([apparently])
+],[dnl
+   AC_MSG_CHECKING([checkpoint X])
+   AC_MSG_RESULT([apparently])
+],[default-on],[http://www.sourceforge.net/projects/libexif])dnl
 
 
 
diff --git a/libgphoto2_port/gphoto-m4/gp-check-library.m4 b/libgphoto2_port/gphoto-m4/gp-check-library.m4
index bc97e19b0..6b65b3ee8 100644
--- a/libgphoto2_port/gphoto-m4/gp-check-library.m4
+++ b/libgphoto2_port/gphoto-m4/gp-check-library.m4
@@ -71,6 +71,8 @@ dnl   * Give names of a header file and function name and to a test
 dnl     compilation.
 dnl
 AC_DEFUN([_GP_CHECK_LIBRARY_SOEXT],[dnl
+AC_MSG_CHECKING([checkpoint NND])
+AC_MSG_RESULT([apparently])
 AC_MSG_CHECKING([for dynamic library extension])
 soext=""
 case "$host" in
@@ -108,12 +110,16 @@ dnl
 AC_REQUIRE([GP_CONFIG_MSG])dnl
 AC_REQUIRE([GP_PKG_CONFIG])dnl
 AC_REQUIRE([_GP_CHECK_LIBRARY_SOEXT])dnl
+AC_MSG_CHECKING([checkpoint NNE])
+AC_MSG_RESULT([apparently])
 # Use _CFLAGS and _LIBS given to configure.
 # This makes it possible to set these vars in a configure script
 # and AC_CONFIG_SUBDIRS this configure.
 AC_ARG_VAR([$1][_CFLAGS], [CFLAGS for compiling with ][$2])dnl
 AC_ARG_VAR([$1][_LIBS],   [LIBS to add for linking against ][$2])dnl
 dnl
+AC_MSG_CHECKING([checkpoint NNF])
+AC_MSG_RESULT([apparently])
 AC_MSG_CHECKING([for ][$2][ to use])
 m4_ifval([$3],[REQUIREMENTS_FOR_][$1][="][$2][ $3]["],
               [REQUIREMENTS_FOR_][$1][="][$2]["])
@@ -135,6 +141,8 @@ if test "x${[$1][_LIBS]}" = "x" && test "x${[$1][_CFLAGS]}" = "x"; then
 	if test "x${[try_][$1]}" = "xauto"; then [try_][$1]=autodetect; fi
 	AC_MSG_RESULT([${try_][$1][}])
 	m4_popdef([gp_lib_arg])dnl
+	AC_MSG_CHECKING([checkpoint NNG])
+	AC_MSG_RESULT([apparently])
 	if test "x${[try_][$1]}" = "xautodetect"; then
 		# OK, we have to autodetect.
 		# We start autodetection with the cleanest known method: pkg-config
@@ -156,6 +164,8 @@ if test "x${[$1][_LIBS]}" = "x" && test "x${[$1][_CFLAGS]}" = "x"; then
 				[$2],[libxml-2.0],[xml2-config],
 				[none])])dnl
 			AC_MSG_RESULT([gp_lib_config])
+			AC_MSG_CHECKING([checkpoint NNH])
+			AC_MSG_RESULT([apparently])
 			AC_PATH_PROG([$1][_CONFIG_PROG],[gp_lib_config])
 			if test -n "${[$1][_CONFIG_PROG]}" &&
 				test "${[$1][_CONFIG_PROG]}" != "none"; then
@@ -184,6 +194,8 @@ It must be one of ">=", ">", "<", "<=", "=".
 				_[$1]_VER_3="$(echo "${_[$1]_VERSION}" | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/g')"
 				_[$1]_VER_4="$(echo "${_[$1]_VERSION}" | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)\(.*\)/\4/g')"
 				AC_MSG_RESULT([${_][$1][_VERSION}])
+			AC_MSG_CHECKING([checkpoint NNJ])
+			AC_MSG_RESULT([apparently])
 				_tmp=false
 				if   test "${_[$1]_VER_1}" "${_[$1]_COMPN}" "${_[$1]_REQ_1}"; then _tmp=true;
 				elif test "${_[$1]_VER_2}" "${_[$1]_COMPN}" "${_[$1]_REQ_2}"; then _tmp=true;
@@ -209,8 +221,12 @@ It must be one of ">=", ">", "<", "<=", "=".
 					have_[$1]=yes
 					AC_MSG_RESULT([ok])
 				fi
+			AC_MSG_CHECKING([checkpoint NNK])
+			AC_MSG_RESULT([apparently])
 			fi
 			m4_popdef([gp_lib_config])dnl
+			AC_MSG_CHECKING([checkpoint NNL])
+			AC_MSG_RESULT([apparently])
 		fi
 		m4_ifval([$3],[# Version requirement given, so we do not rely on probing.],[
 		# Neither pkg-config, nor the libfoo-config program have found anything.
@@ -251,8 +267,12 @@ No version checks will be performed if it is found using any other method.])
 			fi
 		fi
 		])
+			AC_MSG_CHECKING([checkpoint NNM])
+			AC_MSG_RESULT([apparently])
 	elif test "x${[try_][$1]}" = "xno"; then
 		:
+			AC_MSG_CHECKING([checkpoint NNN])
+			AC_MSG_RESULT([apparently])
 	else
 		# We've been given a prefix to look in for library $2.
 		# We start looking for $2.la files first.
@@ -279,12 +299,18 @@ No version checks will be performed if it is found using any other method.])
 ])
 		fi
 	fi
+			AC_MSG_CHECKING([checkpoint NNO])
+			AC_MSG_RESULT([apparently])
 elif test "x${[$1][_LIBS]}" != "x" && test "x${[$1][_CFLAGS]}" != "x"; then
 	AC_MSG_RESULT([user-defined])
 	userdef_[$1]=yes
 	have_[$1]=yes
+			AC_MSG_CHECKING([checkpoint NNP])
+			AC_MSG_RESULT([apparently])
 else
 	AC_MSG_RESULT([broken call])
+			AC_MSG_CHECKING([checkpoint NNQ])
+			AC_MSG_RESULT([apparently])
 	AC_MSG_ERROR([
 * Fatal:
 * When calling configure for ${PACKAGE_TARNAME}
@@ -297,9 +323,13 @@ AC_SUBST([REQUIREMENTS_FOR_][$1])
 dnl
 dnl ACTION-IF-FOUND
 dnl
+			AC_MSG_CHECKING([checkpoint NNR])
+			AC_MSG_RESULT([apparently])
 m4_ifval([$6],[dnl
 if test "x${[have_][$1]}" = "xyes"; then
 # ACTION-IF-FOUND
+			AC_MSG_CHECKING([checkpoint NNS])
+			AC_MSG_RESULT([apparently])
 $6
 fi
 ])dnl
@@ -309,12 +339,16 @@ dnl
 m4_ifval([$7],[dnl
 if test "x${[have_][$1]}" = "xno"; then
 # ACTION-IF-NOT-FOUND
+			AC_MSG_CHECKING([checkpoint NNT])
+			AC_MSG_RESULT([apparently])
 $7
 fi
 ])dnl
 dnl
 dnl Run our own test compilation
 dnl
+			AC_MSG_CHECKING([checkpoint NNU])
+			AC_MSG_RESULT([apparently])
 m4_ifval([$4],[dnl
 if test "x${[have_][$1]}" = "xyes"; then
 dnl AC_MSG_CHECKING([whether ][$2][ test compile succeeds])
@@ -330,6 +364,8 @@ dnl Run our own test link
 dnl    Does not work for libraries which be built after configure time,
 dnl    so we deactivate it for them (userdef_).
 dnl
+			AC_MSG_CHECKING([checkpoint NNV])
+			AC_MSG_RESULT([apparently])
 m4_ifval([$5],[dnl
 if test "x${[userdef_][$1]}" = "xno" && test "x${[have_][$1]}" = "xyes"; then
 	AC_MSG_CHECKING([for function ][$5][ in ][$2])
@@ -343,6 +379,8 @@ fi
 dnl
 dnl Abort configure script if mandatory, but not found
 dnl
+			AC_MSG_CHECKING([checkpoint NNW])
+			AC_MSG_RESULT([apparently])
 m4_if([$8],[mandatory],[
 if test "x${[have_][$1]}" = "xno"; then
 	AC_MSG_ERROR([
@@ -365,6 +403,8 @@ fi
 dnl
 dnl Abort configure script if not found and not explicitly disabled
 dnl
+			AC_MSG_CHECKING([checkpoint NNX])
+			AC_MSG_RESULT([apparently])
 m4_if([$8],[disable-explicitly],[
 if test "x${[try_][$1]}" != "xno" && test "x${[have_][$1]}" = "xno"; then
         AC_MSG_ERROR([
@@ -391,6 +431,8 @@ PKG_CONFIG_PATH=${PKG_CONFIG_PATH}
 fi
 ])dnl
 AM_CONDITIONAL([HAVE_][$1], [test "x$have_[$1]" = "xyes"])
+			AC_MSG_CHECKING([checkpoint NNY])
+			AC_MSG_RESULT([apparently])
 if test "x$have_[$1]" = "xyes"; then
 	AC_DEFINE([HAVE_][$1], 1, [whether we compile with ][$2][ support])
 	GP_CONFIG_MSG([$2],[yes])dnl
@@ -402,6 +444,8 @@ else
 	[REQUIREMENTS_FOR_][$1][=]
 	GP_CONFIG_MSG([$2],[no])dnl
 fi
+			AC_MSG_CHECKING([checkpoint NNZ])
+			AC_MSG_RESULT([apparently])
 dnl AC_SUBST is done implicitly by AC_ARG_VAR above.
 dnl AC_SUBST([$1][_LIBS])
 dnl AC_SUBST([$1][_CFLAGS])
@@ -420,9 +464,13 @@ dnl
 dnl ####################################################################
 dnl
 AC_DEFUN([GP_CHECK_LIBRARY],[dnl
+AC_MSG_CHECKING([checkpoint NNA])
+AC_MSG_RESULT([apparently])
 m4_if([$4], [mandatory],        [_GP_CHECK_LIBRARY_SYNTAX_ERROR($0)],
       [$4], [default-enabled],  [_GP_CHECK_LIBRARY_SYNTAX_ERROR($0)],
       [$4], [default-disabled], [_GP_CHECK_LIBRARY_SYNTAX_ERROR($0)])dnl
+AC_MSG_CHECKING([checkpoint NNB])
+AC_MSG_RESULT([apparently])
 m4_if([$8], [], [dnl
       _GP_CHECK_LIBRARY([$1],[$2],[$3],[$4],[$5],[$6],[$7],[mandatory],[$9])],
       [$8], [default-on], [dnl
@@ -437,6 +485,8 @@ m4_if([$8], [], [dnl
 Illegal argument 6 to $0: `$6'
 It must be one of "default-on", "default-off", "mandatory".
 ])m4_exit(1)])dnl
+AC_MSG_CHECKING([checkpoint NNC])
+AC_MSG_RESULT([apparently])
 ])dnl
 dnl
 m4_pattern_disallow([GP_CHECK_LIBRARY])