[freeside-commits] freeside/rt config.status, 1.4, 1.5 Makefile, 1.7, 1.8
Ivan,,,
ivan at wavetail.420.am
Thu Dec 31 06:08:12 PST 2009
Update of /home/cvs/cvsroot/freeside/rt
In directory wavetail.420.am:/tmp/cvs-serv1950
Modified Files:
config.status Makefile
Log Message:
install-sh????
Index: config.status
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/config.status,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config.status 31 Dec 2009 13:59:58 -0000 1.4
+++ config.status 31 Dec 2009 14:08:10 -0000 1.5
@@ -249,10 +249,25 @@
# Open the log real soon, to keep \$[0] and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
+<<<<<<< config.status
+# values after options handling. Logging --version etc. is OK.
+exec 5>>config.log
+{
+ echo
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+} >&5
+cat >&5 <<_CSEOF
+
+This file was extended by RT $as_me 3.6.6, which was
+generated by GNU Autoconf 2.59. Invocation command line was
+=======
# values after options handling.
ac_log="
This file was extended by RT $as_me 3.8.7, which was
generated by GNU Autoconf 2.64. Invocation command line was
+>>>>>>> 1.4
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -285,9 +300,15 @@
Report bugs to <bug-autoconf at gnu.org>."
ac_cs_version="\
+<<<<<<< config.status
+RT config.status 3.6.6
+configured by ./configure, generated by GNU Autoconf 2.59,
+ with options \"'--enable-layout=Freeside' '--with-db-type=Pg' '--with-db-dba=freeside' '--with-db-database=freeside' '--with-db-rt-user=freeside' '--with-db-rt-pass=' '--with-web-user=freeside' '--with-web-group=freeside' '--with-rt-group=freeside'\"
+=======
RT config.status 3.8.7
configured by ./configure, generated by GNU Autoconf 2.64,
with options \"'--with-db-type=SQLite' '--enable-layout=relative' '--with-web-handler=standalone' 'PERL=/usr/bin/perl'\"
+>>>>>>> 1.4
Copyright (C) 2003 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
@@ -295,7 +316,7 @@
ac_pwd='/Users/falcone/work/rt/releases/rt-3.8.7'
srcdir='.'
-INSTALL='install-sh'
+INSTALL='install'
AWK='gawk'
test -n "$AWK" || AWK=awk
# The default lists apply if the user does not specify any file.
@@ -640,8 +661,8 @@
s, at PATH_SEPARATOR@,:,;t t
s, at PACKAGE_NAME@,RT,;t t
s, at PACKAGE_TARNAME@,rt,;t t
-s, at PACKAGE_VERSION@,3.6.4,;t t
-s, at PACKAGE_STRING@,RT 3.6.4,;t t
+s, at PACKAGE_VERSION@,3.6.6,;t t
+s, at PACKAGE_STRING@,RT 3.6.6,;t t
s, at PACKAGE_BUGREPORT@,rt-bugs at bestpractical.com,;t t
s, at exec_prefix@,/opt/rt3,;t t
s, at prefix@,/opt/rt3,;t t
@@ -661,18 +682,18 @@
s, at build_alias@,,;t t
s, at host_alias@,,;t t
s, at target_alias@,,;t t
-s, at DEFS@,-DPACKAGE_NAME=\"RT\" -DPACKAGE_TARNAME=\"rt\" -DPACKAGE_VERSION=\"3.6.4\" -DPACKAGE_STRING=\"RT\ 3.6.4\" -DPACKAGE_BUGREPORT=\"rt-bugs at bestpractical.com\" ,;t t
+s, at DEFS@,-DPACKAGE_NAME=\"RT\" -DPACKAGE_TARNAME=\"rt\" -DPACKAGE_VERSION=\"3.6.6\" -DPACKAGE_STRING=\"RT\ 3.6.6\" -DPACKAGE_BUGREPORT=\"rt-bugs at bestpractical.com\" ,;t t
s, at ECHO_C@,,;t t
s, at ECHO_N@,-n,;t t
s, at ECHO_T@,,;t t
s, at LIBS@,,;t t
s, at rt_version_major@,3,;t t
s, at rt_version_minor@,6,;t t
-s, at rt_version_patch@,4,;t t
+s, at rt_version_patch@,6,;t t
s, at INSTALL_PROGRAM@,${INSTALL},;t t
s, at INSTALL_SCRIPT@,${INSTALL},;t t
s, at INSTALL_DATA@,${INSTALL} -m 644,;t t
-s, at AWK@,gawk,;t t
+s, at AWK@,mawk,;t t
s, at PERL@,/usr/bin/perl,;t t
s, at SPEEDY_BIN@,/usr/local/bin/speedy,;t t
s, at exp_prefix@,/opt/rt3,;t t
@@ -720,12 +741,12 @@
s, at WEB_USER@,freeside,;t t
s, at WEB_GROUP@,freeside,;t t
s, at RTGROUP@,freeside,;t t
-s, at APACHECTL@,/usr/sbin/apachectl,;t t
+s, at APACHECTL@,,;t t
s, at RT_STANDALONE@,0,;t t
s, at RT_DEVEL_MODE@,0,;t t
s, at RT_VERSION_MAJOR@,3,;t t
s, at RT_VERSION_MINOR@,6,;t t
-s, at RT_VERSION_PATCH@,4,;t t
+s, at RT_VERSION_PATCH@,6,;t t
s, at RT_PATH@,/opt/rt3,;t t
s, at RT_DOC_PATH@,/opt/rt3/share/doc,;t t
s, at RT_LOCAL_PATH@,/opt/rt3/local,;t t
Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile 31 Dec 2009 13:59:58 -0000 1.7
+++ Makefile 31 Dec 2009 14:08:10 -0000 1.8
@@ -52,7 +52,7 @@
PERL = /usr/bin/perl
-INSTALL = install-sh
+INSTALL = install
RT_LAYOUT = relative
More information about the freeside-commits
mailing list