{"thread":{"id":"60013","subject":"[PATCH 0/3] configure.ac: misc configure fixes","startedAt":"2023-07-19T14:52:55Z","lastAt":"2023-07-19T21:35:14Z","messageCount":5,"participants":["Andreas Herrmann","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"479635","messageId":"20230719145211.17854-2-aherrmann@suse.de","threadId":"60013","inReplyTo":null,"subject":"[PATCH 0/3] configure.ac: misc configure fixes","fromName":"Andreas Herrmann","fromEmail":"aherrmann@suse.de","sentAt":"2023-07-19T14:29:52Z","receivedAt":"2023-07-19T14:52:55Z","isPatch":true,"sender":{"key":"aherrmann@suse.de","avatar":null},"body":"Some of the configure options are not working as expected.\nI first encountered this when using '--with-expat=no'.\nFollowing patches address this.\n\nI've also checked configure options for 'libpcre', 'openssl' (together\nwith 'make OPENSSL_SHA1=yes ...'), and 'tcltk'. These are working\ncorrectly.\n\nAs a test I've run 'make test' when disabling support of a package.\nI always had to use 'export GIT_SKIP_TESTS=\"t5801.1[4-7] t5801.31\"' to\nskip some failing tests. Those failed also with default build.\n\nWhen disabling iconv ('configure --without-iconv') further tests are\nfailing. In this case I've used\n'export GIT_SKIP_TESTS=\"t5801.1[4-7] t5801.31 \\\nt0028* t2082.2 t3434* t390[01]* \\\nt4041* t4059* t4060.8 t4201.12 t4205* t4210* t4254.[34] \\\nt5100* t6006* t7102.2 t8005* t9300.193 t9350*\"'\nto ensure that 'make test' completed without exiting early.\n\nAndreas Herrmann (3):\n configure.ac: don't overwrite NO_EXPAT option\n configure.ac: don't overwrite NO_CURL option\n configure.ac: always save NO_ICONV to config.status\n\n configure.ac | 11 ++++++++++-\n 1 file changed, 10 insertions(+), 1 deletion(-)\n\n-- \n2.41.0\n\n"},{"id":"479636","messageId":"20230719145211.17854-4-aherrmann@suse.de","threadId":"60013","inReplyTo":"20230719145211.17854-2-aherrmann@suse.de","subject":"[PATCH 1/3] configure.ac: don't overwrite NO_EXPAT option","fromName":"Andreas Herrmann","fromEmail":"aherrmann@suse.de","sentAt":"2023-07-19T14:29:54Z","receivedAt":"2023-07-19T14:52:57Z","isPatch":true,"sender":{"key":"aherrmann@suse.de","avatar":null},"body":"Even if 'configure --with-expat=no' was run, expat support is used,\nbecause library detection overwrites it. Avoid this overwrite.\nConfigure should obey what the user has specified.\n\nSigned-off-by: Andreas Herrmann \n---\n configure.ac | 4 ++++\n 1 file changed, 4 insertions(+)\n\ndiff --git a/configure.ac b/configure.ac\nindex 38ff86678a..62cc8197f8 100644\n--- a/configure.ac\n+++ b/configure.ac\n@@ -581,6 +581,8 @@ fi\n # Define NO_EXPAT if you do not have expat installed. git-http-push is\n # not built, and you cannot push using http:// and https:// transports.\n \n+if test -z \"$NO_EXPAT\"; then\n+\n GIT_STASH_FLAGS($EXPATDIR)\n \n AC_CHECK_LIB([expat], [XML_ParserCreate],\n@@ -589,6 +591,8 @@ AC_CHECK_LIB([expat], [XML_ParserCreate],\n \n GIT_UNSTASH_FLAGS($EXPATDIR)\n \n+fi\n+\n GIT_CONF_SUBST([NO_EXPAT])\n \n #\n-- \n2.41.0\n\n"},{"id":"479637","messageId":"20230719145211.17854-6-aherrmann@suse.de","threadId":"60013","inReplyTo":"20230719145211.17854-2-aherrmann@suse.de","subject":"[PATCH 2/3] configure.ac: don't overwrite NO_CURL option","fromName":"Andreas Herrmann","fromEmail":"aherrmann@suse.de","sentAt":"2023-07-19T14:29:56Z","receivedAt":"2023-07-19T14:53:28Z","isPatch":true,"sender":{"key":"aherrmann@suse.de","avatar":null},"body":"Even if 'configure --with-curl=no' was run, curl support is used,\nbecause library detection overwrites it. Avoid this overwrite.\nConfigure should obey what the user has specified.\n\nSigned-off-by: Andreas Herrmann \n---\n configure.ac | 4 ++++\n 1 file changed, 4 insertions(+)\n\ndiff --git a/configure.ac b/configure.ac\nindex 62cc8197f8..e85e215f14 100644\n--- a/configure.ac\n+++ b/configure.ac\n@@ -546,6 +546,8 @@ fi\n # git-http-push are not built, and you cannot use http:// and https://\n # transports.\n \n+if test -z \"$NO_CURL\"; then\n+\n GIT_STASH_FLAGS($CURLDIR)\n \n AC_CHECK_LIB([curl], [curl_global_init],\n@@ -554,6 +556,8 @@ AC_CHECK_LIB([curl], [curl_global_init],\n \n GIT_UNSTASH_FLAGS($CURLDIR)\n \n+fi\n+\n GIT_CONF_SUBST([NO_CURL])\n \n if test -z \"$NO_CURL\"; then\n-- \n2.41.0\n\n"},{"id":"479638","messageId":"20230719145211.17854-8-aherrmann@suse.de","threadId":"60013","inReplyTo":"20230719145211.17854-2-aherrmann@suse.de","subject":"[PATCH 3/3] configure.ac: always save NO_ICONV to config.status","fromName":"Andreas Herrmann","fromEmail":"aherrmann@suse.de","sentAt":"2023-07-19T14:29:58Z","receivedAt":"2023-07-19T14:53:30Z","isPatch":true,"sender":{"key":"aherrmann@suse.de","avatar":null},"body":"In case 'configure --with-iconv=no' is used, NO_ICONV is not saved to\nconfig.status and thus git is built with iconv support.\n\nAlways save NO_ICONV to config.status to honor what user selected\nduring configure step.\n\nSigned-off-by: Andreas Herrmann \n---\n configure.ac | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/configure.ac b/configure.ac\nindex e85e215f14..276593cd9d 100644\n--- a/configure.ac\n+++ b/configure.ac\n@@ -644,7 +644,6 @@ LIBS=\"$old_LIBS\"\n GIT_UNSTASH_FLAGS($ICONVDIR)\n \n GIT_CONF_SUBST([NEEDS_LIBICONV])\n-GIT_CONF_SUBST([NO_ICONV])\n \n if test -n \"$NO_ICONV\"; then\n NEEDS_LIBICONV=\n@@ -652,6 +651,8 @@ fi\n \n fi\n \n+GIT_CONF_SUBST([NO_ICONV])\n+\n #\n # Define NO_DEFLATE_BOUND if deflateBound is missing from zlib.\n \n-- \n2.41.0\n\n"},{"id":"479660","messageId":"xmqqy1jb8u0n.fsf@gitster.g","threadId":"60013","inReplyTo":"20230719145211.17854-2-aherrmann@suse.de","subject":"Re: [PATCH 0/3] configure.ac: misc configure fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-07-19T21:35:04Z","receivedAt":"2023-07-19T21:35:14Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andreas Herrmann writes:\n\n> Andreas Herrmann (3):\n> configure.ac: don't overwrite NO_EXPAT option\n> configure.ac: don't overwrite NO_CURL option\n> configure.ac: always save NO_ICONV to config.status\n\nAll patches look good.\n\nThanks, will queue.\n"}]}