small recoll/kio_recoll build changes: avoid unnecessary recompilations and make them play nicer together

src/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Recoll 1.6.
+# Generated by GNU Autoconf 2.68 for Recoll 1.16.0.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -557,8 +557,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Recoll'
 PACKAGE_TARNAME='recoll'
-PACKAGE_VERSION='1.6'
-PACKAGE_STRING='Recoll 1.6'
+PACKAGE_VERSION='1.16.0'
+PACKAGE_STRING='Recoll 1.16.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -601,6 +601,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+RCLVERSION
 NOPIC
 NOCMDLINE
 NOQTMAKE
@@ -702,14 +703,9 @@ CPPFLAGS
 CCC
 CC
 CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
 CPP
-CPPFLAGS
 XMKMF
-CXXCPP
-CPPFLAGS'
+CXXCPP'
 
 
 # Initialize some variables set by options.
@@ -1252,7 +1248,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Recoll 1.6 to adapt to many kinds of systems.
+\`configure' configures Recoll 1.16.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1317,7 +1313,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Recoll 1.6:";;
+     short | recursive ) echo "Configuration of Recoll 1.16.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1440,7 +1436,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Recoll configure 1.6
+Recoll configure 1.16.0
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1993,7 +1989,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Recoll $as_me 1.6, which was
+It was created by Recoll $as_me 1.16.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -4413,8 +4409,8 @@ if test A"$LIBICONV" = A ; then
    as_fn_error $? "Cannot find iconv_open anywhere. Please install iconv" "$LINENO" 5
    exit 1
 fi
-echo LIBICONV $LIBICONV
-echo INCICONV $INCICONV
+#echo LIBICONV $LIBICONV
+#echo INCICONV $INCICONV
 
 CPPFLAGS="$CPPFLAGS $INCICONV"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of inbuf parameter to iconv" >&5
@@ -5545,6 +5541,7 @@ test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
 m_datadir=${m_prefix}/share
 QTRECOLL_DATADIR=${m_datadir}/recoll
 
+RCLVERSION='1.16.0'
 
 
 
@@ -5564,7 +5561,11 @@ QTRECOLL_DATADIR=${m_datadir}/recoll
 
 
 
-ac_config_files="$ac_config_files mk/localdefs"
+
+
+# All object files depend on localdefs which has the cc flags. Avoid
+# changing it unless necessary
+ac_config_files="$ac_config_files mk/localdefs.new:mk/localdefs.in"
 
 ac_config_files="$ac_config_files recollinstall"
 
@@ -5572,6 +5573,8 @@ ac_config_files="$ac_config_files Makefile"
 
 ac_config_files="$ac_config_files sampleconf/recoll.conf"
 
+ac_config_files="$ac_config_files common/rclversion.h"
+
 
 for d in bincimapmime index lib query
 do
@@ -6099,7 +6102,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Recoll $as_me 1.6, which was
+This file was extended by Recoll $as_me 1.16.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6161,7 +6164,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Recoll config.status 1.6
+Recoll config.status 1.16.0
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -6284,10 +6287,11 @@ do
   case $ac_config_target in
     "common/autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS common/autoconfig.h" ;;
     "$QTGUI/recoll.pro") CONFIG_FILES="$CONFIG_FILES $QTGUI/recoll.pro" ;;
-    "mk/localdefs") CONFIG_FILES="$CONFIG_FILES mk/localdefs" ;;
+    "mk/localdefs.new") CONFIG_FILES="$CONFIG_FILES mk/localdefs.new:mk/localdefs.in" ;;
     "recollinstall") CONFIG_FILES="$CONFIG_FILES recollinstall" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "sampleconf/recoll.conf") CONFIG_FILES="$CONFIG_FILES sampleconf/recoll.conf" ;;
+    "common/rclversion.h") CONFIG_FILES="$CONFIG_FILES common/rclversion.h" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -6869,3 +6873,10 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
+if cmp -s mk/localdefs mk/localdefs.new ; then
+  rm -f mk/localdefs.new
+else
+  mv -f mk/localdefs.new mk/localdefs
+fi
+