diff options
| -rwxr-xr-x | configure | 31 | ||||
| -rw-r--r-- | configure.in | 18 |
2 files changed, 37 insertions, 12 deletions
diff --git a/configure b/configure index 07a1436d3ca..b3efd75390e 100755 --- a/configure +++ b/configure @@ -3020,11 +3020,6 @@ if test "${with_java+set}" = set; then yes) echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -if test ! "$JAVA_HOME" -o ! -d "$JAVA_HOME" ; then - { { echo "$as_me:$LINENO: error: Set the JAVA_HOME environment variable to build Java components" >&5 -echo "$as_me: error: Set the JAVA_HOME environment variable to build Java components" >&2;} - { (exit 1); exit 1; }; } -fi for ac_prog in jakarta-ant ant ant.sh ant.bat do @@ -3125,8 +3120,10 @@ echo "$as_me: error: ant does not work" >&2;} if test -z "$ANT"; then - { { echo "$as_me:$LINENO: error: Ant is required to build Java components" >&5 -echo "$as_me: error: Ant is required to build Java components" >&2;} + { { echo "$as_me:$LINENO: error: Ant is required to build Java components +If you have Ant already installed, see config.log for details on the failure." >&5 +echo "$as_me: error: Ant is required to build Java components +If you have Ant already installed, see config.log for details on the failure." >&2;} { (exit 1); exit 1; }; } fi if "$ANT" -version | sed q | egrep -v ' 1\.[5-9]| [2-9]\.' >/dev/null ; then @@ -5841,8 +5838,12 @@ echo "${ECHO_T}no" >&6 fi if test x"$pgac_cv_check_readline" = x"no"; then { { echo "$as_me:$LINENO: error: readline library not found +If you have readline already installed, see config.log for details on the +failure. It is possible the compiler isn't looking in the proper directory. Use --without-readline to disable readline support." >&5 echo "$as_me: error: readline library not found +If you have readline already installed, see config.log for details on the +failure. It is possible the compiler isn't looking in the proper directory. Use --without-readline to disable readline support." >&2;} { (exit 1); exit 1; }; } fi @@ -5914,8 +5915,12 @@ _ACEOF else { { echo "$as_me:$LINENO: error: zlib library not found +If you have zlib already installed, see config.log for details on the +failure. It is possible the compiler isn't looking in the proper directory. Use --without-zlib to disable zlib support." >&5 echo "$as_me: error: zlib library not found +If you have zlib already installed, see config.log for details on the +failure. It is possible the compiler isn't looking in the proper directory. Use --without-zlib to disable zlib support." >&2;} { (exit 1); exit 1; }; } fi @@ -7341,8 +7346,12 @@ _ACEOF else { { echo "$as_me:$LINENO: error: readline header not found +If you have readline already installed, see config.log for details on the +failure. It is possible the compiler isn't looking in the proper directory. Use --without-readline to disable readline support." >&5 echo "$as_me: error: readline header not found +If you have readline already installed, see config.log for details on the +failure. It is possible the compiler isn't looking in the proper directory. Use --without-readline to disable readline support." >&2;} { (exit 1); exit 1; }; } fi @@ -7576,8 +7585,12 @@ _ACEOF else { { echo "$as_me:$LINENO: error: history header not found +If you have readline already installed, see config.log for details on the +failure. It is possible the compiler isn't looking in the proper directory. Use --without-readline to disable readline support." >&5 echo "$as_me: error: history header not found +If you have readline already installed, see config.log for details on the +failure. It is possible the compiler isn't looking in the proper directory. Use --without-readline to disable readline support." >&2;} { (exit 1); exit 1; }; } fi @@ -7696,8 +7709,12 @@ if test $ac_cv_header_zlib_h = yes; then : else { { echo "$as_me:$LINENO: error: zlib header not found +If you have readline already installed, see config.log for details on the +failure. It is possible the compiler isn't looking in the proper directory. Use --without-zlib to disable zlib support." >&5 echo "$as_me: error: zlib header not found +If you have readline already installed, see config.log for details on the +failure. It is possible the compiler isn't looking in the proper directory. Use --without-zlib to disable zlib support." >&2;} { (exit 1); exit 1; }; } fi diff --git a/configure.in b/configure.in index 76c70c8b9e4..25eec8b8de6 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -dnl $Header: /cvsroot/pgsql/configure.in,v 1.207 2002/09/06 14:31:16 momjian Exp $ +dnl $Header: /cvsroot/pgsql/configure.in,v 1.208 2002/09/11 04:27:48 momjian Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -371,12 +371,10 @@ AC_SUBST(with_python) AC_MSG_CHECKING([whether to build Java/JDBC tools]) PGAC_ARG_BOOL(with, java, no, [ --with-java build JDBC interface and Java tools], [AC_MSG_RESULT(yes) -if test ! "$JAVA_HOME" -o ! -d "$JAVA_HOME" ; then - AC_MSG_ERROR([Set the JAVA_HOME environment variable to build Java components]) -fi PGAC_PATH_ANT if test -z "$ANT"; then - AC_MSG_ERROR([Ant is required to build Java components]) + AC_MSG_ERROR([Ant is required to build Java components +If you have Ant already installed, see config.log for details on the failure.]) fi if "$ANT" -version | sed q | egrep -v ' 1\.[[5-9]]| [[2-9]]\.' >/dev/null ; then AC_MSG_ERROR([Ant version >= 1.5 is required to build Java components]) @@ -624,6 +622,8 @@ if test "$with_readline" = yes; then PGAC_CHECK_READLINE if test x"$pgac_cv_check_readline" = x"no"; then AC_MSG_ERROR([readline library not found +If you have readline already installed, see config.log for details on the +failure. It is possible the compiler isn't looking in the proper directory. Use --without-readline to disable readline support.]) fi fi @@ -631,6 +631,8 @@ fi if test "$with_zlib" = yes; then AC_CHECK_LIB(z, inflate, [], [AC_MSG_ERROR([zlib library not found +If you have zlib already installed, see config.log for details on the +failure. It is possible the compiler isn't looking in the proper directory. Use --without-zlib to disable zlib support.])]) fi @@ -680,15 +682,21 @@ if test "$with_readline" = yes; then AC_CHECK_HEADERS([readline/readline.h], [], [AC_CHECK_HEADERS([readline.h], [], [AC_MSG_ERROR([readline header not found +If you have readline already installed, see config.log for details on the +failure. It is possible the compiler isn't looking in the proper directory. Use --without-readline to disable readline support.])])]) AC_CHECK_HEADERS([readline/history.h], [], [AC_CHECK_HEADERS([history.h], [], [AC_MSG_ERROR([history header not found +If you have readline already installed, see config.log for details on the +failure. It is possible the compiler isn't looking in the proper directory. Use --without-readline to disable readline support.])])]) fi if test "$with_zlib" = yes; then AC_CHECK_HEADER(zlib.h, [], [AC_MSG_ERROR([zlib header not found +If you have readline already installed, see config.log for details on the +failure. It is possible the compiler isn't looking in the proper directory. Use --without-zlib to disable zlib support.])]) fi |