projects / packages / autofs.git / blame
| Commit | Line | Data |
|---|---|---|
| e5fd101c PS |
1 | autofs-5.0.4 - fix dumb libxml2 check |
| 2 | ||
| 3 | From: Ian Kent <raven@themaw.net> | |
| 4 | ||
| 5 | The workaround for libxml2 not deleting its thread specific data | |
| 6 | key at library unload has become broken. It was foolish of me to | |
| 7 | think that the libxml2 folks would fix this in any reasonable time. | |
| 8 | This patch changes the version check to 99 for the major and minor | |
| 9 | revisions, the same as the check for the revision to ensure that | |
| 10 | the workaround is always used and adds the setting to the build | |
| 11 | information produced by the -V option. | |
| 12 | --- | |
| 13 | ||
| 14 | CHANGELOG | 4 ++++ | |
| 15 | aclocal.m4 | 4 ++-- | |
| 16 | configure | 4 ++-- | |
| 17 | daemon/automount.c | 10 ++++++++++ | |
| 18 | 4 files changed, 18 insertions(+), 4 deletions(-) | |
| 19 | ||
| 20 | ||
| 21 | diff --git a/CHANGELOG b/CHANGELOG | |
| 22 | index a618d7e..4e8209e 100644 | |
| 23 | --- a/CHANGELOG | |
| 24 | +++ b/CHANGELOG | |
| 25 | @@ -1,3 +1,7 @@ | |
| 26 | +??/??/2009 autofs-5.0.5 | |
| 27 | +----------------------- | |
| 28 | +- fix dumb libxml2 check | |
| 29 | + | |
| 30 | 4/11/2008 autofs-5.0.4 | |
| 31 | ----------------------- | |
| 32 | - correct configure test for ldapr page control functions. | |
| 33 | diff --git a/aclocal.m4 b/aclocal.m4 | |
| 34 | index 52a1e47..bb0ab21 100644 | |
| 35 | --- a/aclocal.m4 | |
| 36 | +++ b/aclocal.m4 | |
| 37 | @@ -201,10 +201,10 @@ else | |
| 38 | XML_FLAGS=`$XML_CONFIG --cflags` | |
| 39 | XML_VER=`$XML_CONFIG --version` | |
| 40 | XML_MAJOR=`echo $XML_VER|cut -d\. -f1` | |
| 41 | - if test $XML_MAJOR -le 2 | |
| 42 | + if test $XML_MAJOR -le 99 | |
| 43 | then | |
| 44 | XML_MINOR=`echo $XML_VER|cut -d\. -f2` | |
| 45 | - if test $XML_MINOR -le 6 | |
| 46 | + if test $XML_MINOR -le 99 | |
| 47 | then | |
| 48 | XML_REV=`echo $XML_VER|cut -d\. -f3` | |
| 49 | if test $XML_REV -le 99; then | |
| 50 | diff --git a/configure b/configure | |
| 51 | index b8cc62f..ed17660 100755 | |
| 52 | --- a/configure | |
| 53 | +++ b/configure | |
| 54 | @@ -2564,10 +2564,10 @@ echo "${ECHO_T}yes" >&6; } | |
| 55 | XML_FLAGS=`$XML_CONFIG --cflags` | |
| 56 | XML_VER=`$XML_CONFIG --version` | |
| 57 | XML_MAJOR=`echo $XML_VER|cut -d\. -f1` | |
| 58 | - if test $XML_MAJOR -le 2 | |
| 59 | + if test $XML_MAJOR -le 99 | |
| 60 | then | |
| 61 | XML_MINOR=`echo $XML_VER|cut -d\. -f2` | |
| 62 | - if test $XML_MINOR -le 6 | |
| 63 | + if test $XML_MINOR -le 99 | |
| 64 | then | |
| 65 | XML_REV=`echo $XML_VER|cut -d\. -f3` | |
| 66 | if test $XML_REV -le 99; then | |
| 67 | diff --git a/daemon/automount.c b/daemon/automount.c | |
| 68 | index 863aac5..6f078c1 100644 | |
| 69 | --- a/daemon/automount.c | |
| 70 | +++ b/daemon/automount.c | |
| 71 | @@ -1743,6 +1743,16 @@ static void show_build_info(void) | |
| 72 | #ifdef WITH_DMALLOC | |
| 73 | printf("WITH_DMALLOC "); | |
| 74 | count = count + 13; | |
| 75 | + | |
| 76 | + if (count > 60) { | |
| 77 | + printf("\n "); | |
| 78 | + count = 0; | |
| 79 | + } | |
| 80 | +#endif | |
| 81 | + | |
| 82 | +#ifdef LIBXML2_WORKAROUND | |
| 83 | + printf("LIBXML2_WORKAROUND "); | |
| 84 | + count = count + 19; | |
| 85 | #endif | |
| 86 | ||
| 87 | printf("\n\n"); |