Check-in [2086fbe318]
Overview
Comment:Moved copying in of automake/autoconf files to autogen from build
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:2086fbe31877f3ad9c9d35e65aa966afeb6a836a
User & Date: rkeene on 2012-07-30 05:07:01
Other Links: manifest | tags
Context
2012-07-30
16:02
Updated email address in CACKey for OSX Build Script check-in: 003e5de0f0 user: kvanals tags: trunk
05:07
Moved copying in of automake/autoconf files to autogen from build check-in: 2086fbe318 user: rkeene tags: trunk
05:06
Updated to cache certificate information

Added a C_FindObject() speed test macro

Updated to reset slot less frequently check-in: a5af46b2b5 user: rkeene tags: trunk

Changes

Modified autogen.sh from [c540dfc874] to [daf2ac0fe1].

     2      2   
     3      3   rm -f aclocal.m4
     4      4   
     5      5   ${MAKE:-make} -C aclocal
     6      6   autoconf; autoheader
     7      7   
     8      8   rm -rf autom4te.cache/
            9  +
           10  +for basefile in install-sh config.sub config.guess; do
           11  +	for path in /usr/share/automake-*; do
           12  +		file="${path}/${basefile}"
           13  +		if [ -f "${file}" ]; then
           14  +			cp "${file}" .
           15  +			chmod 755 "./${basefile}"
           16  +
           17  +			break
           18  +		fi
           19  +	done
           20  +done

Modified build/build.sh from [d3813a4238] to [48fe009c68].

     1      1   #! /bin/sh
     2      2   
     3      3   find . -type f -name '.*.sw?' | xargs rm -f
     4      4   find . -type f -name '.nfs*' | xargs rm -f
            5  +find . -type f -name '*~' | xargs rm -f
     5      6   
     6      7   if [ "${SNAPSHOT}" = "1" ]; then
     7      8   	sed "s@\(AC_INIT([^)]*\))@\1.${VERS})@" configure.ac > configure.ac.new
     8      9   	cat configure.ac.new > configure.ac
     9     10   	rm -f configure.ac.new
    10     11   fi
    11     12   
    12     13   ./autogen.sh || exit 1
    13     14   
    14     15   if [ ! -x configure ]; then
    15     16   	exit 1
    16     17   fi
    17     18   
    18         -for basefile in install-sh config.sub config.guess; do
    19         -	for path in /usr/share/automake-*; do
    20         -		file="${path}/${basefile}"
    21         -		if [ -f "${file}" ]; then
    22         -			cp "${file}" .
    23         -			chmod 755 "./${basefile}"
    24         -
    25         -			break
    26         -		fi
    27         -	done
    28         -done
    29         -
    30     19   if [ "${SNAPSHOT}" != "1" ]; then
    31     20   	mv build build_delete
    32     21   
    33     22   	mkdir build || exit 1
    34     23   	cp -rp build_delete/cackey_win32_build build/
    35     24   	cp -rp build_delete/cackey_win64_build build/
    36     25   fi
    37     26   
    38     27   exit 0