{"thread":{"id":"5098","subject":"[PATCH 0/3] autoconf: Add support for SHELL_PATH, PERL_PATH and PYTHON_PATH","startedAt":"2006-08-02T22:36:55Z","lastAt":"2006-08-02T22:40:40Z","messageCount":4,"participants":["Jakub Narebski"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"24607","messageId":"200608030036.56298.jnareb@gmail.com","threadId":"5098","inReplyTo":null,"subject":"[PATCH 0/3] autoconf: Add support for SHELL_PATH, PERL_PATH and PYTHON_PATH","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-08-02T22:36:55Z","receivedAt":"2006-08-02T22:36:55Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"The following series of patches adds support for setting SHELL_PATH, \nPERL_PATH and PYTHON_PATH from autoconf configure script using \n--with-FEATURE=PATH option to ./configure invocation\n\nNeeds revision by someone better versed in autoconf than me.\n\n1. autoconf: Add support for setting SHELL_PATH and PERL_PATH\n2. autoconf: Move site configuration section earlier in configure.ac\n3. autoconf: Add support for setting PYTHON_PATH or NO_PYTHON\n\n-- \nJakub Narebski\nPoland\n"},{"id":"24609","messageId":"200608030038.11553.jnareb@gmail.com","threadId":"5098","inReplyTo":"200608030036.56298.jnareb@gmail.com","subject":"[PATCH 1/3] autoconf: Add support for setting SHELL_PATH and PERL_PATH","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-08-02T22:38:11Z","receivedAt":"2006-08-02T22:38:11Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"This patch adds support for setting SHELL_PATH and PERL_PATH to\nautoconf generated ./configure script via --with-shell=PATH and\n--with-perl=PATH options.\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\n configure.ac |   35 +++++++++++++++++++++++++++++++++--\n 1 files changed, 33 insertions(+), 2 deletions(-)\n\ndiff --git a/configure.ac b/configure.ac\nindex c1f7751..4688e97 100644\n--- a/configure.ac\n+++ b/configure.ac\n@@ -19,17 +19,47 @@ # --------------------------\n # Append LINE to file ${config_append}\n AC_DEFUN([GIT_CONF_APPEND_LINE],\n [echo \"$1\" >> \"${config_append}\"])# GIT_CONF_APPEND_LINE\n+#\n+# GIT_ARG_SET_PATH(PROGRAM)\n+# -------------------------\n+# Provide --with-PROGRAM=PATH option to set PATH to PROGRAM\n+AC_DEFUN([GIT_ARG_SET_PATH],\n+[AC_ARG_WITH([$1],\n+ [AS_HELP_STRING([--with-$1=PATH],\n+                 [provide PATH to $1])],\n+ [GIT_CONF_APPEND_PATH($1)],[])\n+])# GIT_ARG_SET_PATH\n+#\n+# GIT_CONF_APPEND_PATH(PROGRAM)\n+# ------------------------------\n+# Parse --with-PROGRAM=PATH option to set PROGRAM_PATH=PATH\n+# Used by GIT_ARG_SET_PATH(PROGRAM)\n+AC_DEFUN([GIT_CONF_APPEND_PATH],\n+[PROGRAM=m4_toupper($1); \\\n+if test \"$withval\" = \"no\"; then \\\n+\tAC_MSG_WARN([You cannot use git without $1]); \\\n+else \\\n+\tif test \"$withval\" = \"yes\"; then \\\n+\t\tAC_MSG_WARN([You should provide path for --with-$1=PATH]); \\\n+\telse \\\n+\t\tGIT_CONF_APPEND_LINE(${PROGRAM}_PATH=$withval); \\\n+\tfi; \\\n+fi; \\\n+]) # GIT_CONF_APPEND_PATH\n \n \n ## Checks for programs.\n AC_MSG_NOTICE([CHECKS for programs])\n #\n+GIT_ARG_SET_PATH(shell)\n+GIT_ARG_SET_PATH(perl)\n+#\n+# Define NO_PYTHON if you want to lose all benefits of the recursive merge.\n+# Define PYTHON_PATH to provide path to Python.\n AC_PROG_CC\n #AC_PROG_INSTALL\t\t# needs install-sh or install.sh in sources\n AC_CHECK_TOOL(AR, ar, :)\n AC_CHECK_PROGS(TAR, [gtar tar])\n-#\n-# Define NO_PYTHON if you want to lose all benefits of the recursive merge.\n \n \n ## Checks for libraries.\n@@ -127,6 +157,7 @@ # a missing newline at the end of the fi\n \n ## Site configuration\n ## --with-PACKAGE[=ARG] and --without-PACKAGE\n+#\n # Define NO_SVN_TESTS if you want to skip time-consuming SVN interopability\n # tests.  These tests take up a significant amount of the total test time\n # but are not needed unless you plan to talk to SVN repos.\n-- \n1.4.1.1\n"},{"id":"24608","messageId":"200608030038.56322.jnareb@gmail.com","threadId":"5098","inReplyTo":"200608030036.56298.jnareb@gmail.com","subject":"[PATCH 2/3] autoconf: Move site configuration section earlier in configure.ac","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-08-02T22:38:56Z","receivedAt":"2006-08-02T22:38:56Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Move site configuration section, i.e. --with-PACKAGE[=ARG] and\n--without-PACKAGE, --enable-FEATURE[=ARG] and --disable-FEATURE\noptions to the beginning of configure.ac file, just after definitions\nof macros.\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\n configure.ac |  100 +++++++++++++++++++++++++++++-----------------------------\n 1 files changed, 50 insertions(+), 50 deletions(-)\n\ndiff --git a/configure.ac b/configure.ac\nindex 4688e97..73e12d3 100644\n--- a/configure.ac\n+++ b/configure.ac\n@@ -48,6 +48,56 @@ fi; \\\n ]) # GIT_CONF_APPEND_PATH\n \n \n+## Site configuration\n+## --with-PACKAGE[=ARG] and --without-PACKAGE\n+#\n+# Define NO_SVN_TESTS if you want to skip time-consuming SVN interopability\n+# tests.  These tests take up a significant amount of the total test time\n+# but are not needed unless you plan to talk to SVN repos.\n+#\n+# Define MOZILLA_SHA1 environment variable when running make to make use of\n+# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast\n+# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default\n+# choice) has very fast version optimized for i586.\n+#\n+# Define PPC_SHA1 environment variable when running make to make use of\n+# a bundled SHA1 routine optimized for PowerPC.\n+#\n+# Define ARM_SHA1 environment variable when running make to make use of\n+# a bundled SHA1 routine optimized for ARM.\n+#\n+# Define NO_OPENSSL environment variable if you do not have OpenSSL.\n+# This also implies MOZILLA_SHA1.\n+#\n+# Define NO_CURL if you do not have curl installed.  git-http-pull and\n+# git-http-push are not built, and you cannot use http:// and https://\n+# transports.\n+#\n+# Define CURLDIR=/foo/bar if your curl header and library files are in\n+# /foo/bar/include and /foo/bar/lib directories.\n+#\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+# Define NO_MMAP if you want to avoid mmap.\n+#\n+# Define NO_PYTHON if you want to loose all benefits of the recursive merge.\n+#\n+## --enable-FEATURE[=ARG] and --disable-FEATURE\n+# Define COLLISION_CHECK below if you believe that SHA1's\n+# 1461501637330902918203684832716283019655932542976 hashes do not give you\n+# sufficient guarantee that no collisions between objects will ever happen.\n+#\n+# Define USE_NSEC below if you want git to care about sub-second file mtimes\n+# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and\n+# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely\n+# randomly break unless your underlying filesystem supports those sub-second\n+# times (my ext3 doesn't).\n+#\n+# Define USE_STDEV below if you want git to care about the underlying device\n+# change being considered an inode change from the update-cache perspective.\n+\n+\n ## Checks for programs.\n AC_MSG_NOTICE([CHECKS for programs])\n #\n@@ -155,56 +205,6 @@ # Define NO_ACCURATE_DIFF if your diff p\n # a missing newline at the end of the file.\n \n \n-## Site configuration\n-## --with-PACKAGE[=ARG] and --without-PACKAGE\n-#\n-# Define NO_SVN_TESTS if you want to skip time-consuming SVN interopability\n-# tests.  These tests take up a significant amount of the total test time\n-# but are not needed unless you plan to talk to SVN repos.\n-#\n-# Define MOZILLA_SHA1 environment variable when running make to make use of\n-# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast\n-# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default\n-# choice) has very fast version optimized for i586.\n-#\n-# Define PPC_SHA1 environment variable when running make to make use of\n-# a bundled SHA1 routine optimized for PowerPC.\n-#\n-# Define ARM_SHA1 environment variable when running make to make use of\n-# a bundled SHA1 routine optimized for ARM.\n-#\n-# Define NO_OPENSSL environment variable if you do not have OpenSSL.\n-# This also implies MOZILLA_SHA1.\n-#\n-# Define NO_CURL if you do not have curl installed.  git-http-pull and\n-# git-http-push are not built, and you cannot use http:// and https://\n-# transports.\n-#\n-# Define CURLDIR=/foo/bar if your curl header and library files are in\n-# /foo/bar/include and /foo/bar/lib directories.\n-#\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-# Define NO_MMAP if you want to avoid mmap.\n-#\n-# Define NO_PYTHON if you want to loose all benefits of the recursive merge.\n-#\n-## --enable-FEATURE[=ARG] and --disable-FEATURE\n-# Define COLLISION_CHECK below if you believe that SHA1's\n-# 1461501637330902918203684832716283019655932542976 hashes do not give you\n-# sufficient guarantee that no collisions between objects will ever happen.\n-#\n-# Define USE_NSEC below if you want git to care about sub-second file mtimes\n-# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and\n-# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely\n-# randomly break unless your underlying filesystem supports those sub-second\n-# times (my ext3 doesn't).\n-#\n-# Define USE_STDEV below if you want git to care about the underlying device\n-# change being considered an inode change from the update-cache perspective.\n-\n-\n ## Output files\n AC_CONFIG_FILES([\"${config_file}\":\"${config_in}\":\"${config_append}\"])\n AC_OUTPUT\n-- \n1.4.1.1\n"},{"id":"24610","messageId":"200608030040.40995.jnareb@gmail.com","threadId":"5098","inReplyTo":"200608030036.56298.jnareb@gmail.com","subject":"[PATCH 3/3] autoconf: Add support for setting PYTHON_PATH or NO_PYTHON","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-08-02T22:40:40Z","receivedAt":"2006-08-02T22:40:40Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"This patch adds support for setting either PYTHON_PATH or NO_PYTHON to\nautoconf generated ./configure script via --with-python=PATH (sets\nPYTHON_PATH) or --without-python (sets NO_PYTHON).  Autodetect\nPYTHON_PATH via AC_PATH_PROGS.\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\nTweaked a little to remove accidental trailing whitespace.\n\n configure.ac |   22 ++++++++++++++++++++++\n 1 files changed, 22 insertions(+)\n\ndiff --git a/configure.ac b/configure.ac\nindex 73e12d3..0a54b44 100644\n--- a/configure.ac\n+++ b/configure.ac\n@@ -103,6 +103,18 @@ AC_MSG_NOTICE([CHECKS for programs])\n #\n GIT_ARG_SET_PATH(shell)\n GIT_ARG_SET_PATH(perl)\n+AC_ARG_WITH(python,[AS_HELP_STRING([--with-python=PATH], [provide PATH to python])\n+AS_HELP_STRING([--no-python], [don't use python scripts])],\n+ [if test \"$withval\" = \"no\"; then \\\n+    NO_PYTHON=YesPlease; \\\n+  elif test \"$withval\" != \"yes\"; then \\\n+    PYTHON_PATH=$withval; \\\n+  fi; \\\n+ ])\n+AC_SUBST(NO_PYTHON)\n+AC_SUBST(PYTHON_PATH)\n+\n+\n #\n # Define NO_PYTHON if you want to lose all benefits of the recursive merge.\n # Define PYTHON_PATH to provide path to Python.\n@@ -110,6 +122,16 @@ AC_PROG_CC\n #AC_PROG_INSTALL\t\t# needs install-sh or install.sh in sources\n AC_CHECK_TOOL(AR, ar, :)\n AC_CHECK_PROGS(TAR, [gtar tar])\n+if test -z \"$NO_PYTHON\"; then\n+\tAC_PATH_PROGS(PYTHON_PATH, [python2.4 python2.3 python2 python])\n+\tif test -n \"$PYTHON_PATH\"; then\n+\t\tGIT_CONF_APPEND_LINE([PYTHON_PATH=@PYTHON_PATH@])\n+\telse\n+\t\tGIT_CONF_APPEND_LINE([NO_PYTHON=@NO_PYTHON@])\n+\tfi\n+else\n+\tGIT_CONF_APPEND_LINE([NO_PYTHON=@NO_PYTHON@])\n+fi\n \n \n ## Checks for libraries.\n-- \n1.4.1.1\n"}]}