[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs ChangeLog Makefile.in config.h.in configur...
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] ccvs ChangeLog Makefile.in config.h.in configur... |
Date: |
Tue, 21 Aug 2007 22:37:40 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Changes by: Derek Robert Price <dprice> 07/08/21 22:37:40
Modified files:
. : ChangeLog Makefile.in config.h.in configure
configure.in
Log message:
* configure.in: Set package configuration string here (e.g.
"client/server").
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/ChangeLog?cvsroot=cvs&r1=1.1354&r2=1.1355
http://cvs.savannah.gnu.org/viewcvs/ccvs/Makefile.in?cvsroot=cvs&r1=1.203&r2=1.204
http://cvs.savannah.gnu.org/viewcvs/ccvs/config.h.in?cvsroot=cvs&r1=1.224&r2=1.225
http://cvs.savannah.gnu.org/viewcvs/ccvs/configure?cvsroot=cvs&r1=1.481&r2=1.482
http://cvs.savannah.gnu.org/viewcvs/ccvs/configure.in?cvsroot=cvs&r1=1.379&r2=1.380
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/ChangeLog,v
retrieving revision 1.1354
retrieving revision 1.1355
diff -u -b -r1.1354 -r1.1355
--- ChangeLog 21 Aug 2007 18:42:50 -0000 1.1354
+++ ChangeLog 21 Aug 2007 22:37:39 -0000 1.1355
@@ -1,5 +1,8 @@
2007-08-21 Derek Price <address@hidden>
+ * configure.in: Set package configuration string here (e.g.
+ "client/server").
+
* HACKING: Note Autoconf 2.61 and Automake 1.10 are used in
development.
* NEWS: Note same and why.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/Makefile.in,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -b -r1.203 -r1.204
--- Makefile.in 21 Aug 2007 18:42:50 -0000 1.203
+++ Makefile.in 21 Aug 2007 22:37:39 -0000 1.204
@@ -268,6 +268,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_CONFIG = @PACKAGE_CONFIG@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
Index: config.h.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/config.h.in,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -b -r1.224 -r1.225
--- config.h.in 21 Aug 2007 18:42:51 -0000 1.224
+++ config.h.in 21 Aug 2007 22:37:39 -0000 1.225
@@ -1043,6 +1043,10 @@
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
+/* Define this to PACKAGE_STRING plus configuration data ("(client)",
+ "(client/server)", etc.). */
+#undef PACKAGE_CONFIG
+
/* Define to the full name of this package. */
#undef PACKAGE_NAME
Index: configure
===================================================================
RCS file: /cvsroot/cvs/ccvs/configure,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -b -r1.481 -r1.482
--- configure 21 Aug 2007 18:42:51 -0000 1.481
+++ configure 21 Aug 2007 22:37:39 -0000 1.482
@@ -821,6 +821,7 @@
with_default_rsh
RSH_DFLT
EDITOR
+PACKAGE_CONFIG
LTLIBOBJS'
ac_subst_files='MKTEMP_SH_FUNCTION'
ac_precious_vars='build_alias
@@ -46998,6 +46999,34 @@
+if test x"$enable_client" != xno; then
+ if test x"$enable_server" != xno; then
+ # yes,yes
+ PACKAGE_APPEND=" (client/server)"
+ else
+ # yes,no
+ PACKAGE_APPEND=" (client)"
+ fi
+else
+ if test x"$enable_server" != xno; then
+ # no,yes
+ PACKAGE_APPEND=" (server)"
+ else
+ # no,no
+ # no change
+ PACKAGE_APPEND=
+ fi
+fi
+PACKAGE_CONFIG="Concurrent Versions System (CVS) 1.12.13.1$PACKAGE_APPEND"
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_CONFIG "$PACKAGE_CONFIG"
+_ACEOF
+
+
+
+
{ echo "$as_me:$LINENO: checking for cygwin32" >&5
echo $ECHO_N "checking for cygwin32... $ECHO_C" >&6; }
@@ -48045,7 +48074,7 @@
with_default_rsh!$with_default_rsh$ac_delim
RSH_DFLT!$RSH_DFLT$ac_delim
EDITOR!$EDITOR$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
+PACKAGE_CONFIG!$PACKAGE_CONFIG$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -48084,6 +48113,50 @@
_ACEOF
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
+_ACEOF
+
+
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
@@ -48333,7 +48406,7 @@
s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed
's/|#_!!_#|//g' >$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed
-f "$tmp/subs-3.sed" >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
Index: configure.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/configure.in,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -b -r1.379 -r1.380
--- configure.in 21 Aug 2007 18:42:52 -0000 1.379
+++ configure.in 21 Aug 2007 22:37:40 -0000 1.380
@@ -1536,6 +1536,36 @@
+dnl
+dnl Now that the enables have been processed, append to the package string as
+dnl required.
+dnl
+if test x"$enable_client" != xno; then
+ if test x"$enable_server" != xno; then
+ # yes,yes
+ PACKAGE_APPEND=" (client/server)"
+ else
+ # yes,no
+ PACKAGE_APPEND=" (client)"
+ fi
+else
+ if test x"$enable_server" != xno; then
+ # no,yes
+ PACKAGE_APPEND=" (server)"
+ else
+ # no,no
+ # no change
+ PACKAGE_APPEND=
+ fi
+fi
+PACKAGE_CONFIG="AS_ESCAPE(AC_PACKAGE_STRING)$PACKAGE_APPEND"
+AC_SUBST([PACKAGE_CONFIG])
+AC_DEFINE_UNQUOTED([PACKAGE_CONFIG], ["$PACKAGE_CONFIG"],
+ [Define this to PACKAGE_STRING plus configuration data
+ ("(client)", "(client/server)", etc.).])
+
+
+
dnl For the moment we will assume that all systems which have
dnl the unixyness to run configure are unixy enough to do the
dnl PreservePermissions stuff. I have this sinking feeling that
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs ChangeLog Makefile.in config.h.in configur...,
Derek Robert Price <=