diff options
Diffstat (limited to 'x11')
-rw-r--r-- | x11/XFree86-4-clients/scripts/configure | 44 | ||||
-rw-r--r-- | x11/XFree86-4-libraries/scripts/configure | 44 | ||||
-rw-r--r-- | x11/XFree86-4/scripts/configure | 44 | ||||
-rw-r--r-- | x11/XFree86/scripts/configure | 44 |
4 files changed, 140 insertions, 36 deletions
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure index 4120f92f9a84..f45e2e3b0ceb 100644 --- a/x11/XFree86-4-clients/scripts/configure +++ b/x11/XFree86-4-clients/scripts/configure @@ -74,15 +74,41 @@ for v in 42 80 81 82 42jp 80jp; do fi done if [ X$tkversion != X ]; then - echo "Using tk-$tkLversion" - echo "#define HasTk YES" >>$F - echo "#define TkLibDir /usr/local/lib" >>$F - echo "#define TkIncDir /usr/local/include/tk$tkLversion" >>$F - echo "#define TkLibName tk$tkversion" >>$F - echo "#define HasTcl YES" >>$F - echo "#define TclLibDir /usr/local/lib" >>$F - echo "#define TclIncDir /usr/local/include/tcl$tclLversion" >>$F - echo "#define TclLibName tcl$tclversion" >>$F + case $tkversion in + *jp) + echo "Using Japanized tk-$jptkLversion" + if [ X"${MACHINE}" = X"pc98" ]; then + echo "#define HasJpTk YES" >>$F + echo "#define JpTkLibDir /usr/local/lib" >>$F + echo "#define JpTkIncDir /usr/local/include/tk$tkLversion" >>$F + echo "#define JpTkLibName tk$tkversion" >>$F + echo "#define HasJpTcl YES" >>$F + echo "#define JpTclLibDir /usr/local/lib" >>$F + echo "#define JpTclIncDir /usr/local/include/tcl$tclLversion" >>$F + echo "#define JpTclLibName tcl$tclversion" >>$F + else + echo "#define HasTk YES" >>$F + echo "#define TkLibDir /usr/local/lib" >>$F + echo "#define TkIncDir /usr/local/include/tk$tkLversion" >>$F + echo "#define TkLibName tk$tkversion" >>$F + echo "#define HasTcl YES" >>$F + echo "#define TclLibDir /usr/local/lib" >>$F + echo "#define TclIncDir /usr/local/include/tcl$tclLversion" >>$F + echo "#define TclLibName tcl$tclversion" >>$F + fi + ;; + *) + echo "Using tk-$tkLversion" + echo "#define HasTk YES" >>$F + echo "#define TkLibDir /usr/local/lib" >>$F + echo "#define TkIncDir /usr/local/include/tk$tkLversion" >>$F + echo "#define TkLibName tk$tkversion" >>$F + echo "#define HasTcl YES" >>$F + echo "#define TclLibDir /usr/local/lib" >>$F + echo "#define TclIncDir /usr/local/include/tcl$tclLversion" >>$F + echo "#define TclLibName tcl$tclversion" >>$F + ;; + esac else cat <<EOF *** I don't see the static library for tk version $tkversion in /usr/local/lib. diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure index 4120f92f9a84..f45e2e3b0ceb 100644 --- a/x11/XFree86-4-libraries/scripts/configure +++ b/x11/XFree86-4-libraries/scripts/configure @@ -74,15 +74,41 @@ for v in 42 80 81 82 42jp 80jp; do fi done if [ X$tkversion != X ]; then - echo "Using tk-$tkLversion" - echo "#define HasTk YES" >>$F - echo "#define TkLibDir /usr/local/lib" >>$F - echo "#define TkIncDir /usr/local/include/tk$tkLversion" >>$F - echo "#define TkLibName tk$tkversion" >>$F - echo "#define HasTcl YES" >>$F - echo "#define TclLibDir /usr/local/lib" >>$F - echo "#define TclIncDir /usr/local/include/tcl$tclLversion" >>$F - echo "#define TclLibName tcl$tclversion" >>$F + case $tkversion in + *jp) + echo "Using Japanized tk-$jptkLversion" + if [ X"${MACHINE}" = X"pc98" ]; then + echo "#define HasJpTk YES" >>$F + echo "#define JpTkLibDir /usr/local/lib" >>$F + echo "#define JpTkIncDir /usr/local/include/tk$tkLversion" >>$F + echo "#define JpTkLibName tk$tkversion" >>$F + echo "#define HasJpTcl YES" >>$F + echo "#define JpTclLibDir /usr/local/lib" >>$F + echo "#define JpTclIncDir /usr/local/include/tcl$tclLversion" >>$F + echo "#define JpTclLibName tcl$tclversion" >>$F + else + echo "#define HasTk YES" >>$F + echo "#define TkLibDir /usr/local/lib" >>$F + echo "#define TkIncDir /usr/local/include/tk$tkLversion" >>$F + echo "#define TkLibName tk$tkversion" >>$F + echo "#define HasTcl YES" >>$F + echo "#define TclLibDir /usr/local/lib" >>$F + echo "#define TclIncDir /usr/local/include/tcl$tclLversion" >>$F + echo "#define TclLibName tcl$tclversion" >>$F + fi + ;; + *) + echo "Using tk-$tkLversion" + echo "#define HasTk YES" >>$F + echo "#define TkLibDir /usr/local/lib" >>$F + echo "#define TkIncDir /usr/local/include/tk$tkLversion" >>$F + echo "#define TkLibName tk$tkversion" >>$F + echo "#define HasTcl YES" >>$F + echo "#define TclLibDir /usr/local/lib" >>$F + echo "#define TclIncDir /usr/local/include/tcl$tclLversion" >>$F + echo "#define TclLibName tcl$tclversion" >>$F + ;; + esac else cat <<EOF *** I don't see the static library for tk version $tkversion in /usr/local/lib. diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure index 4120f92f9a84..f45e2e3b0ceb 100644 --- a/x11/XFree86-4/scripts/configure +++ b/x11/XFree86-4/scripts/configure @@ -74,15 +74,41 @@ for v in 42 80 81 82 42jp 80jp; do fi done if [ X$tkversion != X ]; then - echo "Using tk-$tkLversion" - echo "#define HasTk YES" >>$F - echo "#define TkLibDir /usr/local/lib" >>$F - echo "#define TkIncDir /usr/local/include/tk$tkLversion" >>$F - echo "#define TkLibName tk$tkversion" >>$F - echo "#define HasTcl YES" >>$F - echo "#define TclLibDir /usr/local/lib" >>$F - echo "#define TclIncDir /usr/local/include/tcl$tclLversion" >>$F - echo "#define TclLibName tcl$tclversion" >>$F + case $tkversion in + *jp) + echo "Using Japanized tk-$jptkLversion" + if [ X"${MACHINE}" = X"pc98" ]; then + echo "#define HasJpTk YES" >>$F + echo "#define JpTkLibDir /usr/local/lib" >>$F + echo "#define JpTkIncDir /usr/local/include/tk$tkLversion" >>$F + echo "#define JpTkLibName tk$tkversion" >>$F + echo "#define HasJpTcl YES" >>$F + echo "#define JpTclLibDir /usr/local/lib" >>$F + echo "#define JpTclIncDir /usr/local/include/tcl$tclLversion" >>$F + echo "#define JpTclLibName tcl$tclversion" >>$F + else + echo "#define HasTk YES" >>$F + echo "#define TkLibDir /usr/local/lib" >>$F + echo "#define TkIncDir /usr/local/include/tk$tkLversion" >>$F + echo "#define TkLibName tk$tkversion" >>$F + echo "#define HasTcl YES" >>$F + echo "#define TclLibDir /usr/local/lib" >>$F + echo "#define TclIncDir /usr/local/include/tcl$tclLversion" >>$F + echo "#define TclLibName tcl$tclversion" >>$F + fi + ;; + *) + echo "Using tk-$tkLversion" + echo "#define HasTk YES" >>$F + echo "#define TkLibDir /usr/local/lib" >>$F + echo "#define TkIncDir /usr/local/include/tk$tkLversion" >>$F + echo "#define TkLibName tk$tkversion" >>$F + echo "#define HasTcl YES" >>$F + echo "#define TclLibDir /usr/local/lib" >>$F + echo "#define TclIncDir /usr/local/include/tcl$tclLversion" >>$F + echo "#define TclLibName tcl$tclversion" >>$F + ;; + esac else cat <<EOF *** I don't see the static library for tk version $tkversion in /usr/local/lib. diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure index 4120f92f9a84..f45e2e3b0ceb 100644 --- a/x11/XFree86/scripts/configure +++ b/x11/XFree86/scripts/configure @@ -74,15 +74,41 @@ for v in 42 80 81 82 42jp 80jp; do fi done if [ X$tkversion != X ]; then - echo "Using tk-$tkLversion" - echo "#define HasTk YES" >>$F - echo "#define TkLibDir /usr/local/lib" >>$F - echo "#define TkIncDir /usr/local/include/tk$tkLversion" >>$F - echo "#define TkLibName tk$tkversion" >>$F - echo "#define HasTcl YES" >>$F - echo "#define TclLibDir /usr/local/lib" >>$F - echo "#define TclIncDir /usr/local/include/tcl$tclLversion" >>$F - echo "#define TclLibName tcl$tclversion" >>$F + case $tkversion in + *jp) + echo "Using Japanized tk-$jptkLversion" + if [ X"${MACHINE}" = X"pc98" ]; then + echo "#define HasJpTk YES" >>$F + echo "#define JpTkLibDir /usr/local/lib" >>$F + echo "#define JpTkIncDir /usr/local/include/tk$tkLversion" >>$F + echo "#define JpTkLibName tk$tkversion" >>$F + echo "#define HasJpTcl YES" >>$F + echo "#define JpTclLibDir /usr/local/lib" >>$F + echo "#define JpTclIncDir /usr/local/include/tcl$tclLversion" >>$F + echo "#define JpTclLibName tcl$tclversion" >>$F + else + echo "#define HasTk YES" >>$F + echo "#define TkLibDir /usr/local/lib" >>$F + echo "#define TkIncDir /usr/local/include/tk$tkLversion" >>$F + echo "#define TkLibName tk$tkversion" >>$F + echo "#define HasTcl YES" >>$F + echo "#define TclLibDir /usr/local/lib" >>$F + echo "#define TclIncDir /usr/local/include/tcl$tclLversion" >>$F + echo "#define TclLibName tcl$tclversion" >>$F + fi + ;; + *) + echo "Using tk-$tkLversion" + echo "#define HasTk YES" >>$F + echo "#define TkLibDir /usr/local/lib" >>$F + echo "#define TkIncDir /usr/local/include/tk$tkLversion" >>$F + echo "#define TkLibName tk$tkversion" >>$F + echo "#define HasTcl YES" >>$F + echo "#define TclLibDir /usr/local/lib" >>$F + echo "#define TclIncDir /usr/local/include/tcl$tclLversion" >>$F + echo "#define TclLibName tcl$tclversion" >>$F + ;; + esac else cat <<EOF *** I don't see the static library for tk version $tkversion in /usr/local/lib. |