mirror of
git://git.code.sf.net/p/zsh/code
synced 2024-05-09 17:16:19 +02:00
12598: configure takes --enable-cflags=... etc. arguments
This commit is contained in:
Peter Stephenson
parent
78526bb0c7
commit
7102a4696c
|
|
@ -1,3 +1,8 @@
|
|||
2000-08-11 Peter Stephenson <pws@csr.com>
|
||||
|
||||
* 12598: INSTALL, aczsh.m4, configure.in: --enable-cppflags=...,
|
||||
--enable-cflags=..., --enable-ldflags=..., --enable-libs=...
|
||||
|
||||
2000-08-11 Bart Schaefer <schaefer@zsh.org>
|
||||
|
||||
* 12596: INSTALL: Update for module aliasing changes.
|
||||
|
|
|
|||
9
INSTALL
9
INSTALL
|
|
@ -130,6 +130,15 @@ you can do that on the command line like this:
|
|||
Or on systems that have the "env" program, you can do it like this:
|
||||
env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
|
||||
|
||||
The flags CFLAGS, CPPFLAGS, LDFLAGS and LIBS can also be set as flags to
|
||||
configure, where the name appears in lower case:
|
||||
configure --enable-cflags=-O2 --enable-libs=-lposix
|
||||
|
||||
The advantage of this form is that `config.status --recheck' will remember
|
||||
the flags you originally specified. You can still override the flags when
|
||||
running `make' (although these will not be passed down via `config.status
|
||||
--recheck').
|
||||
|
||||
Check Generated Files
|
||||
---------------------
|
||||
|
||||
|
|
|
|||
219
aczsh.m4
219
aczsh.m4
|
|
@ -24,6 +24,90 @@ dnl Zsh Development Group have no obligation to provide maintenance,
|
|||
dnl support, updates, enhancements, or modifications.
|
||||
dnl
|
||||
|
||||
dnl
|
||||
dnl Code from the configure system for bash 2.03 (not zsh copyright).
|
||||
dnl If available, use support for large files unless the user specified
|
||||
dnl one of the CPPFLAGS, LDFLAGS, or LIBS variables (<eggert@twinsun.com>
|
||||
dnl via GNU patch 2.5)
|
||||
dnl
|
||||
AC_DEFUN(zsh_LARGE_FILE_SUPPORT,
|
||||
[AC_MSG_CHECKING(whether large file support needs explicit enabling)
|
||||
ac_getconfs=''
|
||||
ac_result=yes
|
||||
ac_set=''
|
||||
ac_shellvars='CPPFLAGS LDFLAGS LIBS'
|
||||
for ac_shellvar in $ac_shellvars; do
|
||||
case $ac_shellvar in
|
||||
CPPFLAGS) ac_lfsvar=LFS_CFLAGS ;;
|
||||
*) ac_lfsvar=LFS_$ac_shellvar ;;
|
||||
esac
|
||||
(getconf $ac_lfsvar) >/dev/null 2>&1 || { ac_result=no; break; }
|
||||
ac_getconf=`getconf $ac_lfsvar`
|
||||
if test -n "$ac_getconf"; then
|
||||
eval test '"${'$ac_shellvar'+set}"' = set && ac_set=$ac_shellvar
|
||||
ac_getconfs=$ac_getconfs$ac_getconf
|
||||
eval ac_test_$ac_shellvar="\$ac_getconf"
|
||||
else
|
||||
eval ac_test_$ac_shellvar="\$$ac_shellvar"
|
||||
fi
|
||||
done
|
||||
case "$ac_result$ac_getconfs" in
|
||||
yes) ac_result=no ;;
|
||||
esac
|
||||
case "$ac_result$ac_set" in
|
||||
yes?*) test "x$ac_set" != "xLDFLAGS" -o "x$auto_ldflags" = x && {
|
||||
ac_result="yes, but $ac_set is already set, so use its settings"
|
||||
}
|
||||
esac
|
||||
AC_MSG_RESULT($ac_result)
|
||||
case $ac_result in
|
||||
yes)
|
||||
for ac_shellvar in $ac_shellvars; do
|
||||
case "`eval echo $ac_shellvar-\\\$ac_test_$ac_shellvar`" in
|
||||
CPPFLAGS*-D_LARGEFILE_SOURCE*) eval $ac_shellvar=\$ac_test_$ac_shellvar
|
||||
;;
|
||||
CPPFLAGS*)
|
||||
eval $ac_shellvar="\"-D_LARGEFILE_SOURCE \$ac_test_$ac_shellvar\""
|
||||
;;
|
||||
*) eval $ac_shellvar=\$ac_test_$ac_shellvar
|
||||
esac
|
||||
done ;;
|
||||
esac
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl zsh_64_BIT_TYPE
|
||||
dnl Check whether the first argument works as a 64-bit type.
|
||||
dnl If there is a non-zero third argument, we just assume it works
|
||||
dnl when we're cross compiling. This is to allow a type to be
|
||||
dnl specified directly as --enable-lfs="long long".
|
||||
dnl Sets the variable given in the second argument to the first argument
|
||||
dnl if the test worked, `no' otherwise. Be careful testing this, as it
|
||||
dnl may produce two words `long long' on an unquoted substitution.
|
||||
dnl This macro does not produce messages as it may be run several times
|
||||
dnl before finding the right type.
|
||||
dnl
|
||||
|
||||
AC_DEFUN(zsh_64_BIT_TYPE,
|
||||
[AC_TRY_RUN([
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
main()
|
||||
{
|
||||
$1 foo = 0;
|
||||
return sizeof($1) != 8;
|
||||
}
|
||||
], $2="$1", $2=no,
|
||||
[if test x$3 != x ; then
|
||||
$2="$1"
|
||||
else
|
||||
$2=no
|
||||
fi])
|
||||
])
|
||||
|
||||
|
||||
dnl
|
||||
dnl zsh_SYS_DYNAMIC_BROKEN
|
||||
dnl Check whether static/shared library linking is broken.
|
||||
|
|
@ -45,7 +129,7 @@ else
|
|||
fi
|
||||
echo '
|
||||
extern char **environ;
|
||||
void *symlist1[] = {
|
||||
void *symlist1[[]] = {
|
||||
(void *)&environ,
|
||||
(void *)0
|
||||
};
|
||||
|
|
@ -56,6 +140,18 @@ $DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS 1>&5 2>&5 &&
|
|||
$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest2.c 1>&5 2>&5 &&
|
||||
$DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&5 2>&5; then
|
||||
AC_TRY_RUN([
|
||||
#ifdef HPUXDYNAMIC
|
||||
#include <dl.h>
|
||||
#define RTLD_LAZY BIND_DEFERRED
|
||||
#define RTLD_GLOBAL DYNAMIC_PATH
|
||||
|
||||
char *zsh_gl_sym_addr ;
|
||||
|
||||
#define dlopen(file,mode) (void *)shl_load((file), (mode), (long) 0)
|
||||
#define dlclose(handle) shl_unload((shl_t)(handle))
|
||||
#define dlsym(handle,name) (zsh_gl_sym_addr=0,shl_findsym((shl_t *)&(handle),name,TYPE_UNDEFINED,&zsh_gl_sym_addr), (void *)zsh_gl_sym_addr)
|
||||
#define dlerror() 0
|
||||
#else
|
||||
#ifdef HAVE_DLFCN_H
|
||||
#include <dlfcn.h>
|
||||
#else
|
||||
|
|
@ -63,6 +159,7 @@ $DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&5 2>&5; then
|
|||
#include <nlist.h>
|
||||
#include <link.h>
|
||||
#endif
|
||||
#endif
|
||||
#ifndef RTLD_LAZY
|
||||
#define RTLD_LAZY 1
|
||||
#endif
|
||||
|
|
@ -116,6 +213,18 @@ $DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS 1>&5 2>&5 &&
|
|||
$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest2.c 1>&5 2>&5 &&
|
||||
$DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&5 2>&5; then
|
||||
AC_TRY_RUN([
|
||||
#ifdef HPUXDYNAMIC
|
||||
#include <dl.h>
|
||||
#define RTLD_LAZY BIND_DEFERRED
|
||||
#define RTLD_GLOBAL DYNAMIC_PATH
|
||||
|
||||
char *zsh_gl_sym_addr ;
|
||||
|
||||
#define dlopen(file,mode) (void *)shl_load((file), (mode), (long) 0)
|
||||
#define dlclose(handle) shl_unload((shl_t)(handle))
|
||||
#define dlsym(handle,name) (zsh_gl_sym_addr=0,shl_findsym((shl_t *)&(handle),name,TYPE_UNDEFINED,&zsh_gl_sym_addr), (void *)zsh_gl_sym_addr)
|
||||
#define dlerror() 0
|
||||
#else
|
||||
#ifdef HAVE_DLFCN_H
|
||||
#include <dlfcn.h>
|
||||
#else
|
||||
|
|
@ -123,6 +232,7 @@ $DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&5 2>&5; then
|
|||
#include <nlist.h>
|
||||
#include <link.h>
|
||||
#endif
|
||||
#endif
|
||||
#ifndef RTLD_LAZY
|
||||
#define RTLD_LAZY 1
|
||||
#endif
|
||||
|
|
@ -130,6 +240,7 @@ $DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&5 2>&5; then
|
|||
#define RTLD_GLOBAL 0
|
||||
#endif
|
||||
|
||||
|
||||
main()
|
||||
{
|
||||
void *handle1, *handle2;
|
||||
|
|
@ -177,6 +288,18 @@ $DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS 1>&5 2>&5 &&
|
|||
$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest2.c 1>&5 2>&5 &&
|
||||
$DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&5 2>&5; then
|
||||
AC_TRY_RUN([
|
||||
#ifdef HPUXDYNAMIC
|
||||
#include <dl.h>
|
||||
#define RTLD_LAZY BIND_DEFERRED
|
||||
#define RTLD_GLOBAL DYNAMIC_PATH
|
||||
|
||||
char *zsh_gl_sym_addr ;
|
||||
|
||||
#define dlopen(file,mode) (void *)shl_load((file), (mode), (long) 0)
|
||||
#define dlclose(handle) shl_unload((shl_t)(handle))
|
||||
#define dlsym(handle,name) (zsh_gl_sym_addr=0,shl_findsym((shl_t *)&(handle),name,TYPE_UNDEFINED,&zsh_gl_sym_addr), (void *)zsh_gl_sym_addr)
|
||||
#define dlerror() 0
|
||||
#else
|
||||
#ifdef HAVE_DLFCN_H
|
||||
#include <dlfcn.h>
|
||||
#else
|
||||
|
|
@ -184,6 +307,7 @@ $DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&5 2>&5; then
|
|||
#include <nlist.h>
|
||||
#include <link.h>
|
||||
#endif
|
||||
#endif
|
||||
#ifndef RTLD_LAZY
|
||||
#define RTLD_LAZY 1
|
||||
#endif
|
||||
|
|
@ -207,6 +331,7 @@ main()
|
|||
[zsh_cv_sys_dynamic_rtld_global=no],
|
||||
[zsh_cv_sys_dynamic_rtld_global=no]
|
||||
)
|
||||
LDFLAGS=$save_ldflags
|
||||
else
|
||||
zsh_cv_sys_dynamic_rtld_global=no
|
||||
fi
|
||||
|
|
@ -233,6 +358,18 @@ $DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS 1>&5 2>&5; then
|
|||
save_ldflags=$LDFLAGS
|
||||
LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
|
||||
AC_TRY_RUN([
|
||||
#ifdef HPUXDYNAMIC
|
||||
#include <dl.h>
|
||||
#define RTLD_LAZY BIND_DEFERRED
|
||||
#define RTLD_GLOBAL DYNAMIC_PATH
|
||||
|
||||
char *zsh_gl_sym_addr ;
|
||||
|
||||
#define dlopen(file,mode) (void *)shl_load((file), (mode), (long) 0)
|
||||
#define dlclose(handle) shl_unload((shl_t)(handle))
|
||||
#define dlsym(handle,name) (zsh_gl_sym_addr=0,shl_findsym((shl_t *)&(handle),name,TYPE_UNDEFINED,&zsh_gl_sym_addr), (void *)zsh_gl_sym_addr)
|
||||
#define dlerror() 0
|
||||
#else
|
||||
#ifdef HAVE_DLFCN_H
|
||||
#include <dlfcn.h>
|
||||
#else
|
||||
|
|
@ -240,6 +377,7 @@ $DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS 1>&5 2>&5; then
|
|||
#include <nlist.h>
|
||||
#include <link.h>
|
||||
#endif
|
||||
#endif
|
||||
#ifndef RTLD_LAZY
|
||||
#define RTLD_LAZY 1
|
||||
#endif
|
||||
|
|
@ -293,6 +431,18 @@ elif
|
|||
save_ldflags=$LDFLAGS
|
||||
LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS -s"
|
||||
AC_TRY_RUN([
|
||||
#ifdef HPUXDYNAMIC
|
||||
#include <dl.h>
|
||||
#define RTLD_LAZY BIND_DEFERRED
|
||||
#define RTLD_GLOBAL DYNAMIC_PATH
|
||||
|
||||
char *zsh_gl_sym_addr ;
|
||||
|
||||
#define dlopen(file,mode) (void *)shl_load((file), (mode), (long) 0)
|
||||
#define dlclose(handle) shl_unload((shl_t)(handle))
|
||||
#define dlsym(handle,name) (zsh_gl_sym_addr=0,shl_findsym((shl_t *)&(handle),name,TYPE_UNDEFINED,&zsh_gl_sym_addr), (void *)zsh_gl_sym_addr)
|
||||
#define dlerror() 0
|
||||
#else
|
||||
#ifdef HAVE_DLFCN_H
|
||||
#include <dlfcn.h>
|
||||
#else
|
||||
|
|
@ -300,6 +450,7 @@ elif
|
|||
#include <nlist.h>
|
||||
#include <link.h>
|
||||
#endif
|
||||
#endif
|
||||
#ifndef RTLD_LAZY
|
||||
#define RTLD_LAZY 1
|
||||
#endif
|
||||
|
|
@ -347,6 +498,18 @@ echo 'int fred () { return 42; }' > conftest1.c
|
|||
if $CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest1.c 1>&5 2>&5 &&
|
||||
$DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS -s conftest1.o $LIBS 1>&5 2>&5; then
|
||||
AC_TRY_RUN([
|
||||
#ifdef HPUXDYNAMIC
|
||||
#include <dl.h>
|
||||
#define RTLD_LAZY BIND_DEFERRED
|
||||
#define RTLD_GLOBAL DYNAMIC_PATH
|
||||
|
||||
char *zsh_gl_sym_addr ;
|
||||
|
||||
#define dlopen(file,mode) (void *)shl_load((file), (mode), (long) 0)
|
||||
#define dlclose(handle) shl_unload((shl_t)(handle))
|
||||
#define dlsym(handle,name) (zsh_gl_sym_addr=0,shl_findsym((shl_t *)&(handle),name,TYPE_UNDEFINED,&zsh_gl_sym_addr), (void *)zsh_gl_sym_addr)
|
||||
#define dlerror() 0
|
||||
#else
|
||||
#ifdef HAVE_DLFCN_H
|
||||
#include <dlfcn.h>
|
||||
#else
|
||||
|
|
@ -354,6 +517,7 @@ $DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS -s conftest1.o $LIBS 1>&5 2>&5; t
|
|||
#include <nlist.h>
|
||||
#include <link.h>
|
||||
#endif
|
||||
#endif
|
||||
#ifndef RTLD_LAZY
|
||||
#define RTLD_LAZY 1
|
||||
#endif
|
||||
|
|
@ -388,7 +552,7 @@ dnl
|
|||
|
||||
AC_DEFUN(zsh_PATH_UTMP,
|
||||
[AC_CACHE_CHECK([for $1 file], [zsh_cv_path_$1],
|
||||
[for dir in /etc /usr/etc /var/adm /usr/adm /var/run ./conftest; do
|
||||
[for dir in /etc /usr/etc /var/adm /usr/adm /var/run /var/log ./conftest; do
|
||||
zsh_cv_path_$1=${dir}/$1
|
||||
test -f $zsh_cv_path_$1 && break
|
||||
zsh_cv_path_$1=no
|
||||
|
|
@ -431,3 +595,54 @@ if test $zsh_cv_struct_member_[]translit($2, [ ], [_])_$3 = yes; then
|
|||
AC_DEFINE(HAVE_[]translit($2_$3, [ a-z], [_A-Z]))
|
||||
fi
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl zsh_ARG_PROGRAM
|
||||
dnl Handle AC_ARG_PROGRAM substitutions into other zsh configure macros.
|
||||
dnl After processing this macro, the configure script may refer to
|
||||
dnl and $tzsh_name, and @tzsh@ is defined for make substitutions.
|
||||
dnl
|
||||
|
||||
AC_DEFUN(zsh_ARG_PROGRAM,
|
||||
[AC_ARG_PROGRAM
|
||||
# Un-double any \ or $ (doubled by AC_ARG_PROGRAM).
|
||||
cat <<\EOF_SED > conftestsed
|
||||
s,\\\\,\\,g; s,\$\$,$,g
|
||||
EOF_SED
|
||||
zsh_transform_name=`echo "${program_transform_name}" | sed -f conftestsed`
|
||||
rm -f conftestsed
|
||||
tzsh_name=`echo zsh | sed -e "${zsh_transform_name}"`
|
||||
# Double any \ or $ in the transformed name that results.
|
||||
cat <<\EOF_SED >> conftestsed
|
||||
s,\\,\\\\,g; s,\$,$$,g
|
||||
EOF_SED
|
||||
tzsh=`echo ${tzsh_name} | sed -f conftestsed`
|
||||
rm -f conftestsed
|
||||
AC_SUBST(tzsh)dnl
|
||||
])
|
||||
|
||||
AC_DEFUN(zsh_COMPILE_FLAGS,
|
||||
[AC_ARG_ENABLE(cppflags,
|
||||
[ --enable-cppflags=... specify C preprocessor flags],
|
||||
if test "$enableval" = "yes"
|
||||
then CPPFLAGS="$1"
|
||||
else CPPFLAGS="$enable_cppflags"
|
||||
fi)
|
||||
AC_ARG_ENABLE(cflags,
|
||||
[ --enable-cflags=... specify C compiler flags],
|
||||
if test "$enableval" = "yes"
|
||||
then CFLAGS="$1"
|
||||
else CFLAGS="$enable_cflags"
|
||||
fi)
|
||||
AC_ARG_ENABLE(ldflags,
|
||||
[ --enable-ldflags=... specify linker flags],
|
||||
if test "$enableval" = "yes"
|
||||
then LDFLAGS="$2"
|
||||
else LDFLAGS="$enable_ldflags"
|
||||
fi)
|
||||
AC_ARG_ENABLE(libs,
|
||||
[ --enable-libs=... specify link libraries],
|
||||
if test "$enableval" = "yes"
|
||||
then LIBS="$3"
|
||||
else LIBS="$enable_libs"
|
||||
fi)])
|
||||
|
|
|
|||
|
|
@ -48,6 +48,9 @@ dnl -----------------------------
|
|||
dnl Handle --program-prefix, --program-suffix, etc.
|
||||
zsh_ARG_PROGRAM
|
||||
|
||||
dnl Handle setting of compile flags (CPPFLAGS, CFLAGS, LDFLAGS, LIBS).
|
||||
zsh_COMPILE_FLAGS
|
||||
|
||||
dnl Do you want to debug zsh?
|
||||
undefine([zsh-debug])dnl
|
||||
AC_ARG_ENABLE(zsh-debug,
|
||||
|
|
|
|||
Loading…
Reference in New Issue