#22 build: Fix AC_ARG_ENABLE install logic
Merged a year ago by abbra. Opened 2 years ago by salahx.
Unknown source sample  into  master

file modified
+9 -9
@@ -91,9 +91,9 @@

  

  AC_ARG_ENABLE(sample,

  AS_HELP_STRING(--enable-sample,[Build and install a sample service.]),

- sample=$withval,

- sample=no)

- AM_CONDITIONAL(INSTALL_SAMPLE,test x$sample = xyes)

+ ,

+ [enables_sample=no])

+ AM_CONDITIONAL(INSTALL_SAMPLE,test x$enable_sample = xyes)

  

  AC_ARG_ENABLE(experimental,

  AS_HELP_STRING(--enable-experimental,[Build experimental helpers.]),
@@ -330,18 +330,18 @@

  

  AC_ARG_ENABLE(xml-docs,

  AS_HELP_STRING(--enable-xml-docs,[Reformat XML documentation.]),

- xml_docs=$withval,

- xml_docs=no)

- AM_CONDITIONAL(REFORMAT_XML_DOCS,test x$xml_docs = xyes)

+ ,

+ [enable_xml_docs=no])

+ AM_CONDITIONAL(REFORMAT_XML_DOCS,test x$enable_xml_docs = xyes)

  AC_PATH_PROGS(PATH_XMLTO,xmlto,:)

  AC_SUBST(PATH_XMLTO)

  

  AC_ARG_ENABLE(compat-dtd,

  AS_HELP_STRING(--enable-compat-dtd,[Use DocBook 4.3 instead of DocBook 4.4.]),

- compat_dtd=$withval,

- compat_dtd=no)

+ ,

+ [enable_xml_dtd=no])

  AC_MSG_CHECKING([which version of the DocBook DTD to use])

- if test x$compat_dtd = xyes ; then

+ if test x$enable_compat_dtd = xyes ; then

  	DOCBOOK_PACKAGE_START=

  	DOCBOOK_PACKAGE_END=

  	DOCBOOK_VERSION=4.3

The arguments for AC_ARG_ENABLE were wrong. The 3rd argument is
"if specified" and the 4th argument is "if not specified". So
--disable-sample would include the sample instead of leaving it out.

The "experimental" option has the same problem, but it doesn't matter because the build of them is disabled anyway. A future PR will remove it.

rebased onto 0fffec3

2 years ago

Actually, "Sample" isn't the only option with the problem, xml-docs and compat-dts have the same problem, so I fixed it there, too

rebased onto 1112006

2 years ago

Pull-Request has been merged by abbra

a year ago
Metadata