diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 1999-11-29 00:47:10 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 1999-11-29 00:47:10 +0000 |
| commit | d9296e3880acf4f07dbfaf378e3213c6449cc9a4 (patch) | |
| tree | 3639771e73ce70e0c57b905b840e733ae2881fd0 | |
| parent | f8e906a83c3595d9b3b27679552f0fd50be9af0c (diff) | |
| download | ATCD-d9296e3880acf4f07dbfaf378e3213c6449cc9a4.tar.gz | |
Fixed the ACE_TEMP_USE_FILE M4 macro again. I inadvertently introduced
some problems with my last set of updates/fixes.
| -rw-r--r-- | m4/acinclude.m4 | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 542a7a0857b..c9c5f11f2b2 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -90,16 +90,13 @@ dnl header when doing an AC_TRY_COMPILE. dnl Usage: ACE_USE_TEMP_FILE(TEMP-FILE-TO-CREATE, COMMANDS-THAT-WILL-USE-IT) AC_DEFUN(ACE_USE_TEMP_FILE, dnl [ - if test -f ${srcdir}/$1; then - mv ${srcdir}/$1 ${srcdir}/$1.conf - touch ${srcdir}/$1 - fi - if test $srcdir != "."; then - if test -f ./$1; then - mv ./$1 ./$1.conf - touch ./$1 - fi + test -f ${srcdir}/$1 && mv ${srcdir}/$1 ${srcdir}/$1.conf + touch ${srcdir}/$1 + + if test ${srcdir}/$1 != "./$1"; then + test -f ./$1 && mv ./$1 ./$1.conf + touch ./$1 fi $2 @@ -110,7 +107,7 @@ AC_DEFUN(ACE_USE_TEMP_FILE, dnl rm ${srcdir}/$1 fi - if test $srcdir != "."; then + if test ${srcdir}/$1 != "./$1"; then if test -f ./$1.conf; then mv ./$1.conf ./$1 else |