Commit 89731922 authored by Marc G. Fournier's avatar Marc G. Fournier

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.
parent 34299b4f
...@@ -288,6 +288,7 @@ PostgreSQL: ...@@ -288,6 +288,7 @@ PostgreSQL:
for header files. (Typical use will need for header files. (Typical use will need
--with-includes=/usr/local/include) --with-includes=/usr/local/include)
--with-libs=DIRS
--with-libraries=DIRS --with-libraries=DIRS
Include DIRS in list of directories searched Include DIRS in list of directories searched
for archive libraries. (Typical use will need for archive libraries. (Typical use will need
......
...@@ -776,7 +776,7 @@ fi ...@@ -776,7 +776,7 @@ fi
if test "$LIBRARY_DIRS"; then if test "$LIBRARY_DIRS"; then
for dir in $withval; do for dir in $LIBRARY_DIRS; do
if test -d "$dir"; then if test -d "$dir"; then
PGSQL_LDFLAGS="$PGSQL_LDFLAGS -L$dir" PGSQL_LDFLAGS="$PGSQL_LDFLAGS -L$dir"
else else
...@@ -3387,7 +3387,7 @@ else ...@@ -3387,7 +3387,7 @@ else
fi fi
rm -f conftest* 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 $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
echo "configure:3393: checking whether ${CC-cc} needs -traditional" >&5 echo "configure:3393: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
...@@ -5617,7 +5617,7 @@ then ...@@ -5617,7 +5617,7 @@ then
ice_save_CPPFLAGS="$CPPFLAGS" ice_save_CPPFLAGS="$CPPFLAGS"
ice_save_LDFLAGS="$LDFLAGS" 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" CFLAGS="$CFLAGS $X_CFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS" LDFLAGS="$LDFLAGS $X_LIBS"
...@@ -5633,7 +5633,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ...@@ -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 echo $ac_n "(cached) $ac_c" 1>&6
else else
ac_save_LIBS="$LIBS" 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 cat > conftest.$ac_ext <<EOF
#line 5639 "configure" #line 5639 "configure"
#include "confdefs.h" #include "confdefs.h"
......
...@@ -185,7 +185,7 @@ AC_ARG_WITH(libraries, ...@@ -185,7 +185,7 @@ AC_ARG_WITH(libraries,
]) ])
if test "$LIBRARY_DIRS"; then if test "$LIBRARY_DIRS"; then
for dir in $withval; do for dir in $LIBRARY_DIRS; do
if test -d "$dir"; then if test -d "$dir"; then
PGSQL_LDFLAGS="$PGSQL_LDFLAGS -L$dir" PGSQL_LDFLAGS="$PGSQL_LDFLAGS -L$dir"
else else
...@@ -661,7 +661,7 @@ then ...@@ -661,7 +661,7 @@ then
ice_save_CPPFLAGS="$CPPFLAGS" ice_save_CPPFLAGS="$CPPFLAGS"
ice_save_LDFLAGS="$LDFLAGS" 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" CFLAGS="$CFLAGS $X_CFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS" LDFLAGS="$LDFLAGS $X_LIBS"
...@@ -670,7 +670,7 @@ then ...@@ -670,7 +670,7 @@ then
tk_libs="tk8.0 tk80 tk4.2 tk42 tk" tk_libs="tk8.0 tk80 tk4.2 tk42 tk"
for tk_lib in $tk_libs; do for tk_lib in $tk_libs; do
if test -z "$TK_LIB"; then 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 fi
done done
if test -z "$TK_LIB"; then if test -z "$TK_LIB"; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment