configure cleanup.
This commit is contained in:
Bruce Momjian
parent
4b6fcc4459
commit
34fec16198
379
src/configure.in
379
src/configure.in
|
|
@ -7,10 +7,10 @@ AC_CANONICAL_HOST
|
|||
tas_file=dummy.s
|
||||
case "$host_os" in
|
||||
solaris*)
|
||||
case "$host_cpu" in
|
||||
sparc) os=sparc_solaris need_tas=yes tas_file=sparc_solaris.s ;;
|
||||
i386) os=i386_solaris need_tas=yes tas_file=i386_solaris.s ;;
|
||||
esac ;;
|
||||
case "$host_cpu" in
|
||||
sparc) os=sparc_solaris need_tas=yes tas_file=sparc_solaris.s ;;
|
||||
i386) os=i386_solaris need_tas=yes tas_file=i386_solaris.s ;;
|
||||
esac ;;
|
||||
sunos*) os=sunos4 need_tas=no ;;
|
||||
aux*) os=aux need_tas=no ;;
|
||||
linux*) os=linux need_tas=no ;;
|
||||
|
|
@ -26,10 +26,10 @@ nextstep*) os=nextstep need_tas=no ;;
|
|||
sco*) os=sco need_tas=no ;;
|
||||
machten*) os=machten need_tas=no ;;
|
||||
cygwin*) os=win need_tas=no ;;
|
||||
sysv4.2*)
|
||||
sysv4.2*)
|
||||
case "$host_vendor" in
|
||||
univel) os=univel need_tas=no ;;
|
||||
*) os=unknown need_tas=no ;;
|
||||
univel) os=univel need_tas=no ;;
|
||||
*) os=unknown need_tas=no ;;
|
||||
esac ;;
|
||||
sysv4*) os=svr4 need_tas=no ;;
|
||||
*) echo ""
|
||||
|
|
@ -48,14 +48,14 @@ if test "X$need_tas" = "Xyes"
|
|||
then
|
||||
AC_LINK_FILES(backend/port/tas/${tas_file}, backend/port/tas.s)
|
||||
TAS=tas.o
|
||||
AC_SUBST(TAS)
|
||||
AC_SUBST(TAS)
|
||||
fi
|
||||
|
||||
PORTNAME=${os}
|
||||
AC_LINK_FILES(backend/port/dynloader/${os}.c, backend/port/dynloader.c)
|
||||
AC_LINK_FILES(backend/port/dynloader/${os}.h, include/dynloader.h)
|
||||
AC_LINK_FILES(include/port/${os}.h, include/os.h)
|
||||
AC_LINK_FILES(makefiles/Makefile.${os}, Makefile.port)
|
||||
AC_LINK_FILES(makefiles/Makefile.${os}, Makefile.port)
|
||||
|
||||
AC_SUBST(PORTNAME)
|
||||
|
||||
|
|
@ -80,7 +80,7 @@ PostgreSQL software.
|
|||
EOT
|
||||
|
||||
dnl this part selects the template from the one in the
|
||||
dnl template directory.
|
||||
dnl template directory.
|
||||
|
||||
if test "X$with_template" != "X"
|
||||
then
|
||||
|
|
@ -122,7 +122,7 @@ EOT
|
|||
echo "You must choose an appropriate template file."
|
||||
exit
|
||||
fi
|
||||
TEMPLATE=template/$TEMPLATE
|
||||
TEMPLATE=template/$TEMPLATE
|
||||
fi
|
||||
export TEMPLATE
|
||||
echo ""
|
||||
|
|
@ -154,11 +154,11 @@ AC_ARG_WITH(includes,
|
|||
|
||||
if test "$INCLUDE_DIRS"; then
|
||||
for dir in $INCLUDE_DIRS; do
|
||||
if test -d "$dir"; then
|
||||
PGSQL_CPPFLAGS="$PGSQL_CPPFLAGS -I$dir"
|
||||
else
|
||||
AC_MSG_WARN([*** Include directory $dir does not exist.])
|
||||
fi
|
||||
if test -d "$dir"; then
|
||||
PGSQL_CPPFLAGS="$PGSQL_CPPFLAGS -I$dir"
|
||||
else
|
||||
AC_MSG_WARN([*** Include directory $dir does not exist.])
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
|
|
@ -175,41 +175,41 @@ AC_ARG_WITH(libraries,
|
|||
|
||||
if test "$LIBRARY_DIRS"; then
|
||||
for dir in $withval; do
|
||||
if test -d "$dir"; then
|
||||
PGSQL_LDFLAGS="$PGSQL_LDFLAGS -L$dir"
|
||||
else
|
||||
AC_MSG_WARN([*** Library directory $dir does not exist.])
|
||||
fi
|
||||
if test -d "$dir"; then
|
||||
PGSQL_LDFLAGS="$PGSQL_LDFLAGS -L$dir"
|
||||
else
|
||||
AC_MSG_WARN([*** Library directory $dir does not exist.])
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
dnl We have read the default value of USE_LOCALE from the template
|
||||
dnl file. We have a further option of using
|
||||
dnl --disable-locale to explicitly disable it
|
||||
dnl --enable-locale to explicitly enable it
|
||||
dnl We have read the default value of USE_LOCALE from the template
|
||||
dnl file. We have a further option of using
|
||||
dnl --disable-locale to explicitly disable it
|
||||
dnl --enable-locale to explicitly enable it
|
||||
dnl It defaults to disabled
|
||||
AC_MSG_CHECKING(setting USE_LOCALE)
|
||||
AC_ARG_ENABLE(
|
||||
locale,
|
||||
[ --enable-locale enable locale support ],
|
||||
[ --enable-locale enable locale support ],
|
||||
AC_DEFINE(USE_LOCALE) AC_MSG_RESULT(enabled),
|
||||
AC_MSG_RESULT(disabled)
|
||||
)
|
||||
|
||||
dnl We exclude cyrillic recode support unless we override it with
|
||||
dnl --enable-recode
|
||||
dnl --disable-recode to explicitly disable it
|
||||
dnl --enable-recode to explicitly enable it
|
||||
dnl --disable-recode to explicitly disable it
|
||||
dnl --enable-recode to explicitly enable it
|
||||
dnl It defaults to disabled
|
||||
AC_MSG_CHECKING(setting CYR_RECODE)
|
||||
AC_ARG_ENABLE(
|
||||
recode,
|
||||
[ --enable-recode enable cyrillic recode support ],
|
||||
[ --enable-recode enable cyrillic recode support ],
|
||||
AC_DEFINE(CYR_RECODE) AC_MSG_RESULT(enabled),
|
||||
AC_MSG_RESULT(disabled)
|
||||
)
|
||||
|
||||
dnl We use the default value of 5432 for the DEF_PGPORT value. If
|
||||
dnl We use the default value of 5432 for the DEF_PGPORT value. If
|
||||
dnl we over-ride it with --with-pgport=port then we bypass this piece
|
||||
AC_MSG_CHECKING(setting DEF_PGPORT)
|
||||
AC_ARG_WITH(
|
||||
|
|
@ -223,7 +223,7 @@ dnl We exclude tcl support unless we override it with --with-tcl
|
|||
AC_MSG_CHECKING(setting USE_TCL)
|
||||
AC_ARG_WITH(
|
||||
tcl,
|
||||
[ --with-tcl use tcl ],
|
||||
[ --with-tcl use tcl ],
|
||||
USE_TCL=true; AC_MSG_RESULT(enabled),
|
||||
USE_TCL=false; AC_MSG_RESULT(disabled)
|
||||
)
|
||||
|
|
@ -234,18 +234,18 @@ if test "$USE_TCL"; then
|
|||
tcl_dirs="tcl8.0 tcl80 tcl7.6 tcl76"
|
||||
tk_dirs="tk8.0 tk4.2"
|
||||
for dir in $header_dirs; do
|
||||
for tcl_dir in $tcl_dirs; do
|
||||
if test -d "$dir/$tcl_dir"; then
|
||||
PGSQL_CPPFLAGS="$PGSQL_CPPFLAGS -I$dir/$tcl_dir"
|
||||
fi
|
||||
done
|
||||
for tcl_dir in $tcl_dirs; do
|
||||
if test -d "$dir/$tcl_dir"; then
|
||||
PGSQL_CPPFLAGS="$PGSQL_CPPFLAGS -I$dir/$tcl_dir"
|
||||
fi
|
||||
done
|
||||
done
|
||||
for dir in $header_dirs; do
|
||||
for tk_dir in $tk_dirs; do
|
||||
if test -d "$dir/$tk_dir"; then
|
||||
PGSQL_CPPFLAGS="$PGSQL_CPPFLAGS -I$dir/$tk_dir"
|
||||
fi
|
||||
done
|
||||
for tk_dir in $tk_dirs; do
|
||||
if test -d "$dir/$tk_dir"; then
|
||||
PGSQL_CPPFLAGS="$PGSQL_CPPFLAGS -I$dir/$tk_dir"
|
||||
fi
|
||||
done
|
||||
done
|
||||
fi
|
||||
export USE_TCL
|
||||
|
|
@ -255,7 +255,7 @@ dnl We exclude perl support unless we override it with --with-perl
|
|||
AC_MSG_CHECKING(setting USE_PERL)
|
||||
AC_ARG_WITH(
|
||||
perl,
|
||||
[ --with-perl use perl ],
|
||||
[ --with-perl use perl ],
|
||||
USE_PERL=true; AC_MSG_RESULT(enabled),
|
||||
USE_PERL=false; AC_MSG_RESULT(disabled)
|
||||
)
|
||||
|
|
@ -264,15 +264,15 @@ dnl Verify that postgres is already installed
|
|||
dnl per instructions for perl interface installation
|
||||
if test "$USE_PERL" = "true"; then
|
||||
if test ! -x $prefix/bin/postgres; then
|
||||
AC_MSG_WARN(perl support disabled; postgres not previously installed)
|
||||
USE_PERL=
|
||||
AC_MSG_WARN(perl support disabled; postgres not previously installed)
|
||||
USE_PERL=
|
||||
fi
|
||||
fi
|
||||
export USE_PERL
|
||||
|
||||
dnl Unless we specify the command line options
|
||||
dnl --disable cassert to explicitly disable it
|
||||
dnl --enable cassert to explicitly enable it
|
||||
dnl --disable cassert to explicitly disable it
|
||||
dnl --enable cassert to explicitly enable it
|
||||
dnl If you do not explicitly do it, it defaults to disabled - we
|
||||
dnl should make the default enabled for the development cycle
|
||||
dnl We need some explanatory text here.
|
||||
|
|
@ -286,9 +286,9 @@ AC_ARG_ENABLE(
|
|||
|
||||
if test "X$with_compiler" != "X"
|
||||
then
|
||||
CC=$with_compiler
|
||||
CC=$with_compiler
|
||||
else
|
||||
AC_PROG_CC
|
||||
AC_PROG_CC
|
||||
fi
|
||||
|
||||
CPPFLAGS="$CPPFLAGS $PGSQL_CPPFLAGS"
|
||||
|
|
@ -334,8 +334,8 @@ INSTALLPATH="/usr/ucb:$PATH"
|
|||
AC_PATH_PROGS(INSTALL, ginstall installbsd bsdinst scoinst install, NONE, $INSTALLPATH)
|
||||
if test $INSTALL = "NONE"
|
||||
then
|
||||
echo "- No Install Script found - aborting."
|
||||
exit 0;
|
||||
echo "- No Install Script found - aborting."
|
||||
exit 0;
|
||||
fi
|
||||
|
||||
INSTLOPTS="-m 444"
|
||||
|
|
@ -359,15 +359,15 @@ dnl Check the option to echo to inhibit newlines.
|
|||
ECHO_N_OUT=`echo -n "" | wc -c`
|
||||
ECHO_C_OUT=`echo "\c" | wc -c`
|
||||
if test "$ECHO_N_OUT" -eq 0; then
|
||||
DASH_N='-n'
|
||||
BACKSLASH_C=
|
||||
DASH_N='-n'
|
||||
BACKSLASH_C=
|
||||
else
|
||||
if test "ECHO_C_OUT" -eq 0; then
|
||||
DASH_N=
|
||||
BACKSLASH_C='\\\\c'
|
||||
else
|
||||
AC_MSG_ERROR("echo behaviour undetermined")
|
||||
fi
|
||||
if test "ECHO_C_OUT" -eq 0; then
|
||||
DASH_N=
|
||||
BACKSLASH_C='\\\\c'
|
||||
else
|
||||
AC_MSG_ERROR("echo behaviour undetermined")
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(DASH_N)
|
||||
AC_SUBST(BACKSLASH_C)
|
||||
|
|
@ -390,11 +390,11 @@ TRSTRINGS="`echo ABCdef | $TR '[[a-z]]' '[[A-Z]]' 2>/dev/null | grep ABCDEF`"
|
|||
TRCLASS="`echo ABCdef | $TR '[[:lower:]]' '[[:upper:]]' 2>/dev/null | grep ABCDEF`"
|
||||
|
||||
if test "$TRSTRINGS" = "ABCDEF"; then
|
||||
TRARGS="'[[a-z]]' '[[A-Z]]'"
|
||||
TRARGS="'[[a-z]]' '[[A-Z]]'"
|
||||
elif test "$TRCLASS" = "ABCDEF"; then
|
||||
TRARGS="'[[:lower:]]' '[[:upper:]]'"
|
||||
TRARGS="'[[:lower:]]' '[[:upper:]]'"
|
||||
else
|
||||
AC_MSG_ERROR("Can\'t find method to covert from upper to lower case with tr")
|
||||
AC_MSG_ERROR("Can\'t find method to covert from upper to lower case with tr")
|
||||
fi
|
||||
AC_SUBST(TRARGS)
|
||||
|
||||
|
|
@ -407,7 +407,7 @@ AC_SUBST(YACC)
|
|||
AC_SUBST(YFLAGS)
|
||||
AC_PATH_PROG(yacc, yacc)
|
||||
AC_PATH_PROG(bison, bison)
|
||||
if test -f "$YACC"
|
||||
if test -f "$YACC"
|
||||
then
|
||||
echo "- Using $YACC $YFLAGS"
|
||||
elif test -f "$bison"
|
||||
|
|
@ -443,9 +443,9 @@ AC_CHECK_LIB(ln, main)
|
|||
AC_CHECK_LIB(ld, main)
|
||||
AC_CHECK_LIB(compat, main)
|
||||
AC_CHECK_LIB(BSD, main)
|
||||
AC_CHECK_LIB(crypt, main)
|
||||
AC_CHECK_LIB(crypt, main)
|
||||
AC_CHECK_LIB(gen, main)
|
||||
AC_CHECK_LIB(PW, main)
|
||||
AC_CHECK_LIB(PW, main)
|
||||
|
||||
dnl Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
|
|
@ -468,24 +468,24 @@ AC_STRUCT_TM
|
|||
|
||||
dnl Check for any "odd" conditions
|
||||
AC_MSG_CHECKING(for int timezone)
|
||||
AC_TRY_LINK([#include <time.h>],
|
||||
[int res = timezone / 60; ],
|
||||
[AC_DEFINE(HAVE_INT_TIMEZONE) AC_MSG_RESULT(yes)],
|
||||
AC_MSG_RESULT(no))
|
||||
AC_TRY_LINK([#include <time.h>],
|
||||
[int res = timezone / 60; ],
|
||||
[AC_DEFINE(HAVE_INT_TIMEZONE) AC_MSG_RESULT(yes)],
|
||||
AC_MSG_RESULT(no))
|
||||
|
||||
AC_MSG_CHECKING(for gettimeofday args)
|
||||
AC_TRY_LINK([#include <sys/time.h>],
|
||||
[struct timeval *tp; struct timezone *tzp; gettimeofday(tp,tzp); ],
|
||||
[AC_DEFINE(HAVE_GETTIMEOFDAY_2_ARGS) AC_MSG_RESULT(2 args)],
|
||||
AC_MSG_RESULT(no))
|
||||
AC_TRY_LINK([#include <sys/time.h>],
|
||||
[struct timeval *tp; struct timezone *tzp; gettimeofday(tp,tzp); ],
|
||||
[AC_DEFINE(HAVE_GETTIMEOFDAY_2_ARGS) AC_MSG_RESULT(2 args)],
|
||||
AC_MSG_RESULT(no))
|
||||
|
||||
AC_MSG_CHECKING(for union semun)
|
||||
AC_TRY_LINK([#include <sys/types.h>
|
||||
#include <sys/ipc.h>
|
||||
#include <sys/sem.h>],
|
||||
[union semun semun;],
|
||||
[AC_DEFINE(HAVE_UNION_SEMUN) AC_MSG_RESULT(yes)],
|
||||
AC_MSG_RESULT(no))
|
||||
[union semun semun;],
|
||||
[AC_DEFINE(HAVE_UNION_SEMUN) AC_MSG_RESULT(yes)],
|
||||
AC_MSG_RESULT(no))
|
||||
|
||||
dnl Checks for library functions.
|
||||
AC_PROG_GCC_TRADITIONAL
|
||||
|
|
@ -495,93 +495,93 @@ AC_FUNC_VPRINTF
|
|||
AC_CHECK_FUNCS(tzset vfork memmove sigsetjmp kill sysconf fpclass)
|
||||
AC_CHECK_FUNCS(fp_class fp_class_d class)
|
||||
AC_CHECK_FUNCS(sigprocmask waitpid setsid fcvt)
|
||||
AC_CHECK_FUNC(isinf,
|
||||
AC_DEFINE(HAVE_ISINF),
|
||||
ISINF='isinf.o')
|
||||
AC_CHECK_FUNC(isinf,
|
||||
AC_DEFINE(HAVE_ISINF),
|
||||
ISINF='isinf.o')
|
||||
AC_SUBST(ISINF)
|
||||
AC_CHECK_FUNC(getrusage,
|
||||
AC_DEFINE(HAVE_GETRUSAGE),
|
||||
GETRUSAGE='getrusage.o')
|
||||
AC_CHECK_FUNC(getrusage,
|
||||
AC_DEFINE(HAVE_GETRUSAGE),
|
||||
GETRUSAGE='getrusage.o')
|
||||
AC_SUBST(GETRUSAGE)
|
||||
AC_CHECK_FUNC(srandom,
|
||||
AC_DEFINE(HAVE_SRANDOM),
|
||||
SRANDOM='srandom.o')
|
||||
AC_CHECK_FUNC(srandom,
|
||||
AC_DEFINE(HAVE_SRANDOM),
|
||||
SRANDOM='srandom.o')
|
||||
AC_SUBST(SRANDOM)
|
||||
AC_CHECK_FUNC(gethostname,
|
||||
AC_DEFINE(HAVE_GETHOSTNAME),
|
||||
GETHOSTNAME='gethostname.o')
|
||||
AC_CHECK_FUNC(gethostname,
|
||||
AC_DEFINE(HAVE_GETHOSTNAME),
|
||||
GETHOSTNAME='gethostname.o')
|
||||
AC_SUBST(GETHOSTNAME)
|
||||
AC_CHECK_FUNC(random,
|
||||
AC_DEFINE(HAVE_RANDOM),
|
||||
MISSING_RANDOM='random.o')
|
||||
AC_CHECK_FUNC(random,
|
||||
AC_DEFINE(HAVE_RANDOM),
|
||||
MISSING_RANDOM='random.o')
|
||||
AC_SUBST(MISSING_RANDOM)
|
||||
AC_CHECK_FUNC(inet_aton,
|
||||
AC_DEFINE(HAVE_INET_ATON),
|
||||
INET_ATON='inet_aton.o')
|
||||
AC_CHECK_FUNC(inet_aton,
|
||||
AC_DEFINE(HAVE_INET_ATON),
|
||||
INET_ATON='inet_aton.o')
|
||||
AC_SUBST(INET_ATON)
|
||||
AC_CHECK_FUNC(strerror,
|
||||
AC_DEFINE(HAVE_STRERROR),
|
||||
[STRERROR='strerror.o' STRERROR2='../../backend/port/strerror.o'])
|
||||
AC_CHECK_FUNC(strerror,
|
||||
AC_DEFINE(HAVE_STRERROR),
|
||||
[STRERROR='strerror.o' STRERROR2='../../backend/port/strerror.o'])
|
||||
AC_SUBST(STRERROR)
|
||||
AC_SUBST(STRERROR2)
|
||||
AC_CHECK_FUNC(strdup,
|
||||
AC_DEFINE(HAVE_STRDUP),
|
||||
STRDUP='../../utils/strdup.o')
|
||||
AC_CHECK_FUNC(strdup,
|
||||
AC_DEFINE(HAVE_STRDUP),
|
||||
STRDUP='../../utils/strdup.o')
|
||||
AC_SUBST(STRDUP)
|
||||
AC_CHECK_FUNC(strtol,
|
||||
AC_DEFINE(HAVE_STRTOL),
|
||||
STRTOL='strtol.o')
|
||||
AC_CHECK_FUNC(strtol,
|
||||
AC_DEFINE(HAVE_STRTOL),
|
||||
STRTOL='strtol.o')
|
||||
AC_SUBST(STRTOL)
|
||||
AC_CHECK_FUNC(strtoul,
|
||||
AC_DEFINE(HAVE_STRTOUL),
|
||||
STRTOL='strtoul.o')
|
||||
AC_CHECK_FUNC(strtoul,
|
||||
AC_DEFINE(HAVE_STRTOUL),
|
||||
STRTOL='strtoul.o')
|
||||
AC_SUBST(STRTOUL)
|
||||
AC_CHECK_FUNC(strcasecmp,
|
||||
AC_DEFINE(HAVE_STRCASECMP),
|
||||
STRCASECMP='strcasecmp.o')
|
||||
AC_CHECK_FUNC(strcasecmp,
|
||||
AC_DEFINE(HAVE_STRCASECMP),
|
||||
STRCASECMP='strcasecmp.o')
|
||||
AC_SUBST(STRCASECMP)
|
||||
AC_CHECK_FUNC(cbrt,
|
||||
AC_DEFINE(HAVE_CBRT),
|
||||
AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT)))
|
||||
AC_CHECK_FUNC(rint,
|
||||
AC_DEFINE(HAVE_RINT),
|
||||
AC_CHECK_LIB(m, rint, AC_DEFINE(HAVE_RINT)))
|
||||
AC_CHECK_FUNC(cbrt,
|
||||
AC_DEFINE(HAVE_CBRT),
|
||||
AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT)))
|
||||
AC_CHECK_FUNC(rint,
|
||||
AC_DEFINE(HAVE_RINT),
|
||||
AC_CHECK_LIB(m, rint, AC_DEFINE(HAVE_RINT)))
|
||||
|
||||
dnl Check for X libraries
|
||||
|
||||
if test "$USE_X" = true; then
|
||||
|
||||
ice_save_LIBS="$LIBS"
|
||||
ice_save_CFLAGS="$CFLAGS"
|
||||
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||
ice_save_LDFLAGS="$LDFLAGS"
|
||||
ice_save_LIBS="$LIBS"
|
||||
ice_save_CFLAGS="$CFLAGS"
|
||||
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||
ice_save_LDFLAGS="$LDFLAGS"
|
||||
|
||||
AC_PATH_XTRA
|
||||
AC_PATH_XTRA
|
||||
|
||||
LIBS="$LIBS $X_EXTRA_LIBS"
|
||||
CFLAGS="$CFLAGS $X_CFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
LDFLAGS="$LDFLAGS $X_LIBS"
|
||||
LIBS="$LIBS $X_EXTRA_LIBS"
|
||||
CFLAGS="$CFLAGS $X_CFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
LDFLAGS="$LDFLAGS $X_LIBS"
|
||||
|
||||
dnl Check for X library
|
||||
dnl Check for X library
|
||||
|
||||
X11_LIBS=""
|
||||
AC_CHECK_LIB(X11, XOpenDisplay, X11_LIBS="-lX11",,${X_PRE_LIBS})
|
||||
if test "$X11_LIBS" = ""; then
|
||||
dnl Not having X may be fatal. Let the user fix this.
|
||||
AC_MSG_WARN([The X11 library '-lX11' could not be found.
|
||||
Please use the configure options '--x-includes=DIR'
|
||||
and '--x-libraries=DIR' to specify the X location.
|
||||
See the file 'config.log' for further diagnostics.])
|
||||
fi
|
||||
AC_SUBST(X_LIBS)
|
||||
AC_SUBST(X11_LIBS)
|
||||
AC_SUBST(X_PRE_LIBS)
|
||||
X11_LIBS=""
|
||||
AC_CHECK_LIB(X11, XOpenDisplay, X11_LIBS="-lX11",,${X_PRE_LIBS})
|
||||
if test "$X11_LIBS" = ""; then
|
||||
dnl Not having X may be fatal. Let the user fix this.
|
||||
AC_MSG_WARN([The X11 library '-lX11' could not be found.
|
||||
Please use the configure options '--x-includes=DIR'
|
||||
and '--x-libraries=DIR' to specify the X location.
|
||||
See the file 'config.log' for further diagnostics.])
|
||||
fi
|
||||
AC_SUBST(X_LIBS)
|
||||
AC_SUBST(X11_LIBS)
|
||||
AC_SUBST(X_PRE_LIBS)
|
||||
|
||||
LIBS="$ice_save_LIBS"
|
||||
CFLAGS="$ice_save_CFLAGS"
|
||||
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||
LDFLAGS="$ice_save_LDFLAGS"
|
||||
LIBS="$ice_save_LIBS"
|
||||
CFLAGS="$ice_save_CFLAGS"
|
||||
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||
LDFLAGS="$ice_save_LDFLAGS"
|
||||
fi
|
||||
|
||||
dnl Check for location of Tcl support
|
||||
|
|
@ -590,12 +590,12 @@ dnl Disable Tcl support if not found
|
|||
dnl Check for tcl.h
|
||||
if test "$USE_TCL" = "true"
|
||||
then
|
||||
TCL_INCDIR=no
|
||||
AC_CHECK_HEADER(tcl.h, TCL_INCDIR=yes)
|
||||
if test "$TCL_INCDIR" = "no"; then
|
||||
AC_MSG_WARN(tcl support disabled; tcl.h missing)
|
||||
USE_TCL=
|
||||
fi
|
||||
TCL_INCDIR=no
|
||||
AC_CHECK_HEADER(tcl.h, TCL_INCDIR=yes)
|
||||
if test "$TCL_INCDIR" = "no"; then
|
||||
AC_MSG_WARN(tcl support disabled; tcl.h missing)
|
||||
USE_TCL=
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl Check for Tcl archive
|
||||
|
|
@ -603,15 +603,15 @@ if test "$USE_TCL" = "true"; then
|
|||
TCL_LIB=
|
||||
tcl_libs="tcl8.0 tcl80 tcl7.6 tcl76 tcl"
|
||||
for tcl_lib in $tcl_libs; do
|
||||
if test -z "$TCL_LIB"; then
|
||||
AC_CHECK_LIB($tcl_lib, main, TCL_LIB=$tcl_lib)
|
||||
fi
|
||||
if test -z "$TCL_LIB"; then
|
||||
AC_CHECK_LIB($tcl_lib, main, TCL_LIB=$tcl_lib)
|
||||
fi
|
||||
done
|
||||
if test -z "$TCL_LIB"; then
|
||||
AC_MSG_WARN(tcl support disabled; Tcl library missing)
|
||||
USE_TCL=
|
||||
AC_MSG_WARN(tcl support disabled; Tcl library missing)
|
||||
USE_TCL=
|
||||
else
|
||||
TCL_LIB=-l$TCL_LIB
|
||||
TCL_LIB=-l$TCL_LIB
|
||||
fi
|
||||
AC_SUBST(TCL_LIB)
|
||||
fi
|
||||
|
|
@ -622,58 +622,59 @@ dnl Disable Tcl support if Tk not found
|
|||
dnl Check for tk.h
|
||||
if test "$USE_TCL" = "true"
|
||||
then
|
||||
ice_save_LIBS="$LIBS"
|
||||
ice_save_CFLAGS="$CFLAGS"
|
||||
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||
ice_save_LDFLAGS="$LDFLAGS"
|
||||
|
||||
ice_save_LIBS="$LIBS"
|
||||
ice_save_CFLAGS="$CFLAGS"
|
||||
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||
ice_save_LDFLAGS="$LDFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
TK_INCDIR=no
|
||||
AC_CHECK_HEADER(tk.h, TK_INCDIR=yes)
|
||||
if test "$TK_INCDIR" = "no"; then
|
||||
AC_MSG_WARN(tcl support disabled; tk.h missing)
|
||||
USE_TCL=
|
||||
fi
|
||||
|
||||
TK_INCDIR=no
|
||||
AC_CHECK_HEADER(tk.h, TK_INCDIR=yes)
|
||||
if test "$TK_INCDIR" = "no"; then
|
||||
AC_MSG_WARN(tcl support disabled; tk.h missing)
|
||||
USE_TCL=
|
||||
fi
|
||||
|
||||
LIBS="$ice_save_LIBS"
|
||||
CFLAGS="$ice_save_CFLAGS"
|
||||
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||
LDFLAGS="$ice_save_LDFLAGS"
|
||||
LIBS="$ice_save_LIBS"
|
||||
CFLAGS="$ice_save_CFLAGS"
|
||||
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||
LDFLAGS="$ice_save_LDFLAGS"
|
||||
fi
|
||||
|
||||
dnl Check for Tk archive
|
||||
if test "$USE_TCL" = "true"
|
||||
then
|
||||
ice_save_LIBS="$LIBS"
|
||||
ice_save_CFLAGS="$CFLAGS"
|
||||
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||
ice_save_LDFLAGS="$LDFLAGS"
|
||||
LIBS="$LIBS $X_EXTRA_LIBS"
|
||||
CFLAGS="$CFLAGS $X_CFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
LDFLAGS="$LDFLAGS $X_LIBS"
|
||||
TK_LIB=
|
||||
ice_save_LIBS="$LIBS"
|
||||
ice_save_CFLAGS="$CFLAGS"
|
||||
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||
ice_save_LDFLAGS="$LDFLAGS"
|
||||
|
||||
LIBS="$LIBS $X_EXTRA_LIBS"
|
||||
CFLAGS="$CFLAGS $X_CFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
LDFLAGS="$LDFLAGS $X_LIBS"
|
||||
|
||||
TK_LIB=
|
||||
tk_libs="tk8.0 tk80 tk4.2 tk42 tk"
|
||||
for tk_lib in $tk_libs; do
|
||||
if test -z "$TK_LIB"; then
|
||||
AC_CHECK_LIB($tk_lib, main, TK_LIB=$tk_lib)
|
||||
fi
|
||||
if test -z "$TK_LIB"; then
|
||||
AC_CHECK_LIB($tk_lib, main, TK_LIB=$tk_lib)
|
||||
fi
|
||||
done
|
||||
if test -z "$TK_LIB"; then
|
||||
AC_MSG_WARN(tk support disabled; Tk library missing)
|
||||
USE_TCL=
|
||||
AC_MSG_WARN(tk support disabled; Tk library missing)
|
||||
USE_TCL=
|
||||
else
|
||||
TK_LIB=-l$TK_LIB
|
||||
TK_LIB=-l$TK_LIB
|
||||
fi
|
||||
|
||||
AC_SUBST(TK_LIB)
|
||||
fi
|
||||
LIBS="$ice_save_LIBS"
|
||||
CFLAGS="$ice_save_CFLAGS"
|
||||
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||
LDFLAGS="$ice_save_LDFLAGS"
|
||||
|
||||
LIBS="$ice_save_LIBS"
|
||||
CFLAGS="$ice_save_CFLAGS"
|
||||
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||
LDFLAGS="$ice_save_LDFLAGS"
|
||||
fi
|
||||
|
||||
AC_OUTPUT(GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh interfaces/libpq/Makefile interfaces/libpgtcl/Makefile interfaces/ecpg/lib/Makefile )
|
||||
AC_OUTPUT(GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh interfaces/libpq/Makefile interfaces/libpgtcl/Makefile interfaces/ecpg/lib/Makefile )
|
||||
|
|
|
|||
Loading…
Reference in New Issue