[Cscope-cvs] CVS: cscope ChangeLog,1.124,1.125 config.h.in,1.14,1.15 configure,1.20,1.21 configure.in,1.27,1.28

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope
In directory sc8-pr-cvs1:/tmp/cvs-serv32402

Modified Files:
	ChangeLog config.h.in configure configure.in 
Log Message:
Add -v option for the sake of proposed KDE wrapper "kscope".

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -r1.124 -r1.125
*** ChangeLog	2 Jun 2003 10:42:59 -0000	1.124
--- ChangeLog	12 Jun 2003 17:11:35 -0000	1.125
***************
*** 1,2 ****
--- 1,4 ----
+ (2003/06/12 - broeker) New option -v to output progress updates even in
+ 		       line mode.  To be used by interface kscope.
  (2003/06/02 - broeker) Use the basename of files only to test for SCCS/RCS
  	               files in -R traversal.

Index: config.h.in
===================================================================
RCS file: /cvsroot/cscope/cscope/config.h.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** config.h.in	23 Jan 2003 17:46:15 -0000	1.14
--- config.h.in	12 Jun 2003 17:11:37 -0000	1.15
***************
*** 29,32 ****
--- 29,36 ----
  #undef HAVE_LSTAT
  
+ /* Define to 1 if `lstat' has the bug that it succeeds when given the
+    zero-length file name argument. */
+ #undef HAVE_LSTAT_EMPTY_STRING_BUG
+ 
  /* Define to 1 if you have the `memcpy' function. */
  #undef HAVE_MEMCPY
***************
*** 99,102 ****
--- 103,110 ----
  /* Define to 1 if you have the `_setmode' function. */
  #undef HAVE__SETMODE
+ 
+ /* Define to 1 if `lstat' dereferences a symlink specified with a trailing
+    slash. */
+ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK
  
  /* We're using some variant of Linux */

Index: configure
===================================================================
RCS file: /cvsroot/cscope/cscope/configure,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** configure	23 Jan 2003 17:46:16 -0000	1.20
--- configure	12 Jun 2003 17:11:37 -0000	1.21
***************
*** 5278,5281 ****
--- 5278,5415 ----
  done
  
+ echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
+ echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6
+ if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   rm -f conftest.sym conftest.file
+ echo >conftest.file
+ if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
+   if test "$cross_compiling" = yes; then
+   ac_cv_func_lstat_dereferences_slashed_symlink=no
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+ {
+ struct stat sbuf;
+      /* Linux will dereference the symlink and fail.
+         That is better in the sense that it means we will not
+         have to compile and use the lstat wrapper.  */
+      exit (lstat ("conftest.sym/", &sbuf) ? 0 : 1);
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_lstat_dereferences_slashed_symlink=yes
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_func_lstat_dereferences_slashed_symlink=no
+ fi
+ rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ else
+   # If the `ln -s' command failed, then we probably don't even
+   # have an lstat function.
+   ac_cv_func_lstat_dereferences_slashed_symlink=no
+ fi
+ rm -f conftest.sym conftest.file
+ 
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+ echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6
+ 
+ test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
+ _ACEOF
+ 
+ 
+ if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
+   LIBOBJS="$LIBOBJS lstat.$ac_objext"
+ fi
+ 
+ echo "$as_me:$LINENO: checking whether lstat accepts an empty string" >&5
+ echo $ECHO_N "checking whether lstat accepts an empty string... $ECHO_C" >&6
+ if test "${ac_cv_func_lstat_empty_string_bug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   ac_cv_func_lstat_empty_string_bug=yes
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+ {
+ struct stat sbuf;
+   exit (lstat ("", &sbuf) ? 1 : 0);
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_lstat_empty_string_bug=yes
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_func_lstat_empty_string_bug=no
+ fi
+ rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_empty_string_bug" >&5
+ echo "${ECHO_T}$ac_cv_func_lstat_empty_string_bug" >&6
+ if test $ac_cv_func_lstat_empty_string_bug = yes; then
+   LIBOBJS="$LIBOBJS lstat.$ac_objext"
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LSTAT_EMPTY_STRING_BUG 1
+ _ACEOF
+ 
+ fi
+ 
  
  case "$host_os" in

Index: configure.in
===================================================================
RCS file: /cvsroot/cscope/cscope/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** configure.in	23 Jan 2003 17:46:19 -0000	1.27
--- configure.in	12 Jun 2003 17:11:37 -0000	1.28
***************
*** 391,394 ****
--- 391,395 ----
  AC_CHECK_FUNCS(getcwd regcmp regcomp strerror vsnprintf snprintf lstat)
  AC_CHECK_FUNCS(fixkeypad)
+ AC_FUNC_LSTAT
  
  case "$host_os" in