diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1998-04-17 01:30:21 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1998-04-17 01:30:21 +0000 |
| commit | 89731922831ce09fd547b5b872e6cf3bce096eb1 (patch) | |
| tree | 6c3d09c28e7883b7ae749dbeea9e08262001e849 | |
| parent | 34299b4fac44eac111733888679edaaea8f777c5 (diff) | |
| download | postgresql-89731922831ce09fd547b5b872e6cf3bce096eb1.tar.gz postgresql-89731922831ce09fd547b5b872e6cf3bce096eb1.zip | |
From: Brook Milligan <brook@trillium.NMSU.Edu>
Here is a pair of patches that (I hope) finish the configuration
issues with tcl/tk and make the recognition of the two packages
completely parallel in organization. This should make future changes
easier to maintain.
Hope to see this in 6.2.2.
| -rw-r--r-- | INSTALL | 1 | ||||
| -rwxr-xr-x | src/configure | 8 | ||||
| -rw-r--r-- | src/configure.in | 6 |
3 files changed, 8 insertions, 7 deletions
@@ -288,6 +288,7 @@ PostgreSQL: for header files. (Typical use will need --with-includes=/usr/local/include) + --with-libs=DIRS --with-libraries=DIRS Include DIRS in list of directories searched for archive libraries. (Typical use will need diff --git a/src/configure b/src/configure index 589bd35e1bd..4595980d6e9 100755 --- a/src/configure +++ b/src/configure @@ -776,7 +776,7 @@ fi if test "$LIBRARY_DIRS"; then - for dir in $withval; do + for dir in $LIBRARY_DIRS; do if test -d "$dir"; then PGSQL_LDFLAGS="$PGSQL_LDFLAGS -L$dir" else @@ -3387,7 +3387,7 @@ else fi rm -f conftest* -if test $ac_cv_prog_gcc = yes; then +if test x$ac_cv_prog_gcc = xyes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 echo "configure:3393: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then @@ -5617,7 +5617,7 @@ then ice_save_CPPFLAGS="$CPPFLAGS" ice_save_LDFLAGS="$LDFLAGS" - LIBS="$LIBS $X_EXTRA_LIBS" + LIBS="$TCL_LIB $X_PRE_LIBS $X11_LIBS $X_EXTRA_LIBS $LIBS" CFLAGS="$CFLAGS $X_CFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS" LDFLAGS="$LDFLAGS $X_LIBS" @@ -5633,7 +5633,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-l$tk_lib $TCL_LIB $X_PRE_LIBS $X_LIBS $X11_LIBS $LIBS" +LIBS="-l$tk_lib $LIBS" cat > conftest.$ac_ext <<EOF #line 5639 "configure" #include "confdefs.h" diff --git a/src/configure.in b/src/configure.in index aaa29c15ceb..daac1b64780 100644 --- a/src/configure.in +++ b/src/configure.in @@ -185,7 +185,7 @@ AC_ARG_WITH(libraries, ]) if test "$LIBRARY_DIRS"; then - for dir in $withval; do + for dir in $LIBRARY_DIRS; do if test -d "$dir"; then PGSQL_LDFLAGS="$PGSQL_LDFLAGS -L$dir" else @@ -661,7 +661,7 @@ then ice_save_CPPFLAGS="$CPPFLAGS" ice_save_LDFLAGS="$LDFLAGS" - LIBS="$LIBS $X_EXTRA_LIBS" + LIBS="$TCL_LIB $X_PRE_LIBS $X11_LIBS $X_EXTRA_LIBS $LIBS" CFLAGS="$CFLAGS $X_CFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS" LDFLAGS="$LDFLAGS $X_LIBS" @@ -670,7 +670,7 @@ then 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,, $TCL_LIB $X_PRE_LIBS $X_LIBS $X11_LIBS) + AC_CHECK_LIB($tk_lib, main, TK_LIB=$tk_lib) fi done if test -z "$TK_LIB"; then |