diff options
| author | asami <asami@FreeBSD.org> | 1997-11-10 19:42:18 +0800 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1997-11-10 19:42:18 +0800 |
| commit | d5d7cb814cc6fb1a0fa57e2e120870d787c2bbc7 (patch) | |
| tree | 55463b720065e10a610aed118ff439b337ad5818 /x11 | |
| parent | 07decef7b475415eaff36e0b4255f299c0708a96 (diff) | |
| download | freebsd-ports-gnome-d5d7cb814cc6fb1a0fa57e2e120870d787c2bbc7.tar.gz freebsd-ports-gnome-d5d7cb814cc6fb1a0fa57e2e120870d787c2bbc7.tar.zst freebsd-ports-gnome-d5d7cb814cc6fb1a0fa57e2e120870d787c2bbc7.zip | |
Correctly put version info in tcl/tk libraries and header directories.
Since tk-4.x ends at 4.2, remove check for tk-4.3 and tk-4.4. This
should at least make it work for 75/41 and 76/42. Others are
encouraged to add support for 80/80.
(fixes) PR: 4965
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/XFree86-4-clients/scripts/configure | 18 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/scripts/configure | 18 | ||||
| -rw-r--r-- | x11/XFree86-4/scripts/configure | 18 | ||||
| -rw-r--r-- | x11/XFree86/scripts/configure | 18 |
4 files changed, 52 insertions, 20 deletions
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure index d5d693bbfbc7..fdac66d27e98 100644 --- a/x11/XFree86-4-clients/scripts/configure +++ b/x11/XFree86-4-clients/scripts/configure @@ -21,7 +21,7 @@ rm -f $F # Tk detection tkversion= -for v in 1 2 3 4; do +for v in 1 2; do if [ -f /usr/local/lib/libtk4$v.a ]; then tkversion=$v fi @@ -30,12 +30,20 @@ if [ X$tkversion != X ]; then echo "Using tk-4.$tkversion" echo "#define HasTk YES" >>$F echo "#define TkLibDir /usr/local/lib" >>$F - echo "#define TkIncDir /usr/local/include" >>$F + echo "#define TkIncDir /usr/local/include/tk4.$tkversion" >>$F echo "#define TkLibName tk4$tkversion" >>$F echo "#define HasTcl YES" >>$F - echo "#define TclLibDir /usr/lib" >>$F - echo "#define TclIncDir /usr/include" >>$F - echo "#define TclLibName tcl75" >>$F + echo "#define TclLibDir /usr/local/lib" >>$F + case $tkversion in + 1) + tclversion=5 + ;; + 2) + tclversion=6 + ;; + esac + echo "#define TclIncDir /usr/local/include/tcl7.$tclversion" >>$F + echo "#define TclLibName tcl7$tclversion" >>$F else cat <<EOF *** I don't see the static library for tk version 4 in /usr/local/lib. diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure index d5d693bbfbc7..fdac66d27e98 100644 --- a/x11/XFree86-4-libraries/scripts/configure +++ b/x11/XFree86-4-libraries/scripts/configure @@ -21,7 +21,7 @@ rm -f $F # Tk detection tkversion= -for v in 1 2 3 4; do +for v in 1 2; do if [ -f /usr/local/lib/libtk4$v.a ]; then tkversion=$v fi @@ -30,12 +30,20 @@ if [ X$tkversion != X ]; then echo "Using tk-4.$tkversion" echo "#define HasTk YES" >>$F echo "#define TkLibDir /usr/local/lib" >>$F - echo "#define TkIncDir /usr/local/include" >>$F + echo "#define TkIncDir /usr/local/include/tk4.$tkversion" >>$F echo "#define TkLibName tk4$tkversion" >>$F echo "#define HasTcl YES" >>$F - echo "#define TclLibDir /usr/lib" >>$F - echo "#define TclIncDir /usr/include" >>$F - echo "#define TclLibName tcl75" >>$F + echo "#define TclLibDir /usr/local/lib" >>$F + case $tkversion in + 1) + tclversion=5 + ;; + 2) + tclversion=6 + ;; + esac + echo "#define TclIncDir /usr/local/include/tcl7.$tclversion" >>$F + echo "#define TclLibName tcl7$tclversion" >>$F else cat <<EOF *** I don't see the static library for tk version 4 in /usr/local/lib. diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure index d5d693bbfbc7..fdac66d27e98 100644 --- a/x11/XFree86-4/scripts/configure +++ b/x11/XFree86-4/scripts/configure @@ -21,7 +21,7 @@ rm -f $F # Tk detection tkversion= -for v in 1 2 3 4; do +for v in 1 2; do if [ -f /usr/local/lib/libtk4$v.a ]; then tkversion=$v fi @@ -30,12 +30,20 @@ if [ X$tkversion != X ]; then echo "Using tk-4.$tkversion" echo "#define HasTk YES" >>$F echo "#define TkLibDir /usr/local/lib" >>$F - echo "#define TkIncDir /usr/local/include" >>$F + echo "#define TkIncDir /usr/local/include/tk4.$tkversion" >>$F echo "#define TkLibName tk4$tkversion" >>$F echo "#define HasTcl YES" >>$F - echo "#define TclLibDir /usr/lib" >>$F - echo "#define TclIncDir /usr/include" >>$F - echo "#define TclLibName tcl75" >>$F + echo "#define TclLibDir /usr/local/lib" >>$F + case $tkversion in + 1) + tclversion=5 + ;; + 2) + tclversion=6 + ;; + esac + echo "#define TclIncDir /usr/local/include/tcl7.$tclversion" >>$F + echo "#define TclLibName tcl7$tclversion" >>$F else cat <<EOF *** I don't see the static library for tk version 4 in /usr/local/lib. diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure index d5d693bbfbc7..fdac66d27e98 100644 --- a/x11/XFree86/scripts/configure +++ b/x11/XFree86/scripts/configure @@ -21,7 +21,7 @@ rm -f $F # Tk detection tkversion= -for v in 1 2 3 4; do +for v in 1 2; do if [ -f /usr/local/lib/libtk4$v.a ]; then tkversion=$v fi @@ -30,12 +30,20 @@ if [ X$tkversion != X ]; then echo "Using tk-4.$tkversion" echo "#define HasTk YES" >>$F echo "#define TkLibDir /usr/local/lib" >>$F - echo "#define TkIncDir /usr/local/include" >>$F + echo "#define TkIncDir /usr/local/include/tk4.$tkversion" >>$F echo "#define TkLibName tk4$tkversion" >>$F echo "#define HasTcl YES" >>$F - echo "#define TclLibDir /usr/lib" >>$F - echo "#define TclIncDir /usr/include" >>$F - echo "#define TclLibName tcl75" >>$F + echo "#define TclLibDir /usr/local/lib" >>$F + case $tkversion in + 1) + tclversion=5 + ;; + 2) + tclversion=6 + ;; + esac + echo "#define TclIncDir /usr/local/include/tcl7.$tclversion" >>$F + echo "#define TclLibName tcl7$tclversion" >>$F else cat <<EOF *** I don't see the static library for tk version 4 in /usr/local/lib. |