mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'jn/make'
* jn/make: Set datarootdir in config.mak.in Quote all calls to GIT_CONF_APPEND_LINE Typofix in configure.ac comment. configure.ac vertical whitespace usage cleanup autoconf: Checks for some programs autoconf: Checks for libraries autoconf: Checks for some library functions. autoconf: Checks for typedefs, structures, and compiler characteristics. autoconf: Preparing the way for autodetection Copy description of build configuration variables to configure.ac Teach make clean about configure and autoconf autoconf: Use autoconf to write installation directories to config.mak.autogen
This commit is contained in:
commit
2dcb927f37
6
.gitignore
vendored
6
.gitignore
vendored
|
@ -137,4 +137,10 @@ git-core.spec
|
|||
*.[ao]
|
||||
*.py[co]
|
||||
config.mak
|
||||
autom4te.cache
|
||||
config.log
|
||||
config.status
|
||||
config.mak.in
|
||||
config.mak.autogen
|
||||
configure
|
||||
git-blame
|
||||
|
|
9
INSTALL
9
INSTALL
|
@ -13,6 +13,15 @@ that uses $prefix, the built results have some paths encoded,
|
|||
which are derived from $prefix, so "make all; make prefix=/usr
|
||||
install" would not work.
|
||||
|
||||
Alternatively you can use autoconf generated ./configure script to
|
||||
set up install paths (via config.mak.autogen), so you can write instead
|
||||
|
||||
$ autoconf ;# as yourself if ./configure doesn't exist yet
|
||||
$ ./configure --prefix=/usr ;# as yourself
|
||||
$ make all doc ;# as yourself
|
||||
# make install install-doc ;# as root
|
||||
|
||||
|
||||
Issues of note:
|
||||
|
||||
- git normally installs a helper script wrapper called "git", which
|
||||
|
|
3
Makefile
3
Makefile
|
@ -352,6 +352,7 @@ ifneq (,$(findstring arm,$(uname_M)))
|
|||
ARM_SHA1 = YesPlease
|
||||
endif
|
||||
|
||||
-include config.mak.autogen
|
||||
-include config.mak
|
||||
|
||||
ifdef WITH_OWN_SUBPROCESS_PY
|
||||
|
@ -771,6 +772,8 @@ clean:
|
|||
$(LIB_FILE) $(XDIFF_LIB)
|
||||
rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
|
||||
rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
|
||||
rm -rf autom4te.cache
|
||||
rm -f config.log config.mak.autogen configure config.status config.cache
|
||||
rm -rf $(GIT_TARNAME) .doc-tmp-dir
|
||||
rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
|
||||
rm -f $(htmldocs).tar.gz $(manpages).tar.gz
|
||||
|
|
24
config.mak.in
Normal file
24
config.mak.in
Normal file
|
@ -0,0 +1,24 @@
|
|||
# git Makefile configuration, included in main Makefile
|
||||
# @configure_input@
|
||||
|
||||
CC = @CC@
|
||||
AR = @AR@
|
||||
TAR = @TAR@
|
||||
#INSTALL = @INSTALL@ # needs install-sh or install.sh in sources
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
bindir = @bindir@
|
||||
#gitexecdir = @libexecdir@/git-core/
|
||||
datarootdir = @datarootdir@
|
||||
template_dir = @datadir@/git-core/templates/
|
||||
GIT_PYTHON_DIR = @datadir@/git-core/python
|
||||
|
||||
mandir=@mandir@
|
||||
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
export exec_prefix mandir
|
||||
export srcdir VPATH
|
||||
|
183
configure.ac
Normal file
183
configure.ac
Normal file
|
@ -0,0 +1,183 @@
|
|||
# -*- Autoconf -*-
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.59)
|
||||
AC_INIT([git], [1.4.1], [git@vger.kernel.org])
|
||||
|
||||
AC_CONFIG_SRCDIR([git.c])
|
||||
|
||||
config_file=config.mak.autogen
|
||||
config_append=config.mak.append
|
||||
config_in=config.mak.in
|
||||
|
||||
echo "# ${config_append}. Generated by configure." > "${config_append}"
|
||||
|
||||
|
||||
## Definitions of macros
|
||||
# GIT_CONF_APPEND_LINE(LINE)
|
||||
# --------------------------
|
||||
# Append LINE to file ${config_append}
|
||||
AC_DEFUN([GIT_CONF_APPEND_LINE],
|
||||
[echo "$1" >> "${config_append}"])# GIT_CONF_APPEND_LINE
|
||||
|
||||
|
||||
## Checks for programs.
|
||||
AC_MSG_NOTICE([CHECKS for programs])
|
||||
#
|
||||
AC_PROG_CC
|
||||
#AC_PROG_INSTALL # needs install-sh or install.sh in sources
|
||||
AC_CHECK_TOOL(AR, ar, :)
|
||||
AC_CHECK_PROGS(TAR, [gtar tar])
|
||||
#
|
||||
# Define NO_PYTHON if you want to lose all benefits of the recursive merge.
|
||||
|
||||
|
||||
## Checks for libraries.
|
||||
AC_MSG_NOTICE([CHECKS for libraries])
|
||||
#
|
||||
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
|
||||
# Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin).
|
||||
AC_CHECK_LIB([ssl], [SHA1_Init],[],
|
||||
[AC_CHECK_LIB([crypto], [SHA1_INIT],
|
||||
[GIT_CONF_APPEND_LINE(NEEDS_SSL_WITH_CRYPTO=YesPlease)],
|
||||
[GIT_CONF_APPEND_LINE(NO_OPENSSL=YesPlease)])])
|
||||
#
|
||||
# Define NO_CURL if you do not have curl installed. git-http-pull and
|
||||
# git-http-push are not built, and you cannot use http:// and https://
|
||||
# transports.
|
||||
AC_CHECK_LIB([curl], [curl_global_init],[],
|
||||
[GIT_CONF_APPEND_LINE(NO_CURL=YesPlease)])
|
||||
#
|
||||
# Define NO_EXPAT if you do not have expat installed. git-http-push is
|
||||
# not built, and you cannot push using http:// and https:// transports.
|
||||
AC_CHECK_LIB([expat], [XML_ParserCreate],[],
|
||||
[GIT_CONF_APPEND_LINE(NO_EXPAT=YesPlease)])
|
||||
#
|
||||
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
|
||||
AC_CHECK_LIB([c], [iconv],[],
|
||||
[AC_CHECK_LIB([iconv],[iconv],
|
||||
[GIT_CONF_APPEND_LINE(NEEDS_LIBICONV=YesPlease)],[])])
|
||||
#
|
||||
# Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
|
||||
# Patrick Mauritz).
|
||||
AC_CHECK_LIB([c], [socket],[],
|
||||
[AC_CHECK_LIB([socket],[socket],
|
||||
[GIT_CONF_APPEND_LINE(NEEDS_SOCKET=YesPlease)],[])])
|
||||
|
||||
|
||||
## Checks for header files.
|
||||
|
||||
|
||||
## Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_MSG_NOTICE([CHECKS for typedefs, structures, and compiler characteristics])
|
||||
#
|
||||
# Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent.
|
||||
AC_CHECK_MEMBER(struct dirent.d_ino,[],
|
||||
[GIT_CONF_APPEND_LINE(NO_D_INO_IN_DIRENT=YesPlease)],
|
||||
[#include <dirent.h>])
|
||||
#
|
||||
# Define NO_D_TYPE_IN_DIRENT if your platform defines DT_UNKNOWN but lacks
|
||||
# d_type in struct dirent (latest Cygwin -- will be fixed soonish).
|
||||
AC_CHECK_MEMBER(struct dirent.d_type,[],
|
||||
[GIT_CONF_APPEND_LINE(NO_D_TYPE_IN_DIRENT=YesPlease)],
|
||||
[#include <dirent.h>])
|
||||
#
|
||||
# Define NO_SOCKADDR_STORAGE if your platform does not have struct
|
||||
# sockaddr_storage.
|
||||
AC_CHECK_TYPE(struct sockaddr_storage,[],
|
||||
[GIT_CONF_APPEND_LINE(NO_SOCKADDR_STORAGE=YesPlease)],
|
||||
[#include <netinet/in.h>])
|
||||
|
||||
|
||||
## Checks for library functions.
|
||||
## (in default C library and libraries checked by AC_CHECK_LIB)
|
||||
AC_MSG_NOTICE([CHECKS for library functions])
|
||||
#
|
||||
# Define NO_STRCASESTR if you don't have strcasestr.
|
||||
AC_CHECK_FUNC(strcasestr,[],
|
||||
[GIT_CONF_APPEND_LINE(NO_STRCASESTR=YesPlease)])
|
||||
#
|
||||
# Define NO_STRLCPY if you don't have strlcpy.
|
||||
AC_CHECK_FUNC(strlcpy,[],
|
||||
[GIT_CONF_APPEND_LINE(NO_STRLCPY=YesPlease)])
|
||||
#
|
||||
# Define NO_SETENV if you don't have setenv in the C library.
|
||||
AC_CHECK_FUNC(setenv,[],
|
||||
[GIT_CONF_APPEND_LINE(NO_SETENV=YesPlease)])
|
||||
#
|
||||
# Define NO_MMAP if you want to avoid mmap.
|
||||
#
|
||||
# Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
|
||||
#
|
||||
# Define NO_ICONV if your libc does not properly support iconv.
|
||||
|
||||
|
||||
## Other checks.
|
||||
# Define USE_PIC if you need the main git objects to be built with -fPIC
|
||||
# in order to build and link perl/Git.so. x86-64 seems to need this.
|
||||
#
|
||||
# Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
|
||||
# Enable it on Windows. By default, symrefs are still used.
|
||||
#
|
||||
# Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3.
|
||||
#
|
||||
# Define NO_ACCURATE_DIFF if your diff program at least sometimes misses
|
||||
# a missing newline at the end of the file.
|
||||
|
||||
|
||||
## Site configuration
|
||||
## --with-PACKAGE[=ARG] and --without-PACKAGE
|
||||
# Define NO_SVN_TESTS if you want to skip time-consuming SVN interopability
|
||||
# tests. These tests take up a significant amount of the total test time
|
||||
# but are not needed unless you plan to talk to SVN repos.
|
||||
#
|
||||
# Define MOZILLA_SHA1 environment variable when running make to make use of
|
||||
# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast
|
||||
# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default
|
||||
# choice) has very fast version optimized for i586.
|
||||
#
|
||||
# Define PPC_SHA1 environment variable when running make to make use of
|
||||
# a bundled SHA1 routine optimized for PowerPC.
|
||||
#
|
||||
# Define ARM_SHA1 environment variable when running make to make use of
|
||||
# a bundled SHA1 routine optimized for ARM.
|
||||
#
|
||||
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
|
||||
# This also implies MOZILLA_SHA1.
|
||||
#
|
||||
# Define NO_CURL if you do not have curl installed. git-http-pull and
|
||||
# git-http-push are not built, and you cannot use http:// and https://
|
||||
# transports.
|
||||
#
|
||||
# Define CURLDIR=/foo/bar if your curl header and library files are in
|
||||
# /foo/bar/include and /foo/bar/lib directories.
|
||||
#
|
||||
# Define NO_EXPAT if you do not have expat installed. git-http-push is
|
||||
# not built, and you cannot push using http:// and https:// transports.
|
||||
#
|
||||
# Define NO_MMAP if you want to avoid mmap.
|
||||
#
|
||||
# Define NO_PYTHON if you want to loose all benefits of the recursive merge.
|
||||
#
|
||||
## --enable-FEATURE[=ARG] and --disable-FEATURE
|
||||
# Define COLLISION_CHECK below if you believe that SHA1's
|
||||
# 1461501637330902918203684832716283019655932542976 hashes do not give you
|
||||
# sufficient guarantee that no collisions between objects will ever happen.
|
||||
#
|
||||
# Define USE_NSEC below if you want git to care about sub-second file mtimes
|
||||
# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
|
||||
# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
|
||||
# randomly break unless your underlying filesystem supports those sub-second
|
||||
# times (my ext3 doesn't).
|
||||
#
|
||||
# Define USE_STDEV below if you want git to care about the underlying device
|
||||
# change being considered an inode change from the update-cache perspective.
|
||||
|
||||
|
||||
## Output files
|
||||
AC_CONFIG_FILES(["${config_file}":"${config_in}":"${config_append}"])
|
||||
AC_OUTPUT
|
||||
|
||||
|
||||
## Cleanup
|
||||
rm -f "${config_append}"
|
Loading…
Reference in a new issue