diff options
| -rw-r--r-- | ChangeLog-99b | 18 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | m4/acinclude.m4 | 23 |
3 files changed, 50 insertions, 2 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index f80fec13857..03b0176a724 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,21 @@ +Mon Apr 5 19:42:11 1999 Ossama Othman <othman@cs.wustl.edu> + + * configure.in: + * m4/acinclude.m4: + + Created the macro ACE_CHECK_FOR_CVS_DIR to prevent the configure + script from continuing the configuration if the current + configuration directory is in a CVS controlled directory. The + idea is to prevent automatically generated files from being + checked into the repository. This will prevent accidental + overwrites of ACE's current Makefiles by the automatically + generated ones, for example. + + In addition, this should ease the transition from the current + Makefile scheme to the new Auto{conf,make}/libtool scheme since + the current Makefiles can remain under CVS control without + the generate Makefiles interfering with them. + Mon Apr 05 17:02:46 1999 David L. Levine <levine@cs.wustl.edu> * ace/High_Res_Timer.cpp (global_scale_factor ()): removed diff --git a/configure.in b/configure.in index 0be9bab159f..213f08829c9 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl dnl $Id$ -AC_REVISION($Revision 0.58 $)dnl +AC_REVISION($Revision 0.59 $)dnl dnl dnl An autoconf script to automatically configure ACE. @@ -41,6 +41,13 @@ AC_INIT(ace/ACE.cpp) dnl Require GNU Autoconf 2.13 or better. AC_PREREQ(2.13) +dnl If we are configuring in a CVS controlled directory then don't +dnl continue any further. The idea is to prevent automatically +dnl generated files from being checked into the repository. This +dnl will prevent accidental overwrites of ACE's current Makefiles by +dnl the automatically generated ones, for example. +ACE_CHECK_FOR_CVS_DIR + dnl Check what platform we are running on. AC_CANONICAL_SYSTEM @@ -129,7 +136,7 @@ AC_SUBST(ACE_AGE) AC_SUBST(ACE_REVISION) dnl Do the usual install settings; don't forget to include a -dnl install-sh script, in case the is no BDS compatible install +dnl `install-sh' script, in case there is no BSD compatible `install' dnl installed (no pun intended) in your machine. dnl dnl We don't need this anymore since AM_INIT_AUTOMAKE calls AC_PROG_INSTALL. diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 6311377d810..a0c87046af8 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -23,6 +23,29 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. dnl miscellaneous macros +dnl Prevent the configure script continuing any further if a CVS control +dnl directory is found. The idea is to prevent files generated during +dnl configuration and build from be checked in to the CVS repository that +dnl the sources are checked into. This should only be an issue for +dnl maintainers, not end-users. Maintainers should configure and build in +dnl a directory that doesn't contain any CVS controlled sources and files, +dnl i.e. that doesn't contain a CVS directory. +dnl +dnl Usage: ACE_CHECK_FOR_CVS_DIR +AC_DEFUN(ACE_CHECK_FOR_CVS_DIR, +[ + if test -d CVS; then + AC_MSG_ERROR( + [ + This error is meant for maintainers: + + Please configure and build in a non-CVS controlled directory. + Doing so will prevent accidentally committing automatically + generated files into the CVS repository and help ensure that + the generated files and build scheme are correct. + ]) + fi +]) dnl Add compiler flags to the CXXFLAGS and CFLAGS variables when doing an dnl AC_TRY_COMPILE (not ACE_TRY_COMPILE). |