[libcvd-members] libcvd configure configure.in

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        08/05/12 18:15:34

Modified files:
        .              : configure configure.in 

Log message:
        Added doxygen back in to config script
        Compare existing configuration to old one, to excessive rebuilding

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.115&r2=1.116
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.116&r2=1.117

Patches:
Index: configure
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- configure   25 Apr 2008 22:02:17 -0000      1.115
+++ configure   12 May 2008 18:15:32 -0000      1.116
@@ -310,7 +310,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS 
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AWK CXX CXXFLAGS ac_ct_CXX 
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB major 
minor build build_cpu build_vendor build_os host host_cpu host_vendor host_os 
have_x86 have_mmx have_mmxext have_sse have_sse2 have_sse3 have_32bit CXXCPP 
have_dvbuffer have_v4l2buffer have_v4l1buffer have_linux_2_4 have_linux_2_6 
have_o2buffer osx_hacks have_qtbuffer have_videodisplay have_toon have_lapack 
have_pthread have_png have_jpeg have_tiff have_ffmpeg have_glob have_memalign 
have_fast7 have_fast8 have_fast9 have_fast10 have_fast11 have_fast12 
have_ssefast9 have_ssefast10 have_ssefast12 dep_objects progs testprogs OFLAGS 
LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS 
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AWK CXX CXXFLAGS ac_ct_CXX 
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB major 
minor build build_cpu build_vendor build_os host host_cpu host_vendor host_os 
have_x86 have_mmx have_mmxext have_sse have_sse2 have_sse3 have_32bit CXXCPP 
have_dvbuffer have_v4l2buffer have_v4l1buffer have_linux_2_4 have_linux_2_6 
have_o2buffer osx_hacks have_qtbuffer have_videodisplay have_toon have_lapack 
have_pthread have_png have_jpeg have_tiff have_ffmpeg docs have_glob 
have_memalign have_fast7 have_fast8 have_fast9 have_fast10 have_fast11 
have_fast12 have_ssefast9 have_ssefast10 have_ssefast12 dep_objects progs 
testprogs OFLAGS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -6625,7 +6625,7 @@
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Intrinsic.h.
+  # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6633,7 +6633,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -6660,7 +6660,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Intrinsic.h"; then
+  if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -6674,18 +6674,18 @@
   # See if we find them without any special options.
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
-  LIBS="-lXt $LIBS"
+  LIBS="-lX11 $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 int
 main ()
 {
-XtMalloc (0)
+XrmInitialize ()
   ;
   return 0;
 }
@@ -9711,6 +9711,41 @@
        fi
 
 
+# Extract the first word of "doxygen", so it can be a program name with args.
+set dummy doxygen; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_docs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$docs"; then
+  ac_cv_prog_docs="$docs" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_docs="docs"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_docs" && ac_cv_prog_docs="no"
+fi
+fi
+docs=$ac_cv_prog_docs
+if test -n "$docs"; then
+  echo "$as_me:$LINENO: result: $docs" >&5
+echo "${ECHO_T}$docs" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
 
 
################################################################################
 #
@@ -10547,14 +10582,30 @@
 echo $CXXFLAGS
 echo $LIBS
 
-cat << FOO > cvd/config.h
+#Create config.h file, in a temporary location,
+#then compare it to the existing config.h file.
+#Do nothing if they are the same. This prevents
+#excessive rebuilding.
+
+echo -n 'Generating config... '
+
+cat << FOO > cvd/config_tmp.h
 #ifndef CVD_CONFIG_H
 #define CVD_CONFIG_H
 FOO
 echo '#define CVD_HAVE_CPU_'$host_cpu 1 | cat - confdefs.h | grep CVD_ | sort 
| sed 's/#define CVD_.*HAVE_\(.*\) .*/#ifndef CVD_DISABLE_\1\
     &\
-#endif/' >> cvd/config.h
-echo '#endif' >> cvd/config.h
+#endif/' >> cvd/config_tmp.h
+echo '#endif' >> cvd/config_tmp.h
+
+if ! diff -q cvd/config_tmp.h cvd/config.h
+then
+       echo 'New configuration'
+       mv cvd/config_tmp.h cvd/config.h
+else
+       echo 'configuration unchanged'
+       rm cvd/config_tmp.h
+fi
 
           ac_config_files="$ac_config_files Makefile"
 cat >confcache <<\_ACEOF
@@ -11245,6 +11296,7 @@
 s,@have_jpeg@,$have_jpeg,;t t
 s,@have_tiff@,$have_tiff,;t t
 s,@have_ffmpeg@,$have_ffmpeg,;t t
+s,@docs@,$docs,;t t
 s,@have_glob@,$have_glob,;t t
 s,@have_memalign@,$have_memalign,;t t
 s,@have_fast7@,$have_fast7,;t t

Index: configure.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure.in,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- configure.in        25 Apr 2008 22:02:17 -0000      1.116
+++ configure.in        12 May 2008 18:15:33 -0000      1.117
@@ -716,7 +716,7 @@
        AC_CHECK_LIB(avcodec, avcodec_open, [], [a=1])
 ])
 
-
+AC_CHECK_PROG(docs, doxygen, docs, no)
 
################################################################################
 #
 # platform compatibility
@@ -979,13 +979,29 @@
 echo $CXXFLAGS
 echo $LIBS
 
-cat << FOO > cvd/config.h
+#Create config.h file, in a temporary location,
+#then compare it to the existing config.h file.
+#Do nothing if they are the same. This prevents
+#excessive rebuilding.
+
+echo -n 'Generating config... '
+
+cat << FOO > cvd/config_tmp.h
 #ifndef CVD_CONFIG_H
 #define CVD_CONFIG_H
 FOO
 echo '#define CVD_HAVE_CPU_'$host_cpu 1 | cat - confdefs.h | grep CVD_ | sort 
| sed 's/#define CVD_.*HAVE_\(.*\) .*/#ifndef CVD_DISABLE_\1\
     &\
-#endif/' >> cvd/config.h
-echo '#endif' >> cvd/config.h
+#endif/' >> cvd/config_tmp.h
+echo '#endif' >> cvd/config_tmp.h
+
+if ! diff -q cvd/config_tmp.h cvd/config.h
+then
+       echo 'New configuration'
+       mv cvd/config_tmp.h cvd/config.h
+else
+       echo 'configuration unchanged'
+       rm cvd/config_tmp.h
+fi
 
 AC_OUTPUT(Makefile)