Ethereal-dev: [ethereal-dev] aclocal-flags twist

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date: Fri, 18 Aug 2000 17:32:52 +0900
	with setup like this, aclocal will choke, because:
	- aclocal-flags will try to pass -I /usr/X11R6/share/aclocal
	- aclocal binary finds gtk.m4 twice

	is the following patch acceptable?  "cmp" should be on all
	posix.2 systems (exit with 0 if two files are identical).

itojun


(aclocal binary will look at /usr/pkg/share/aclocal)
itojun[lychee:~/work/ethereal/ethereal] ls -l /usr/pkg/share/aclocal/gtk.m4 
lrwxr-xr-x  1 root  wheel  35 Oct 13  1999 /usr/pkg/share/aclocal/gtk.m4 -> ../../../X11R6/share/aclocal/gtk.m4
itojun[lychee:~/work/ethereal/ethereal] ls -l /usr/X11R6//share/aclocal/gtk.m4  -r--r--r--  1 root  wheel  8285 Sep  3  1999 /usr/X11R6//share/aclocal/gtk.m4


Index: aclocal-flags
===================================================================
RCS file: /usr/local/cvsroot/ethereal/aclocal-flags,v
retrieving revision 1.1
diff -c -r1.1 aclocal-flags
*** aclocal-flags	2000/07/26 08:03:40	1.1
--- aclocal-flags	2000/08/18 08:32:17
***************
*** 44,49 ****
  if [ ! -z "$aclocal_dir" -a ! -z "$gtk_aclocal_dir" \
      -a "$aclocal_dir" != "$gtk_aclocal_dir" ]
  then
! 	echo "-I $gtk_aclocal_dir"
  fi
  exit 0
--- 44,51 ----
  if [ ! -z "$aclocal_dir" -a ! -z "$gtk_aclocal_dir" \
      -a "$aclocal_dir" != "$gtk_aclocal_dir" ]
  then
! 	if ! cmp "$gtk_aclocal_dir/gtk.m4"  "$aclocal_dir/gtk.m4"; then
! 		echo "-I $gtk_aclocal_dir"
! 	fi
  fi
  exit 0