gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-04-25 00:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* config/pathxml.m4: Whitespace fixes for coding standards.

Browse source 
* configure.ac: Ditto.
        * configure: Regenerate.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@18407 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2004-01-13 12:27:51 +00:00
parent a4f3157e1d
commit 9acaa0f2cc
4 changed files with 89 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-01-13 David Ayers <d.ayers@inode.at>
* config/pathxml.m4: Whitespace fixes for coding standards.
* configure.ac: Ditto.
* configure: Regenerate.
2004-01-12 David Ayers <d.ayers@inode.at> 2004-01-12 David Ayers <d.ayers@inode.at>
* gsweb.make.in: Change 'WO' framework names to WobObjects, * gsweb.make.in: Change 'WO' framework names to WobObjects,

71
config/pathxml.m4
View file

@ -2,11 +2,11 @@ dnl Code shamelessly stolen from glib-config by Sebastian Rittau
dnl AM_PATH_XML([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl AM_PATH_XML([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
AC_DEFUN(AM_PATH_XML,[ AC_DEFUN(AM_PATH_XML,[
AC_ARG_WITH(xml-prefix, AC_ARG_WITH(xml-prefix,
[ --with-xml-prefix=PFX Prefix where libxml is installed (optional)], [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)],
xml_config_prefix="$withval", xml_config_prefix="") xml_config_prefix="$withval", xml_config_prefix="")
AC_ARG_ENABLE(xmltest, AC_ARG_ENABLE(xmltest,
[ --disable-xmltest Do not try to compile and run a test XML program],, [ --disable-xmltest Do not try to compile and run a test XML program],,
enable_xmltest=yes) enable_xmltest=yes)
if test x$xml_config_prefix != x ; then if test x$xml_config_prefix != x ; then
xml_config_args="$xml_config_args --prefix=$xml_config_prefix" xml_config_args="$xml_config_args --prefix=$xml_config_prefix"
@ -60,32 +60,39 @@ main()
system("touch conf.xmltest"); system("touch conf.xmltest");
tmp_version = xmlStrdup("$min_xml_version"); tmp_version = xmlStrdup("$min_xml_version");
if(sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) { if(sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3)
printf("%s, bad version string\n", "$min_xml_version"); {
exit(1); printf("%s, bad version string\n", "$min_xml_version");
} exit(1);
}
tmp_version = xmlStrdup(LIBXML_DOTTED_VERSION); tmp_version = xmlStrdup(LIBXML_DOTTED_VERSION);
if(sscanf(tmp_version, "%d.%d.%d", &xml_major_version, &xml_minor_version, &xml_micro_version) != 3) { if(sscanf(tmp_version, "%d.%d.%d",
printf("%s, bad version string\n", "$min_xml_version"); &xml_major_version, &xml_minor_version, &xml_micro_version) != 3)
exit(1); {
} printf("%s, bad version string\n", "$min_xml_version");
exit(1);
}
if((xml_major_version != $xml_config_major_version) || if((xml_major_version != $xml_config_major_version) ||
(xml_minor_version != $xml_config_minor_version) || (xml_minor_version != $xml_config_minor_version) ||
(xml_micro_version != $xml_config_micro_version)) (xml_micro_version != $xml_config_micro_version))
{ {
printf("\n*** 'xml-config --version' returned %d.%d.%d, but libxml (%d.%d.%d)\n", printf("\n*** 'xml-config --version' returned %d.%d.%d, \n");
$xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version, printf("\n*** but libxml (%d.%d.%d)\n",
$xml_config_major_version, $xml_config_minor_version,
$xml_config_micro_version,
xml_major_version, xml_minor_version, xml_micro_version); xml_major_version, xml_minor_version, xml_micro_version);
printf("*** was found! If xml-config was correct, then it is best\n"); printf("*** was found! If xml-config was correct, then it is best\n");
printf("*** to remove the old version of libxml. You may also be able to fix the error\n"); printf("*** to remove the old version of libxml. You may also be \n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); printf("*** able to fix the error by modifying your LD_LIBRARY_PATH \n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); printf("*** enviroment variable, or by editing /etc/ld.so.conf.\n");
printf("*** required on your system.\n"); printf("*** Make sure you have run ldconfig if that is required on\n");
printf("*** If xml-config was wrong, set the environment variable XML_CONFIG\n"); printf("*** your system.\n");
printf("*** to point to the correct copy of xml-config, and remove the file config.cache\n"); printf("*** If xml-config was wrong, set the environment variable \n");
printf("*** before re-running configure\n"); printf("*** XML_CONFIG to point to the correct copy of xml-config,\n");
printf("*** and remove the file config.cache before re-running \n");
printf("*** configure\n");
} }
else else
{ {
@ -100,17 +107,21 @@ main()
{ {
printf("\n*** An old version of libxml (%d.%d.%d) was found.\n", printf("\n*** An old version of libxml (%d.%d.%d) was found.\n",
xml_major_version, xml_minor_version, xml_micro_version); xml_major_version, xml_minor_version, xml_micro_version);
printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n", printf("*** You need a version of libxml newer than %d.%d.%d. \n",
major, minor, micro); major, minor, micro);
printf("*** libxml is always available from ftp://ftp.gnome.org.\n"); printf("*** The latest version of libxml is available from \n");
printf("*** ftp://ftp.gnome.org.\n");
printf("***\n"); printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n"); printf("*** If you have already installed a sufficiently new \n");
printf("*** probably means that the wrong copy of the xml-config shell script is\n"); printf("*** version, this error probably means that the wrong \n");
printf("*** being found. The easiest way to fix this is to remove the old version\n"); printf("*** copy of the xml-config shell script is being found. \n");
printf("*** of libxml, but you can also set the XML_CONFIG environment to point to the\n"); printf("*** The easiest way to fix this is to remove the old \n");
printf("*** correct copy of xml-config. (In this case, you will have to\n"); printf("*** version of libxml, but you can also set the \n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); printf("*** XML_CONFIG environment to point to the correct copy \n");
printf("*** so that the correct libraries are found at run-time))\n"); printf("*** of xml-config. (In this case, you will have to \n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, \n");
printf("*** or edit /etc/ld.so.conf so that the correct \n");
printf("*** libraries are found at run-time))\n");
} }
} }
return 1; return 1;

70
configure vendored
View file

@ -780,13 +780,13 @@ if test -n "$ac_init_help"; then
Optional Features: Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-xmltest Do not try to compile and run a test XML program --disable-xmltest Do not try to compile and run a test XML program
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-gswnames=NAMESPC Set the default namespace (gsw,wo,all=def) --with-gswnames=NAMESPC Set the default namespace (gsw,wo,all=def)
--with-xml-prefix=PFX Prefix where libxml is installed (optional) --with-xml-prefix=PFX Prefix where libxml is installed (optional)
Some influential environment variables: Some influential environment variables:
CC C compiler command CC C compiler command
@ -1173,6 +1173,7 @@ fi
echo "$as_me:$LINENO: result: $GSWNAMES" >&5 echo "$as_me:$LINENO: result: $GSWNAMES" >&5
echo "${ECHO_T}$GSWNAMES" >&6 echo "${ECHO_T}$GSWNAMES" >&6
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Check for GDL2 # Check for GDL2
#-------------------------------------------------------------------- #--------------------------------------------------------------------
@ -1207,7 +1208,7 @@ _ACEOF
fi fi
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Check for libwrap # Check for libwrap
#-------------------------------------------------------------------- #--------------------------------------------------------------------
@ -2196,32 +2197,39 @@ main()
system("touch conf.xmltest"); system("touch conf.xmltest");
tmp_version = xmlStrdup("$min_xml_version"); tmp_version = xmlStrdup("$min_xml_version");
if(sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) { if(sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3)
printf("%s, bad version string\n", "$min_xml_version"); {
exit(1); printf("%s, bad version string\n", "$min_xml_version");
} exit(1);
}
tmp_version = xmlStrdup(LIBXML_DOTTED_VERSION); tmp_version = xmlStrdup(LIBXML_DOTTED_VERSION);
if(sscanf(tmp_version, "%d.%d.%d", &xml_major_version, &xml_minor_version, &xml_micro_version) != 3) { if(sscanf(tmp_version, "%d.%d.%d",
printf("%s, bad version string\n", "$min_xml_version"); &xml_major_version, &xml_minor_version, &xml_micro_version) != 3)
exit(1); {
} printf("%s, bad version string\n", "$min_xml_version");
exit(1);
}
if((xml_major_version != $xml_config_major_version) || if((xml_major_version != $xml_config_major_version) ||
(xml_minor_version != $xml_config_minor_version) || (xml_minor_version != $xml_config_minor_version) ||
(xml_micro_version != $xml_config_micro_version)) (xml_micro_version != $xml_config_micro_version))
{ {
printf("\n*** 'xml-config --version' returned %d.%d.%d, but libxml (%d.%d.%d)\n", printf("\n*** 'xml-config --version' returned %d.%d.%d, \n");
$xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version, printf("\n*** but libxml (%d.%d.%d)\n",
$xml_config_major_version, $xml_config_minor_version,
$xml_config_micro_version,
xml_major_version, xml_minor_version, xml_micro_version); xml_major_version, xml_minor_version, xml_micro_version);
printf("*** was found! If xml-config was correct, then it is best\n"); printf("*** was found! If xml-config was correct, then it is best\n");
printf("*** to remove the old version of libxml. You may also be able to fix the error\n"); printf("*** to remove the old version of libxml. You may also be \n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); printf("*** able to fix the error by modifying your LD_LIBRARY_PATH \n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); printf("*** enviroment variable, or by editing /etc/ld.so.conf.\n");
printf("*** required on your system.\n"); printf("*** Make sure you have run ldconfig if that is required on\n");
printf("*** If xml-config was wrong, set the environment variable XML_CONFIG\n"); printf("*** your system.\n");
printf("*** to point to the correct copy of xml-config, and remove the file config.cache\n"); printf("*** If xml-config was wrong, set the environment variable \n");
printf("*** before re-running configure\n"); printf("*** XML_CONFIG to point to the correct copy of xml-config,\n");
printf("*** and remove the file config.cache before re-running \n");
printf("*** configure\n");
} }
else else
{ {
@ -2236,17 +2244,21 @@ main()
{ {
printf("\n*** An old version of libxml (%d.%d.%d) was found.\n", printf("\n*** An old version of libxml (%d.%d.%d) was found.\n",
xml_major_version, xml_minor_version, xml_micro_version); xml_major_version, xml_minor_version, xml_micro_version);
printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n", printf("*** You need a version of libxml newer than %d.%d.%d. \n",
major, minor, micro); major, minor, micro);
printf("*** libxml is always available from ftp://ftp.gnome.org.\n"); printf("*** The latest version of libxml is available from \n");
printf("*** ftp://ftp.gnome.org.\n");
printf("***\n"); printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n"); printf("*** If you have already installed a sufficiently new \n");
printf("*** probably means that the wrong copy of the xml-config shell script is\n"); printf("*** version, this error probably means that the wrong \n");
printf("*** being found. The easiest way to fix this is to remove the old version\n"); printf("*** copy of the xml-config shell script is being found. \n");
printf("*** of libxml, but you can also set the XML_CONFIG environment to point to the\n"); printf("*** The easiest way to fix this is to remove the old \n");
printf("*** correct copy of xml-config. (In this case, you will have to\n"); printf("*** version of libxml, but you can also set the \n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); printf("*** XML_CONFIG environment to point to the correct copy \n");
printf("*** so that the correct libraries are found at run-time))\n"); printf("*** of xml-config. (In this case, you will have to \n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, \n");
printf("*** or edit /etc/ld.so.conf so that the correct \n");
printf("*** libraries are found at run-time))\n");
} }
} }
return 1; return 1;

2
configure.ac
View file

@ -43,7 +43,7 @@ else
fi fi
AC_MSG_RESULT($GSWNAMES) AC_MSG_RESULT($GSWNAMES)
AC_SUBST(GSWNAMES) AC_SUBST(GSWNAMES)
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Check for GDL2 # Check for GDL2
#-------------------------------------------------------------------- #--------------------------------------------------------------------