[KBear-cvs] kbear/admin bcheck.pl,NONE,1.1 deps.am,NONE,1.1 nmcheck,NONE,1.1 oldinclude.m4.in,NONE,1
Brought to you by:
kbjorn
Menu
▾
▴
[KBear-cvs] kbear/admin bcheck.pl,NONE,1.1 deps.am,NONE,1.1 nmcheck,NONE,1.1 oldinclude.m4.in,NONE,1.1 pkg.m4.in,NONE,1.1 Doxyfile.am,1.3,1.4 Doxyfile.global,1.2,1.3 Makefile.common,1.12,1.13 acinclude.m4.in,1.18,1.19 am_edit,1.17,1.18 conf.change.pl,1.4,1.5 config.guess,1.6,1.7 config.pl,1.4,1.5 config.sub,1.6,1.7 configure.in.bot.end,1.1,1.2 cvs-clean.pl,1.1,1.2 cvs.sh,1.5,1.6 debianrules,1.9,1.10 depcomp,1.3,1.4 detect-autoconf.sh,1.4,1.5 install-sh,1.3,1.4 libtool.m4.in,1.8,1.9 ltmain.sh,1.8,1.9
Update of /cvsroot/kbear/kbear/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12700/admin Modified Files: Doxyfile.am Doxyfile.global Makefile.common acinclude.m4.in am_edit conf.change.pl config.guess config.pl config.sub configure.in.bot.end cvs-clean.pl cvs.sh debianrules depcomp detect-autoconf.sh install-sh libtool.m4.in ltmain.sh Added Files: bcheck.pl deps.am nmcheck oldinclude.m4.in pkg.m4.in Log Message: --- NEW FILE: bcheck.pl --- #!/usr/bin/perl -w use DB_File; use Fcntl ':flock'; if (!defined($ARGV[0])) { print "usage: requires .class dump as parameter!\n"; exit; } sub bailout { untie %bcheckdb if(defined(%bcheckdb)); if(defined(MYLOCK)) { flock MYLOCK, LOCK_UN; close(MYLOCK); } print @_; exit 5; } sub ask_user { my ($dbkey, $dbchunk) = @_; if (defined($ENV{"BCHECK_UPDATE"})) { $bcheckdb{$dbkey} = $dbchunk; return; } &bailout("BC problem detected") if (! -t STDIN); print "(I)gnore / (Q)uit / (U)pdate: "; my $key; while(defined(read STDIN, $key, 1)) { $key = lc($key); print "got: >$key<\n"; return if ($key eq 'i'); &bailout("BC problem. aborted") if ($key eq 'q'); if ($key eq 'u') { $bcheckdb{$dbkey} = $dbchunk; return; } print "\n(I)gnore / (Q)uit / (U)pdate: "; } } sub diff_chunk($$) { my ($oldl, $newl) = @_; my @old = split /^/m, $oldl; my @new = split /^/m, $newl; my $haschanges = 0; my $max = $#old > $#new ? $#old : $#new; die "whoops. key different" if ($old[0] ne $new[0]); if ($#old != $#new) { warn ("Structural difference.\n"); print @old; print "-----------------------------------------------\n"; print @new; $haschanges = 1; return $haschanges; } print $old[0]; my ($class) = ($old[0] =~ /^(?:Class |Vtable for )(\S+)/); my $c = 1; while ($c < $max) { my ($o, $n) = ($old[$c], $new[$c]); chomp $o; chomp $n; $c++; next if ($o eq $n); if(defined($class) and $n =~ /^(\d+\s+)\w+(::\S+\s*.*)$/) { next if ($n eq "$1$class$2"); } $haschanges = 1; print "-$o\n+$n\n\n"; } return $haschanges; } local $dblock = $ENV{"HOME"} . "/bcheck.lock"; my $dbfile = $ENV{"HOME"} . "/bcheck.db"; my $cdump = $ARGV[0]; die "file $cdump is not readable: $!" if (! -f $cdump); # make sure the advisory lock exists open(MYLOCK, ">$dblock"); print MYLOCK ""; flock MYLOCK, LOCK_EX; tie %bcheckdb, 'DB_File', $dbfile; my $chunk = ""; open (IN, "<$cdump") or die "cannot open $cdump: $!"; while (<IN>) { chop; s/0x[0-9a-fA-F]+/0x......../g; s/base size=/size=/g; s/base align=/align=/g; $chunk .= $_ . "\n"; if(/^\s*$/) { my @lines = split /^/m, $chunk; my $key = $lines[0]; chomp $key; if($key !~ /<anonymous struct>/ && $key !~ /<anonymous union>/) { if(defined($bcheckdb{$key})) { my $dbversion = $bcheckdb{$key}; if($dbversion ne $chunk) { &ask_user($key, $chunk) if(&diff_chunk($dbversion, $chunk)); } } else { $bcheckdb{$key} = $chunk; print "NEW: $key\n"; } } $chunk = ""; next; } } close(IN); untie %bcheckdb; flock MYLOCK, LOCK_UN; close(MYLOCK); exit 0; --- NEW FILE: deps.am --- $(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in @cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4 $(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files $(top_srcdir)/admin/cvs.sh @cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure_in $(top_srcdir)/configure.files: $(top_srcdir)/subdirs $(CONF_FILES) @cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure.files $(top_srcdir)/admin/cvs.sh $(top_srcdir)/Makefile.am: $(top_srcdir)/Makefile.am.in $(top_srcdir)/subdirs $(top_srcdir)/admin/cvs.sh @cd $(top_srcdir) && $(SHELL) admin/cvs.sh Makefile_am $(top_srcdir)/subdirs: $(top_srcdir)/Makefile.am.in $(top_srcdir)/admin/cvs.sh @cd $(top_srcdir) && $(SHELL) admin/cvs.sh subdirs # defining default rules for files that may not be present $(top_srcdir)/Makefile.am.in: $(CONF_FILES): --- NEW FILE: nmcheck --- #!/usr/bin/perl -w # Check namespace cleanness of a library. # Allowed symbols are passed as arguments. # They may have trailing * = wildcard. # Wildcards may be also specified as *::* (e.g. K*::* for all KDE classes) # Symbols are listed as full function unmangled names without arguments, # e.g. 'foo bar* nspace::*' allows foo(), foo(int), bar(), barbar() # and all symbols in namespace/class nspace. # If an argument has comma in it, it's a filename of a file containing # allowed symbols, one per line. $thisProg = "$0"; # This programs name $library = ""; $allowed_symbols = ""; $debug = 0; $allowed_weak = ""; $weak_specified = 0; while( defined( $ARGV[ 0 ] )) { $_ = shift; if( /^--verbose$|^-v$/ ) { $debug = 1; } elsif( /^--help$|^-h$/ ) { print STDOUT "Usage $thisProg [OPTION] ... library [allowed symbols] ...\n", "\n", "Check if the given library has only allowed public symbols.\n", "\n", " --allowweak=[symbol] allow only these weak symbols\n", " -v, --verbose verbosely list files processed\n", " -h, --help print this help, then exit\n"; exit 0; } elsif( /^--allowweak=(.*)$/ ) { $allowed_weak .= " " . $1; $weak_specified = 1; } elsif( /^--allowweak$/ ) # simply list all weak { $allowed_weak .= " "; $weak_specified = 1; } elsif( /^--*/ ) { die "Invalid argument!\n"; } else { if( ! $library ) { $library = $_; } else { $allowed_symbols .= " " . $_; } } } if( ! $weak_specified ) { $allowed_weak = "*"; # allow all weak symbols by default # instances of templates and similar stuff - unfortunately includes also things from other libraries, # so it cannot be on by default } print STDERR "library:" . $library . "\n" if $debug; print STDERR "allowed_symbols:" . $allowed_symbols . "\n" if $debug; print STDERR "allowed_weak:" . $allowed_weak . "\n" if $debug; $default_symbols = "_fini _init"; # system symbols # on my system, every .so has : # A _DYNAMIC # A _GLOBAL_OFFSET_TABLE_ # A __bss_start # A _edata # A _end # T _fini # T _init # no need to list A symbols in $default_symbols print STDERR "default_symbols: " . $default_symbols . "\n" if $debug; print STDOUT "Namespace cleanness check for " . $library . " :\n"; $lib_file = ""; if( $library =~ /\.la$/ ) { # get the real library file from .la open( FILEIN, $library ) || die "Couldn't open $! !\n"; while( $line = <FILEIN> ) { if( $line =~ /library_names=\'([^ ]*).*/o ) { $lib_file = $1; } } close( FILEIN ); if( ! $lib_file ) { print STDERR "Library file not found in .la file!\n"; exit 1; } my $libpath = $library; $libpath =~ s%[^/]*$%%; if( -e $libpath . ".libs/" . $lib_file ) { $lib_file = $libpath . ".libs/" . $lib_file; } else { $lib_file = $libpath . $lib_file; } } else { $lib_file = $library; } print STDERR "libfile: ". $lib_file . "\n" if $debug; $allowed_symbols .= " " . $default_symbols; sub process_symbols($\@\%\@); @wildcards = (); %exacts = (); @regwildcards = (); process_symbols( $allowed_symbols, @wildcards, %exacts, @regwildcards ); @weak_wildcards = (); %weak_exacts = (); @weak_regwildcards = (); process_symbols( $allowed_weak, @weak_wildcards, %weak_exacts, @weak_regwildcards ); # grep is for stripping not exported symbols, which don't have address (=first column) $nm_command = "nm -BDCg " . $lib_file . " | grep -v '^ ' |"; # TODO how portable is this nmcheck stuff? print STDERR "nm command:" . $nm_command . "\n" if $debug; open( FILEIN, $nm_command ) || die "nm command failed\n"; my $exit_code = 0; while( $line = <FILEIN> ) { my $type; my $symbol; if( $line =~ /^[^ ]* (.) (.*)$/o ) { $type = $1; $symbol = $2; } else { die "Invalid line: " . $line . "\n"; } print STDERR "Type: " . $type . " , symbol: " . $symbol . "\n" if $debug; if( $type eq "A" ) { # these should be system symbols, so ignore them next; } my $orig_symbol = $symbol; if( $symbol =~ /\(anonymous namespace\)/o ) { # TODO tell to prefer named namespaces? (shorter symbols) next; } # strip prefixes # the :: appending is to make "CLASS::*" work also for "vtable for CLASS" $symbol =~ s/^typeinfo for (.*)$/$1::/o; $symbol =~ s/^typeinfo fn for (.*)$/$1::/o; $symbol =~ s/^typeinfo name for (.*)$/$1::/o; $symbol =~ s/^vtable for (.*)$/$1::/o; $symbol =~ s/^guard variable for (.*)$/$1::/o; $symbol =~ s/^reference temporary for (.*)$/$1::/o; $symbol =~ s/^VTT for (.*)$/$1::/o; $symbol =~ s/^virtual thunk \[[^\]]*\] to (.*)$/$1::/o; $symbol =~ s/^non-virtual thunk \[[^\]]*\] to (.*)$/$1::/o; $symbol =~ s/^covariant return thunk \[[^\]]*\] to (.*)$/$1::/o; $symbol =~ s/^construction vtable thunk for (.*)$/$1::/o; $symbol =~ s/^construction vtable for .*-in-(.*) [0-9]*$/$1::/o; # templates seem to have also return types mangled in their name, and nm prints it too # they have also template arguments in the symbol # get rid of both of those while( $symbol =~ /<.*>/o ) { $symbol =~ s/<[^<>]*>//o; # strip innermost <> } if( $symbol !~ /operator\(\)/o ) { $symbol =~ s/ ?\(.*\).*$//o; # strip () and all after it } else { $symbol =~ s/(^|:| )operator\(\) ?\(.*\).*$//o; # strip () and all after it } $symbol =~ s/\[.*\] *$//o; # strip [in-charge] etc. if( $symbol =~ /(^|:| )operator /o ) { $symbol =~ s/.* ([^\s]*)operator /$1/o; # strip everything before 'X::operator blah' } else { $symbol =~ s/.* ([^\s]+) *$/$1/o; # get last word (strip return type) } # print STDERR "Processed symbol: " . $symbol . "\n" if $debug; my $found = 0; if( $exacts{ $symbol } ) { $found = 1; } if( ! $found ) { for my $wild ( @wildcards ) { if( index( $symbol, $wild ) == 0 ) { $found = 1; last; } } } if( ! $found ) { for my $wild ( @regwildcards ) { if( $symbol =~ /^$wild$/ ) { $found = 1; last; } } } if( ( ! $found ) && ( $type eq "W" || $type eq "V" )) { if( $weak_exacts{ $symbol } ) { $found = 1; } if( ! $found ) { for my $wild ( @weak_wildcards ) { if( index( $symbol, $wild ) == 0 ) { $found = 1; last; } } } if( ! $found ) { for my $wild ( @weak_regwildcards ) { if( $symbol =~ /^$wild$/ ) { $found = 1; last; } } } } if( ! $found ) { print STDERR "Public symbol " . $orig_symbol . " is not allowed!\n"; $exit_code = 1; } } close( FILEIN ); print STDOUT $exit_code == 0 ? "OK\n" : "FAILED\n"; exit $exit_code; sub process_symbols($\@\%\@) { my $allowed_symbols = $_[ 0 ]; my $wildcards_ref = $_[ 1 ]; my $exacts_ref = $_[ 2 ]; my $regwildcards_ref = $_[ 3 ]; $allowed_symbols =~ s/^ *//o; # strip whitespace $allowed_symbols =~ s/ *$//o; if( $allowed_symbols eq "NONE" ) { $allowed_symbols = ""; } my @symbols1 = split( ' ', $allowed_symbols ); my $i = 0; my @symbols2 = (); while( defined( $symbols1[ $i ] )) { my $symbol = $symbols1[ $i ]; if( $symbol =~ /\./ ) # dot in name -> file { open( SYMIN, $symbol ) || die ( "Cannot open file " . $symbol . "!" ); while( $line = <SYMIN> ) { $line =~ s/^\s*//o; # strip whitespace $line =~ s/\s*$//o; if( $line !~ /^$/o # empty line && $line !~ /^\s*#/ ) # comment line starting with # { $symbols2[ $#symbols2 + 1 ] = $line; } } close( SYMIN ); } else { $symbols2[ $#symbols2 + 1 ] = $symbol; } $i++; } $i = 0; while( defined( $symbols2[ $i ] )) { my $symbol = $symbols2[ $i ]; if( $symbol =~ /__/ || $symbol =~ /^_[A-Z]/ ) { # ISO C++ 2.10.2 die "Symbols containing a double underscore or beginning with an underscore and an upper-case letter are reserved!\n"; } elsif( $symbol eq "main" || $symbol eq "main*" ) { die "Symbol main is not allowed!\n"; } if( $symbol =~ /^([^\*]*)\*$/o # trailing * without any * before it && $symbol !~ /operator\*$/o ) { print STDERR "wildcard:" . $symbol . "\n" if $debug; $wildcards_ref->[ $#{$wildcards_ref} + 1 ] = $1; } elsif( $symbol =~ /\*$/o && ( $symbol =~ /\*::/o || $symbol =~ /::\*/o ) && $symbol !~ /^\*/o && $symbol !~ /operator\*$/o ) { print STDERR "regwildcard:" . $symbol . "\n" if $debug; $symbol =~ s/\*/\.\*/go; # change * to .* (regexp) $regwildcards_ref->[ $#{$regwildcards_ref} + 1 ] = $symbol; } else { print STDERR "exact:" . $symbol . "\n" if $debug; $exacts_ref->{ $symbol } = 1; } $i++; } } --- NEW FILE: oldinclude.m4.in --- ### -*- autoconf -*- dnl This file is part of the KDE libraries/packages dnl Copyright (C) 1997 Janos Farkas (ch...@sh...) dnl (C) 1997,98,99 Stephan Kulow (co...@kd...) dnl This file is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Library General Public dnl License as published by the Free Software Foundation; either dnl version 2 of the License, or (at your option) any later version. dnl This library is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU dnl Library General Public License for more details. dnl You should have received a copy of the GNU Library General Public License dnl along with this library; see the file COPYING.LIB. If not, write to dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, dnl Boston, MA 02111-1307, USA. AC_DEFUN([KDE_CHECK_MICO], [ AC_REQUIRE([KDE_CHECK_LIBDL]) AC_REQUIRE([KDE_MISC_TESTS]) AC_MSG_CHECKING(for MICO) if test -z "$MICODIR"; then kde_micodir=/usr/local else kde_micodir="$MICODIR" fi AC_ARG_WITH(micodir, [ --with-micodir=micodir where mico is installed ], kde_micodir=$withval, kde_micodir=$kde_micodir ) AC_CACHE_VAL(kde_cv_mico_incdir, [ mico_incdirs="$kde_micodir/include /usr/include /usr/local/include /usr/local/include /opt/local/include $kde_extra_includes" AC_FIND_FILE(CORBA.h, $mico_incdirs, kde_cv_mico_incdir) ]) kde_micodir=`echo $kde_cv_mico_incdir | sed -e 's#/include##'` if test ! -r $kde_micodir/include/CORBA.h; then AC_MSG_ERROR([No CORBA.h found, specify another micodir]) fi AC_MSG_RESULT($kde_micodir) MICO_INCLUDES=-I$kde_micodir/include AC_SUBST(MICO_INCLUDES) MICO_LDFLAGS=-L$kde_micodir/lib AC_SUBST(MICO_LDFLAGS) micodir=$kde_micodir AC_SUBST(micodir) AC_MSG_CHECKING([for MICO version]) AC_CACHE_VAL(kde_cv_mico_version, [ AC_LANG_C cat >conftest.$ac_ext <<EOF #include <stdio.h> #include <mico/version.h> int main() { printf("MICO_VERSION=%s\n",MICO_VERSION); return (0); } EOF ac_compile='${CC-gcc} $CFLAGS $MICO_INCLUDES conftest.$ac_ext -o conftest' if AC_TRY_EVAL(ac_compile); then if eval `./conftest 2>&5`; then kde_cv_mico_version=$MICO_VERSION else AC_MSG_ERROR([your system is not able to execute a small application to find MICO version! Check $kde_micodir/include/mico/version.h]) fi else AC_MSG_ERROR([your system is not able to compile a small application to find MICO version! Check $kde_micodir/include/mico/version.h]) fi ]) dnl installed MICO version mico_v_maj=`echo $kde_cv_mico_version | sed -e 's/^\(.*\)\..*\..*$/\1/'` mico_v_mid=`echo $kde_cv_mico_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'` mico_v_min=`echo $kde_cv_mico_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'` if test "x$1" = "x"; then req_version="2.3.0" else req_version=$1 fi dnl required MICO version req_v_maj=`echo $req_version | sed -e 's/^\(.*\)\..*\..*$/\1/'` req_v_mid=`echo $req_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'` req_v_min=`echo $req_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'` if test "$mico_v_maj" -lt "$req_v_maj" || \ ( test "$mico_v_maj" -eq "$req_v_maj" && \ test "$mico_v_mid" -lt "$req_v_mid" ) || \ ( test "$mico_v_mid" -eq "$req_v_mid" && \ test "$mico_v_min" -lt "$req_v_min" ) then AC_MSG_ERROR([found MICO version $kde_cv_mico_version but version $req_version \ at least is required. You should upgrade MICO.]) else AC_MSG_RESULT([$kde_cv_mico_version (minimum version $req_version, ok)]) fi LIBMICO="-lmico$kde_cv_mico_version $LIBCRYPT $LIBSOCKET $LIBDL" AC_SUBST(LIBMICO) if test -z "$IDL"; then IDL='$(kde_bindir)/cuteidl' fi AC_SUBST(IDL) IDL_DEPENDENCIES='$(kde_includes)/CUTE.h' AC_SUBST(IDL_DEPENDENCIES) idldir="\$(includedir)/idl" AC_SUBST(idldir) ]) AC_DEFUN([KDE_CHECK_MINI_STL], [ AC_REQUIRE([KDE_CHECK_MICO]) AC_MSG_CHECKING(if we use mico's mini-STL) AC_CACHE_VAL(kde_cv_have_mini_stl, [ AC_LANG_SAVE AC_LANG_CPLUSPLUS kde_save_cxxflags="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $MICO_INCLUDES" AC_TRY_COMPILE( [ #include <mico/config.h> ], [ #ifdef HAVE_MINI_STL #error "nothing" #endif ], kde_cv_have_mini_stl=no, kde_cv_have_mini_stl=yes) CXXFLAGS="$kde_save_cxxflags" AC_LANG_RESTORE ]) if test "x$kde_cv_have_mini_stl" = "xyes"; then AC_MSG_RESULT(yes) $1 else AC_MSG_RESULT(no) $2 fi ]) ]) AC_DEFUN([KDE_CHECK_ANSI], [ ]) AC_DEFUN([KDE_CHECK_INSURE], [ AC_ARG_ENABLE(insure, [ --enable-insure use insure++ for debugging [default=no]], [ if test $enableval = "no"; dnl then ac_use_insure="no" else ac_use_insure="yes" fi ], [ac_use_insure="no"]) AC_MSG_CHECKING(if we will use Insure++ to debug) AC_MSG_RESULT($ac_use_insure) if test "$ac_use_insure" = "yes"; dnl then CC="insure"; CXX="insure"; dnl CFLAGS="$CLAGS -fno-rtti -fno-exceptions "???? fi ]) AC_DEFUN([KDE_CHECK_NEWLIBS], [ ]) --- NEW FILE: pkg.m4.in --- dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page dnl also defines GSTUFF_PKG_ERRORS on error AC_DEFUN([PKG_CHECK_MODULES], [ succeeded=no if test -z "$PKG_CONFIG"; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) fi if test "$PKG_CONFIG" = "no" ; then echo "*** The pkg-config script could not be found. Make sure it is" echo "*** in your path, or set the PKG_CONFIG environment variable" echo "*** to the full path to pkg-config." echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then AC_MSG_CHECKING(for $2) if $PKG_CONFIG --exists "$2" ; then AC_MSG_RESULT(yes) succeeded=yes AC_MSG_CHECKING($1_CFLAGS) $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` AC_MSG_RESULT($$1_CFLAGS) AC_MSG_CHECKING($1_LIBS) $1_LIBS=`$PKG_CONFIG --libs "$2"` AC_MSG_RESULT($$1_LIBS) else $1_CFLAGS="" $1_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ifelse([$4], ,echo $$1_PKG_ERRORS,) fi AC_SUBST($1_CFLAGS) AC_SUBST($1_LIBS) else echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." echo "*** See http://www.freedesktop.org/software/pkgconfig" fi fi if test $succeeded = yes; then ifelse([$3], , :, [$3]) else ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) fi ]) Index: Doxyfile.am =================================================================== RCS file: /cvsroot/kbear/kbear/admin/Doxyfile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Doxyfile.am 1 Feb 2003 23:52:18 -0000 1.3 --- Doxyfile.am 12 Apr 2005 13:06:43 -0000 1.4 *************** *** 18,21 **** --- 18,24 ---- echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile; \ echo "HTML_OUTPUT = $(subdir)/html" >> Doxyfile; \ + echo "HTML_HEADER = $(top_builddir)/apidocs/common/header.html" >> Doxyfile;\ + echo "HTML_FOOTER = $(top_builddir)/apidocs/common/footer.html" >> Doxyfile;\ + echo "HTML_STYLESHEET = $(top_builddir)/apidocs/common/doxygen.css" >> Doxyfile;\ echo "LATEX_OUTPUT = $(subdir)/latex" >> Doxyfile; \ echo "RTF_OUTPUT = $(subdir)/rtf" >> Doxyfile; \ *************** *** 25,29 **** echo "GENERATE_LATEX = $(GENERATE_FLAG)" >> Doxyfile ;\ if test -n "$(DOXYGEN_EXCLUDE)"; then \ ! echo "EXCLUDE_PATTERNS += $(DOXYGEN_EXCLUDE)" >> Doxyfile; \ fi ;\ echo "TAGFILES = \\" >> Doxyfile; \ --- 28,42 ---- echo "GENERATE_LATEX = $(GENERATE_FLAG)" >> Doxyfile ;\ if test -n "$(DOXYGEN_EXCLUDE)"; then \ ! patterns= ;\ ! dirs= ;\ ! for item in `echo "$(DOXYGEN_EXCLUDE)"`; do \ ! if test -d "$(srcdir)/$$item"; then \ ! dirs="$$dirs $(srcdir)/$$item/" ;\ ! else \ ! patterns="$$patterns $$item" ;\ ! fi ;\ ! done ;\ ! echo "EXCLUDE_PATTERNS += $$patterns" >> Doxyfile; \ ! echo "EXCLUDE += $$dirs" >> Doxyfile ;\ fi ;\ echo "TAGFILES = \\" >> Doxyfile; \ *************** *** 46,50 **** fi ;\ done ;\ ! echo "GENERATE_TAGFILE = $(top_builddir)/apidocs/$(subdir)/$(subdir).tag" >> Doxyfile ;\ echo "IGNORE_PREFIX = K" >> Doxyfile ;\ echo "HAVE_DOT = $(KDE_HAVE_DOT)" >> Doxyfile ;\ --- 59,63 ---- fi ;\ done ;\ ! echo "GENERATE_TAGFILE = $(top_builddir)/apidocs/$(subdir)/`basename $(subdir)`.tag" >> Doxyfile ;\ echo "IGNORE_PREFIX = K" >> Doxyfile ;\ echo "HAVE_DOT = $(KDE_HAVE_DOT)" >> Doxyfile ;\ *************** *** 66,83 **** if test -d $(top_builddir)/apidocs/$(subdir)/html; then \ list=`ls $(top_builddir)/apidocs/$(subdir)/html`; \ for file in $$list; do \ ! echo $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \ ! $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \ done; \ fi; \ ! rm -f $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ ! $(LN_S) $(kde_libs_htmldir)/en/common $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ else\ if test -d $(top_builddir)/apidocs; then \ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\ list=`cd $(top_builddir)/apidocs && ls -1`; \ for file in $$list; do \ if test -f $(top_builddir)/apidocs/$$file; then \ - echo $(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \ $(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \ fi; \ --- 79,100 ---- if test -d $(top_builddir)/apidocs/$(subdir)/html; then \ list=`ls $(top_builddir)/apidocs/$(subdir)/html`; \ + echo "installing $(top_builddir)/apidocs/$(subdir)/html" ;\ for file in $$list; do \ ! $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \ done; \ fi; \ ! symlink="$(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common"; \ ! if test ! -L "$symlink" -o `readlink "$symlink" 2>/dev/null` != "$(kde_libs_htmldir)/en/common"; then \ ! echo "Creating symlink $(kde_htmldir)/en/$(PACKAGE)-apidocs/common"; \ ! rm -f $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ ! $(LN_S) $(kde_libs_htmldir)/en/common $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ ! fi; \ else\ if test -d $(top_builddir)/apidocs; then \ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\ list=`cd $(top_builddir)/apidocs && ls -1`; \ + echo "installing $(top_builddir)/apidocs/$$file" ;\ for file in $$list; do \ if test -f $(top_builddir)/apidocs/$$file; then \ $(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \ fi; \ *************** *** 127,132 **** @echo "*** Creating API documentation main page"; \ cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \ ! echo "PROJECT_NAME = $(DOXYGEN_PROJECT_NAME)" >> Doxyfile ; \ ! echo "PROJECT_NUMBER = $(DOXYGEN_PROJECT_NUMBER)" >> Doxyfile ; \ echo "INPUT = $(top_srcdir)" >> Doxyfile ; \ echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile ; \ --- 144,149 ---- @echo "*** Creating API documentation main page"; \ cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \ ! echo "PROJECT_NAME = \"$(DOXYGEN_PROJECT_NAME)\"" >> Doxyfile ; \ ! echo "PROJECT_NUMBER = \"$(DOXYGEN_PROJECT_NUMBER)\"" >> Doxyfile ; \ echo "INPUT = $(top_srcdir)" >> Doxyfile ; \ echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile ; \ *************** *** 159,162 **** --- 176,182 ---- rm -f Doxyfile + .PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox apidox-am-toplevel-no apidox-am-toplevel-yes + + # Local Variables: # mode: makefile Index: Doxyfile.global =================================================================== RCS file: /cvsroot/kbear/kbear/admin/Doxyfile.global,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Doxyfile.global 17 Nov 2003 13:48:14 -0000 1.2 --- Doxyfile.global 12 Apr 2005 13:06:44 -0000 1.3 *************** *** 1,3 **** ! # Doxyfile 1.2.15 # This file describes the settings to be used by the documentation system --- 1,3 ---- ! # Doxyfile 1.3.6 # This file describes the settings to be used by the documentation system *************** *** 12,16 **** [...981 lines suppressed...] - - DOC_URL = - - # The DOC_ABSPATH tag should be the absolute path to the directory where the - # documentation is located. If left blank the directory on the local machine - # will be used. - - DOC_ABSPATH = - - # The BIN_ABSPATH tag must point to the directory where the doxysearch binary - # is installed. - - BIN_ABSPATH = - - # The EXT_DOC_PATHS tag can be used to specify one or more paths to - # documentation generated for other projects. This allows doxysearch to search - # the documentation for these projects as well. - - EXT_DOC_PATHS = --- 1132,1133 ---- Index: Makefile.common =================================================================== RCS file: /cvsroot/kbear/kbear/admin/Makefile.common,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.common 21 Nov 2002 15:58:42 -0000 1.12 --- Makefile.common 12 Apr 2005 13:06:44 -0000 1.13 *************** *** 7,11 **** SHELL=/bin/sh ! cvs dist cvs-clean configure.in configure.files subdirs package-messages package-merge: @admindir=$(admindir); \ if test "x$$admindir" = x; then \ --- 7,11 ---- SHELL=/bin/sh ! cvs dist cvs-clean configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4 extract-messages: @admindir=$(admindir); \ if test "x$$admindir" = x; then \ *************** *** 22,31 **** fi; \ if test "$@" = "package-merge"; then \ ! MAKE=$(MAKE) POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \ $(SHELL) $$admindir/cvs.sh package-merge ;\ ! else MAKE=$(MAKE) $(SHELL) $$admindir/cvs.sh $@ ;\ fi ! configure.in: configure.files $(shell test -f configure.files && cat configure.files) subdirs configure.files: subdirs --- 22,32 ---- fi; \ if test "$@" = "package-merge"; then \ ! MAKE="$(MAKE)" POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \ $(SHELL) $$admindir/cvs.sh package-merge ;\ ! else \ ! MAKE="$(MAKE)" $(SHELL) $$admindir/cvs.sh $@ ;\ fi ! configure.in: configure.files subdirs configure.files: subdirs Index: acinclude.m4.in =================================================================== RCS file: /cvsroot/kbear/kbear/admin/acinclude.m4.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** acinclude.m4.in 8 Oct 2003 20:48:01 -0000 1.18 --- acinclude.m4.in 12 Apr 2005 13:06:44 -0000 1.19 *************** *** 27,44 **** dnl and kdebase or configure.in.in if present. - dnl ------------------------------------------------------------------------ - dnl Forward compatibility macros (make autoconf 2.13 look like 2.50), - dnl thanks to Raja R Harinath. - dnl ------------------------------------------------------------------------ - dnl - ifdef([_AC_PATH_X_XMKMF],[], - [AC_DEFUN([_AC_PATH_X_XMKMF],[AC_PATH_X_XMKMF])]) - ifdef([AC_OUTPUT_SUBDIRS],[], [...5071 lines suppressed...] + fi + + ]) + + dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in) + dnl which allows to search for libs that get installed into the KDE prefix. + dnl + dnl Syntax: KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not) + dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page + dnl also defines KSTUFF_PKG_ERRORS on error + AC_DEFUN([KDE_PKG_CHECK_MODULES], [ + + PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH" + if test "$prefix" != "$kde_libs_prefix"; then + PKG_CONFIG_PATH="$kde_libs_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" + fi + export PKG_CONFIG_PATH + PKG_CHECK_MODULES($1,$2,$3,$4) + ]) + Index: am_edit =================================================================== RCS file: /cvsroot/kbear/kbear/admin/am_edit,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** am_edit 21 Jul 2003 18:06:52 -0000 1.17 --- am_edit 12 Apr 2005 13:06:44 -0000 1.18 *************** *** 32,35 **** --- 32,36 ---- # David Faure <fa...@kd...> # Stephan Kulow <co...@kd...> + # Dirk Mueller <mu...@kd...> use Cwd; *************** *** 51,54 **** --- 52,56 ---- sub checkMocCandidates (); [...1367 lines suppressed...] *************** *** 2036,2037 **** --- 2429,2445 ---- #----------------------------------------------------------------------------- + + # find the .kcfg file listed in the .kcfgc file + sub findKcfgFile($) + { + my ($kcfgf) = @_; + open (KCFGFIN, $kcfgf) || die "Could not open $kcfgf: $!\n"; + seek(KCFGFIN, 0, 2); + my $kcfgfsize = tell(KCFGFIN); + seek(KCFGFIN, 0, 0); + read KCFGFIN, $kcfgfData, $kcfgfsize; + close KCFGFIN; + if(($kcfgfData =~ m/^File=(.*\.kcfg)/gm)) { + $kcfg = $1; + } + } Index: conf.change.pl =================================================================== RCS file: /cvsroot/kbear/kbear/admin/conf.change.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** conf.change.pl 25 Mar 2002 22:08:19 -0000 1.4 --- conf.change.pl 12 Apr 2005 13:06:44 -0000 1.5 *************** *** 1,3 **** ! #!/usr/bin/perl -w # this script patches a config.status file, to use our own perl script --- 1,3 ---- ! #!/usr/bin/env perl # this script patches a config.status file, to use our own perl script *************** *** 28,36 **** # 2. the big main loop which patches all Makefile.in's use File::Basename; my $ac_aux_dir = dirname($0); my ($flag); ! local $ac_version = 0; my $vpath_seen = 0; $flag = 0; --- 28,37 ---- # 2. the big main loop which patches all Makefile.in's + use strict; use File::Basename; my $ac_aux_dir = dirname($0); my ($flag); ! my $ac_version = 0; my $vpath_seen = 0; $flag = 0; *************** *** 79,82 **** --- 80,88 ---- # end with: "rm -f conftest.s\*" # on autoconf 250, it ends with '# CONFIG_HEADER section' + # + # gg: if a post-processing commands section is found first, + # stop there and insert a new loop to honor the case/esac. + # (pattern: /^\s+#\sRun the commands associated with the file./) + if (/^\s*for\s+ac_file\s+in\s+.*CONFIG_FILES/ ) { $flag = 3; *************** *** 95,101 **** print STDERR "hmm, don't know autoconf version\n"; } ! } elsif (/^\#\s*CONFIG_HEADER section.*/) { $flag = 4; &insert_main_loop(); if($ac_version != 250) { print STDERR "hmm, something went wrong :-(\n"; --- 101,109 ---- print STDERR "hmm, don't know autoconf version\n"; } ! } elsif (/^\#\s*CONFIG_(HEADER|COMMANDS) section.*|^\s+#\s(Run) the commands associated/) { $flag = 4; + my $commands = defined $2; &insert_main_loop(); + $commands && insert_command_loop(); if($ac_version != 250) { print STDERR "hmm, something went wrong :-(\n"; *************** *** 176,177 **** --- 184,191 ---- return; } + + sub insert_command_loop { + print <<EOF; + for ac_file in .. \$CONFIG_FILES ; do + EOF + } Index: config.guess =================================================================== RCS file: /cvsroot/kbear/kbear/admin/config.guess,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** config.guess 21 Nov 2002 15:58:42 -0000 1.6 --- config.guess 12 Apr 2005 13:06:44 -0000 1.7 *************** *** 2,8 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002 Free Software Foundation, Inc. ! timestamp='2002-10-21' # This file is free software; you can redistribute it and/or modify it --- 2,8 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-06-24' # This file is free software; you can redistribute it and/or modify it *************** *** 54,58 **** Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. --- 54,58 ---- Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. *************** *** 99,110 **** # use `HOST_CC' if defined, but it is deprecated. ! # This shell variable is my proudest work .. or something. --bje ! set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; ! (old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) ! || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; ! dummy=$tmpdir/dummy ; ! files="$dummy.c $dummy.o $dummy.rel $dummy" ; ! trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > $dummy.c ; --- 99,114 ---- # use `HOST_CC' if defined, but it is deprecated. ! # Portable tmp directory creation inspired by the Autoconf team. ! set_cc_for_build=' ! trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ! trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; ! : ${TMPDIR=/tmp} ; ! { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ! { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || ! { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || ! { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; ! dummy=$tmp/dummy ; ! tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > $dummy.c ; *************** *** 114,118 **** fi ; done ; - rm -f $files ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; --- 118,121 ---- *************** *** 121,126 **** ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac ; ! unset files' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. --- 124,128 ---- ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. *************** *** 179,183 **** esac # The OS release ! release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: --- 181,196 ---- esac # The OS release ! # Debian GNU/NetBSD machines have a different userland, and ! # thus, need a distinct triplet. However, they do not need ! # kernel version information, so it can be replaced with a ! # suitable tag, in the style of linux-gnu. ! case "${UNAME_VERSION}" in ! Debian*) ! release='-gnu' ! ;; ! *) ! release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ! ;; ! esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: *************** *** 185,188 **** --- 198,204 ---- echo "${machine}-${os}${release}" exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} *************** *** 191,197 **** --- 207,219 ---- echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} *************** *** 224,292 **** echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; alpha:OSF1:*:*) ! if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ! fi # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. ! eval $set_cc_for_build ! cat <<EOF >$dummy.s ! .data ! \$Lformat: ! .byte 37,100,45,37,120,10,0 # "%d-%x\n" ! ! .text ! .globl main ! .align 4 ! .ent main ! main: ! .frame \$30,16,\$26,0 ! ldgp \$29,0(\$27) ! .prologue 1 ! .long 0x47e03d80 # implver \$0 ! lda \$2,-1 ! .long 0x47e20c21 # amask \$2,\$1 ! lda \$16,\$Lformat ! mov \$0,\$17 ! not \$1,\$18 ! jsr \$26,printf ! ldgp \$29,0(\$26) ! mov 0,\$16 ! jsr \$26,exit ! .end main ! EOF ! $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null ! if test "$?" = 0 ; then ! case `$dummy` in ! 0-0) ! UNAME_MACHINE="alpha" ! ;; ! 1-0) ! UNAME_MACHINE="alphaev5" ! ;; ! 1-1) ! UNAME_MACHINE="alphaev56" ! ;; ! 1-101) ! UNAME_MACHINE="alphapca56" ! ;; ! 2-303) ! UNAME_MACHINE="alphaev6" ! ;; ! 2-307) ! UNAME_MACHINE="alphaev67" ! ;; ! 2-1307) ! UNAME_MACHINE="alphaev68" ! ;; ! 3-1307) ! UNAME_MACHINE="alphaev7" ! ;; ! esac ! fi ! rm -f $dummy.s $dummy && rmdir $tmpdir ! echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) --- 246,310 ---- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) ! case $UNAME_RELEASE in ! *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ! ;; ! *5.*) ! UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ! ;; ! esac ! # According to Compaq, /usr/sbin/psrinfo has been available on ! # OSF/1 and Tru64 systems produced since 1995. I hope that ! # covers most systems running today. This code pipes the CPU ! # types through head -n 1, so we only detect the type of CPU 0. ! ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` ! case "$ALPHA_CPU_TYPE" in ! "EV4 (21064)") ! UNAME_MACHINE="alpha" ;; ! "EV4.5 (21064)") ! UNAME_MACHINE="alpha" ;; ! "LCA4 (21066/21068)") ! UNAME_MACHINE="alpha" ;; ! "EV5 (21164)") ! UNAME_MACHINE="alphaev5" ;; ! "EV5.6 (21164A)") ! UNAME_MACHINE="alphaev56" ;; ! "EV5.6 (21164PC)") ! UNAME_MACHINE="alphapca56" ;; ! "EV5.7 (21164PC)") ! UNAME_MACHINE="alphapca57" ;; ! "EV6 (21264)") ! UNAME_MACHINE="alphaev6" ;; ! "EV6.7 (21264A)") ! UNAME_MACHINE="alphaev67" ;; ! "EV6.8CB (21264C)") ! UNAME_MACHINE="alphaev68" ;; ! "EV6.8AL (21264B)") ! UNAME_MACHINE="alphaev68" ;; ! "EV6.8CX (21264D)") ! UNAME_MACHINE="alphaev68" ;; ! "EV6.9A (21264/EV69A)") ! UNAME_MACHINE="alphaev69" ;; ! "EV7 (21364)") ! UNAME_MACHINE="alphaev7" ;; ! "EV7.9 (21364A)") ! UNAME_MACHINE="alphaev79" ;; ! esac ! # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. ! echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) *************** *** 311,314 **** --- 329,335 ---- echo i370-ibm-openedition exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} *************** *** 328,331 **** --- 349,355 ---- echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in *************** *** 400,403 **** --- 424,430 ---- echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} *************** *** 440,445 **** $CC_FOR_BUILD -o $dummy $dummy.c \ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ! && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; --- 467,471 ---- $CC_FOR_BUILD -o $dummy $dummy.c \ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ! && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; *************** *** 450,454 **** echo powerpc-harris-powermax exit 0 ;; ! Night_Hawk:*:*:PowerMAX_OS) echo powerpc-harris-powermax exit 0 ;; --- 476,480 ---- echo powerpc-harris-powermax exit 0 ;; ! Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax exit 0 ;; *************** *** 525,530 **** } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then --- 551,555 ---- } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then *************** *** 625,632 **** EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ! if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi ! rm -f $dummy.c $dummy && rmdir $tmpdir fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; --- 650,667 ---- EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ! test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; *************** *** 662,667 **** } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir echo unknown-hitachi-hiuxwe2 exit 0 ;; --- 697,701 ---- } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; *************** *** 721,727 **** echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' --- 755,758 ---- *************** *** 730,733 **** --- 761,767 ---- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` *************** *** 736,739 **** --- 770,778 ---- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} *************** *** 746,762 **** exit 0 ;; *:FreeBSD:*:*) ! # Determine whether the default compiler uses glibc. ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #include <features.h> ! #if __GLIBC__ >= 2 ! LIBC=gnu ! #else ! LIBC= ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! rm -f $dummy.c && rmdir $tmpdir ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) --- 785,789 ---- exit 0 ;; *:FreeBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; i*:CYGWIN*:*) *************** *** 769,774 **** echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; ! x86:Interix*:3*) ! echo i386-pc-interix3 exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) --- 796,804 ---- echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; ! x86:Interix*:[34]*) ! echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' ! exit 0 ;; ! [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) ! echo i${UNAME_MACHINE}-pc-mks exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) *************** *** 776,780 **** # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? ! echo i386-pc-interix exit 0 ;; i*:UWIN*:*) --- 806,810 ---- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? ! echo i586-pc-interix exit 0 ;; i*:UWIN*:*) *************** *** 788,793 **** --- 818,828 ---- exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix *************** *** 796,802 **** --- 831,843 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu *************** *** 819,824 **** EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! rm -f $dummy.c && rmdir $tmpdir ! test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 ;; ppc:Linux:*:*) --- 860,883 ---- EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ! ;; ! mips64:Linux:*:*) ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #undef CPU ! #undef mips64 ! #undef mips64el ! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mips64el ! #else ! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips64 ! #else ! CPU= ! #endif ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) *************** *** 856,859 **** --- 915,921 ---- echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu *************** *** 913,919 **** #endif #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 --- 975,983 ---- #endif #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 *************** *** 933,936 **** --- 997,1020 ---- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` *************** *** 967,973 **** fi exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; pc:*:*:*) # Left here for compatibility: --- 1051,1054 ---- *************** *** 996,1002 **** echo m68k-convergent-sysv exit 0 ;; ! M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ --- 1077,1086 ---- echo m68k-convergent-sysv exit 0 ;; ! M680?0:D-NIX:5.3:*) ! echo m68k-diab-dnix ! exit 0 ;; ! M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ *************** *** 1015,1021 **** echo m68k-atari-sysv4 exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} --- 1099,1102 ---- *************** *** 1099,1103 **** exit 0 ;; *:Darwin:*:*) ! echo `uname -p`-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) --- 1180,1188 ---- exit 0 ;; *:Darwin:*:*) ! case `uname -p` in ! *86) UNAME_PROCESSOR=i686 ;; ! powerpc) UNAME_PROCESSOR=powerpc ;; ! esac ! echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) *************** *** 1112,1116 **** echo i386-pc-qnx exit 0 ;; ! NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; --- 1197,1201 ---- echo i386-pc-qnx exit 0 ;; ! NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *************** *** 1135,1143 **** echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 --- 1220,1223 ---- *************** *** 1158,1167 **** echo pdp10-unknown-its exit 0 ;; ! i*86:XTS-300:*:STOP) ! echo ${UNAME_MACHINE}-unknown-stop exit 0 ;; ! i*86:atheos:*:*) ! echo ${UNAME_MACHINE}-unknown-atheos exit 0 ;; esac --- 1238,1254 ---- echo pdp10-unknown-its exit 0 ;; ! SEI:*:*:SEIUX) ! echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; ! *:DragonFly:*:*) ! echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac *************** *** 1284,1289 **** EOF ! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir # Apollos put the system type in the environment. --- 1371,1375 ---- EOF ! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. Index: config.pl =================================================================== RCS file: /cvsroot/kbear/kbear/admin/config.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config.pl 8 Oct 2002 18:12:24 -0000 1.4 --- config.pl 12 Apr 2005 13:06:44 -0000 1.5 *************** *** 1,3 **** ! #!/usr/bin/perl # a script for use by autoconf to make the Makefiles # from the Makefile.in's --- 1,3 ---- ! #!/usr/bin/env perl # a script for use by autoconf to make the Makefiles # from the Makefile.in's *************** *** 29,32 **** --- 29,36 ---- # Boston, MA 02111-1307, USA. + use strict; + + use File::Path; + my $ac_subs=$ARGV[0]; my $ac_sacfiles = $ARGV[1]; *************** *** 34,37 **** --- 38,44 ---- my $ac_given_INSTALL=$ARGV[3]; + my @comp_match; + my @comp_subs; + #print "ac_subs=$ac_subs\n"; #print "ac_sacfiles=$ac_sacfiles\n"; *************** *** 39,45 **** --- 46,54 ---- #print "ac_given_INSTALL=$ac_given_INSTALL\n"; + my $configure_input; my ($srcdir, $top_srcdir); my $INSTALL; my $bad_perl = ($] < 5.005); + my $created_file_count = 0; open(CF, "< $ac_subs") || die "can't open $ac_subs: $!"; *************** *** 95,99 **** push @comp_subs, ""; } else { ! die "Uhh. Malformed pattern in $ac_cs_root.subs ($pat)" unless ( $pat =~ /^\s*$/ ); # ignore white lines } --- 104,108 ---- push @comp_subs, ""; } else { ! die "Uhh. Malformed pattern in $ac_subs ($pat)" unless ( $pat =~ /^\s*$/ ); # ignore white lines } *************** *** 131,135 **** if ( ($ac_dir ne $ac_file) && ($ac_dir ne ".")) { # The file is in a subdirectory. ! if (! -d "$ac_dir") { mkdir "$ac_dir", 0777; } ($ac_dir_suffix = $ac_dir) =~ s%^./%%; $ac_dir_suffix="/".$ac_dir_suffix; --- 140,144 ---- if ( ($ac_dir ne $ac_file) && ($ac_dir ne ".")) { # The file is in a subdirectory. ! if (! -d "$ac_dir") { mkpath "$ac_dir", 0, 0777; } ($ac_dir_suffix = $ac_dir) =~ s%^./%%; $ac_dir_suffix="/".$ac_dir_suffix; *************** *** 167,174 **** my $fname=$ac_file_in; $fname =~ s%.*/%%; ! my $configure_input="Generated automatically from $fname by config.pl."; ! if ($ac_file =~ /.*[Mm]akefile.*/) { ! $ac_comsub="# ".$configure_input."\n"; # for the first line in $ac_file ! } my $ac_file_inputs; --- 176,180 ---- my $fname=$ac_file_in; $fname =~ s%.*/%%; ! $configure_input="$ac_file. Generated from $fname by config.pl."; my $ac_file_inputs; *************** *** 176,184 **** $ac_file_inputs =~ s%:% $ac_given_srcdir/%g; ! patch_file($ac_file, $ac_file_inputs, $ac_comsub); } sub patch_file { ! my ($outf, $infiles, $identline) = @_; my $filedata; my @infiles=split(' ', $infiles); --- 182,193 ---- $ac_file_inputs =~ s%:% $ac_given_srcdir/%g; ! patch_file($ac_file, $ac_file_inputs); ! ++$created_file_count; } + print "config.pl: fast created $created_file_count file(s).\n"; + sub patch_file { ! my ($outf, $infiles) = @_; my $filedata; my @infiles=split(' ', $infiles); *************** *** 195,202 **** } } - if ($identline) { - # Put the ident in the second line. For shitty automake 1.6x. - $filedata =~ s%\n%\n$identline%; - } $filedata =~ s%\@configure_input\@%$configure_input%g; --- 204,207 ---- *************** *** 224,232 **** sub make_closure { my ($pat, $sub) = @_; ! $pat =~ s/\@/\\@/g; # @bla@ -> \@bla\@ ! $pat =~ s/\$/\\\$/g; # $bla -> \$bla ! $sub =~ s/\@/\\@/g; ! $sub =~ s/\$/\\\$/g; ! my $ret = eval "return sub { my \$ref=shift; \$\$ref =~ s%$pat%$sub%g; }"; if ($@) { print "can't create CODE: $@\n"; --- 229,233 ---- sub make_closure { my ($pat, $sub) = @_; ! my $ret = eval "return sub { my \$ref=shift; \$\$ref =~ s%\Q$pat\E%\Q$sub\E%g; }"; if ($@) { print "can't create CODE: $@\n"; Index: config.sub =================================================================== RCS file: /cvsroot/kbear/kbear/admin/config.sub,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** config.sub 21 Nov 2002 15:58:42 -0000 1.6 --- config.sub 12 Apr 2005 13:06:44 -0000 1.7 *************** *** 2,8 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002 Free Software Foundation, Inc. ! timestamp='2002-09-05' # This file is (in principle) common to ALL GNU software. --- 2,8 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-06-24' # This file is (in principle) common to ALL GNU software. *************** *** 71,75 **** GNU config.sub ($timestamp... [truncated message content] |
