cygwin/mingwin again
Jean-philippe Chancelier [Sat, 22 Nov 2003 12:11:43 +0000 (12:11 +0000)]
scilab/Makefile.incl.in
scilab/configure
scilab/configure.in

index e017af6..89889f5 100644 (file)
@@ -58,9 +58,9 @@ LD_LDFLAGS = @LD_LDFLAGS@
 ##########
 DLDLIB = @DLDLIB@
 DLD_SUBDIR = @DLD_SUBDIR@
+PVMROOT = @PVMROOT@
 PVMLIB = @PVMLIB@
 PVMGLIB = @PVMGLIB@
-PVMROOT = @PVMROOT@
 PVMINCLUDE = @PVMINCLUDE@
 XAWLIB = @XAWLIB@
 XMULIB = @XMULIB@
@@ -68,11 +68,14 @@ XAW_LOCAL_SUBDIR = @XAW_LOCAL_SUBDIR@
 XAW_LOCAL_LIB = @XAW_LOCAL_LIB@
 XFLAGS = @X_CFLAGS@ @XAW_LOCAL_INCLUDES@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
-XLIBS = @GTKLIBS@ @X_LIBS@ $(XAWLIB) $(XMULIB) -lXt -lXext @X_PRE_LIBS@ -lX11 $(X_EXTRA_LIBS)
+XXTXEXT= @XXTXEXT@
+XX11 = @XX11@
+XLIBS = @GTKLIBS@ @X_LIBS@ $(XAWLIB) $(XMULIB) $(XXTXEXT) @X_PRE_LIBS@ $(XX11) $(X_EXTRA_LIBS)
 
 #####################
 # TCL/TK
 #####################
+TKBASE =@TKBASE@
 TK_INC_PATH = @TK_INC_PATH@
 TCL_INC_PATH = @TCL_INC_PATH@
 TCLTK_LIBS = @TCLTK_LIBS@
index fb31543..bb84ee4 100755 (executable)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.70 .
+# From configure.in Revision: 1.71 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57.
 #
@@ -468,7 +468,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WITH_GCC WITH_G77 ICC IFC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL F77 F2C FFLAGS ac_ct_F77 FLIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CONFIG GNOME_CONFIG RM AR AR_FLAGS FILES_TO_CLEAN CC_OPTIONS CC_LDFLAGS CC_PICFLAGS FC FC_OPTIONS FC_OPTIONS1 FC_OPTIONS2 FC_LDFLAGS FC_PICFLAGS LD LD_LDFLAGS SCILAB_GS SCILABSCRIPT FGETARG GETARG HPPA_OLD DLDLIB DLD_SUBDIR XAWLIB XAW XMULIB XAW_LOCAL_SUBDIR XAW_LOCAL_INCLUDES XAW_LOCAL_LIB GTKCFLAGS GTKLIBS GNOMECFLAGS TERMCAPLIB MAIN MAKEFILE_TARGET PERIFILE GUILIB GZVT XDRLIB XDRLIBNAME WINXFLAGS MENUSOBJS MALLOC PVMARCH PVMLIB PVMSCIDIR PVMSCILIB PVMGLIB PVMTARGET PVMROOT PVMROOTR PVMINST PVMINCLUDE PVMHOSTERFILES PVMHOSTER TK_INC_PATH TCL_INC_PATH TCLTK_LIBS TKSCILIB TKSCIDIR TK_MINOR_VERSION TK_MAJOR_VERSION NOINLINE WHICH_BLAS ATLAS_DIR IN_ATLAS DLLTOOL LIBM LIBTOOL_DEPS NM OBJDUMP PACKAGE STATIC SCIVERSION FC_USE_CDEC FC_SUBDIR BLPR_SCRIPTS SED_CYGDRIVE F2C_SUBDIR EXAMPLES_TESTS IMPPREF IMPENV ZZLEDT HTMLFLAGS GTKPLUGBUG LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WITH_GCC WITH_G77 ICC IFC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL F77 F2C FFLAGS ac_ct_F77 FLIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CONFIG GNOME_CONFIG RM AR AR_FLAGS FILES_TO_CLEAN CC_OPTIONS CC_LDFLAGS CC_PICFLAGS FC FC_OPTIONS FC_OPTIONS1 FC_OPTIONS2 FC_LDFLAGS FC_PICFLAGS LD LD_LDFLAGS SCILAB_GS SCILABSCRIPT FGETARG GETARG HPPA_OLD DLDLIB DLD_SUBDIR XAWLIB XAW XMULIB XAW_LOCAL_SUBDIR XAW_LOCAL_INCLUDES XAW_LOCAL_LIB GTKCFLAGS GTKLIBS GNOMECFLAGS TERMCAPLIB MAIN MAKEFILE_TARGET PERIFILE GUILIB GZVT XDRLIB XDRLIBNAME WINXFLAGS MENUSOBJS MALLOC PVMARCH PVMLIB PVMSCIDIR PVMSCILIB PVMGLIB PVMTARGET PVMROOT PVMROOTR PVMINST PVMINCLUDE PVMHOSTERFILES PVMHOSTER TKBASE TK_INC_PATH TCL_INC_PATH TCLTK_LIBS TKSCILIB TKSCIDIR TK_MINOR_VERSION TK_MAJOR_VERSION NOINLINE WHICH_BLAS ATLAS_DIR IN_ATLAS DLLTOOL LIBM LIBTOOL_DEPS NM OBJDUMP PACKAGE STATIC SCIVERSION FC_USE_CDEC FC_SUBDIR BLPR_SCRIPTS SED_CYGDRIVE F2C_SUBDIR EXAMPLES_TESTS IMPPREF IMPENV ZZLEDT HTMLFLAGS GTKPLUGBUG XXTXEXT XX11 LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -13618,6 +13618,24 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 #######################
+## Xt
+#######################
+
+# Pb of automatic insertion of -lXt -lXext -lX11 in Makefile.incl.in
+# which does not work with mingwin. Thus I add this two vars to
+# configure.in
+
+XXTXEXT="-lXt -lXext"
+XX11="-lX11"
+
+  case "$host" in
+      *-*-mingw32*)
+      XXTXEXT=
+      XX11=
+    ;;
+  esac
+
+#######################
 ## test for underscores
 #######################
 
 
 PVMINCLUDE=$PVMROOT/include
 
-  case "$host" in
-      *-*-mingw32*)
-      PVMINCLUDE="$PVMROOT/include -I$PVMROOT/src"
-    ;;
-  esac
-
-
 
 # Check whether --with-pvm-include or --without-pvm-include was given.
 if test "${with_pvm_include+set}" = set; then
@@ -14744,7 +14755,6 @@ _ACEOF
     ;;
   esac
 
-
   PVMLIBDIR=$PVMROOT/lib/$ac_cv_PVM_arch
 
 # Check whether --with-pvm-library or --without-pvm-library was given.
@@ -14753,11 +14763,25 @@ if test "${with_pvm_library+set}" = set; then
     PVMLIBDIR=$withval
 
 fi;
+
   PVMGLIB="$PVMLIBDIR/libgpvm3.a"
   PVMLIB="$PVMLIBDIR/libpvm3.a"
-
   PVMSCIDIR=pvm
   PVMSCILIB="\$(SCIDIR)/libs/pvm.a"
+
+  case "$host" in
+      *-*-mingw32*)
+      # add src to PVMINCLUDE
+      PVMINCLUDE="$PVMINCLUDE -I$SCIDIR/pvm3/src"
+      #     to have path with SCIDIR
+      # PVMROOT=`echo $PVMROOT | sed -e "s+$SCIDIR+\\$(SCIDIR)+g" `
+
+      PVMLIB=`echo $PVMLIB | sed -e "s+$SCIDIR/pvm3+\\$(PVMROOT)+g" `
+      PVMGLIB=`echo $PVMGLIB | sed -e "s+$SCIDIR/pvm3+\\$(PVMROOT)+g" `
+      PVMINCLUDE=`echo $PVMINCLUDE | sed -e "s+$SCIDIR/pvm3+\\$(PVMROOT)+g" `
+    ;;
+  esac
+
 fi
 
 fi
@@ -15291,7 +15315,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
 echo "$as_me:$LINENO: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
 echo $ECHO_N "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... $ECHO_C" >&6
 cat > conftest.$ac_ext <<EOF
-#line 15294 "configure"
+#line 15318 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -15580,7 +15604,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
 echo "$as_me:$LINENO: checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later" >&5
 echo $ECHO_N "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... $ECHO_C" >&6
 cat > conftest.$ac_ext <<EOF
-#line 15583 "configure"
+#line 15607 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -15680,6 +15704,12 @@ case $host_os in
   ;;
 esac
 
+case "$host" in
+  *-*-mingw32*)
+       TK_PLUS="$TCL_LIB"
+    ;;
+esac
+
 for e in $libexts; do
        for j in $dirs; do
                for n in $libnames; do
@@ -15874,6 +15904,16 @@ echo "$as_me: error: TCL/TK not found. Use --without-tk" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
+TKBASE=
+case "$host" in
+  *-*-mingw32*)
+       TKBASE=$SCIDIR
+       TK_INC_PATH=`echo $TK_INC_PATH | sed -e "s+$SCIDIR+\\$(TKBASE)+g" `
+       TCL_INC_PATH=`echo $TCL_INC_PATH | sed -e "s+$SCIDIR+\\$(TKBASE)+g" `
+       TCLTK_LIBS=`echo $TCLTK_LIBS | sed -e "s+$SCIDIR+\\$(TKBASE)+g" `
+    ;;
+esac
+
 fi
 
 #################
@@ -15978,6 +16018,7 @@ fi
 
 
 
+
 # for Makemex
 
 
@@ -16012,6 +16053,8 @@ fi
 
 
 
+
+
                                                                                                                                                                                                                                                                                                                       ac_config_files="$ac_config_files Makefile.OBJ Makefile.incl Makefile scripts/Makefile routines/Makefile routines/default/Makefile routines/sun/Makefile routines/graphics/Makefile routines/menusX/Makefile routines/xsci/Makefile routines/sparse/Makefile Makemex config/Makeso.incl routines/control/Makefile routines/calelm/Makefile routines/xsci/jpc_SGraph.c config/Makefile.aix config/Makefile.ultrix routines/lapack/Makefile scripts/scilab.g scripts/scilab-gtk.g examples/Makefile routines/version.h imp/Makefile routines/gtksci/Makefile pvm3/Makefile pvm3/Makefile.aimk pvm3/hoster/Makefile.aimk config/configuration macros/util/gettklib.sci routines/stack.h"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -16745,6 +16788,7 @@ s,@PVMINST@,$PVMINST,;t t
 s,@PVMINCLUDE@,$PVMINCLUDE,;t t
 s,@PVMHOSTERFILES@,$PVMHOSTERFILES,;t t
 s,@PVMHOSTER@,$PVMHOSTER,;t t
+s,@TKBASE@,$TKBASE,;t t
 s,@TK_INC_PATH@,$TK_INC_PATH,;t t
 s,@TCL_INC_PATH@,$TCL_INC_PATH,;t t
 s,@TCLTK_LIBS@,$TCLTK_LIBS,;t t
@@ -16775,6 +16819,8 @@ s,@IMPENV@,$IMPENV,;t t
 s,@ZZLEDT@,$ZZLEDT,;t t
 s,@HTMLFLAGS@,$HTMLFLAGS,;t t
 s,@GTKPLUGBUG@,$GTKPLUGBUG,;t t
+s,@XXTXEXT@,$XXTXEXT,;t t
+s,@XX11@,$XX11,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
index 89f4671..aee2106 100644 (file)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 ## Copyright INRIA/Enpc
 
-AC_REVISION($Revision: 1.71 $)dnl
+AC_REVISION($Revision: 1.72 $)dnl
 AC_INIT(license.txt)
 SCIDIR=`pwd`
 AC_CONFIG_AUX_DIR(config)
@@ -1336,6 +1336,24 @@ if test "$XAW3D" = yes; then
 fi
 
 #######################
+## Xt 
+#######################
+
+# Pb of automatic insertion of -lXt -lXext -lX11 in Makefile.incl.in
+# which does not work with mingwin. Thus I add this two vars to 
+# configure.in 
+
+XXTXEXT="-lXt -lXext"
+XX11="-lX11"
+
+  case "$host" in
+      *-*-mingw32*)
+      XXTXEXT=
+      XX11=
+    ;;
+  esac
+
+#######################
 ## test for underscores
 #######################
 
@@ -1470,13 +1488,6 @@ fi
 
 PVMINCLUDE=$PVMROOT/include
 
-  case "$host" in
-      *-*-mingw32*)
-      PVMINCLUDE="$PVMROOT/include -I$PVMROOT/src"
-    ;;
-  esac
-
-
 AC_ARG_WITH(pvm-include,
     [  --with-pvm-include=DIR  PVM include files are in DIR ],
     [  PVMINCLUDE=$withval
@@ -1503,17 +1514,30 @@ else
     ;;
   esac
 
-
   PVMLIBDIR=$PVMROOT/lib/$ac_cv_PVM_arch
   AC_ARG_WITH(pvm-library,
        [  --with-pvm-library=DIR  PVM library files are in DIR ],
        [  PVMLIBDIR=$withval
            ])
+
   PVMGLIB="$PVMLIBDIR/libgpvm3.a"
   PVMLIB="$PVMLIBDIR/libpvm3.a"
-       
   PVMSCIDIR=pvm
   PVMSCILIB="\$(SCIDIR)/libs/pvm.a"
+
+  case "$host" in
+      *-*-mingw32*)
+      # add src to PVMINCLUDE 
+      PVMINCLUDE="$PVMINCLUDE -I$SCIDIR/pvm3/src"
+      #     to have path with SCIDIR 
+      # PVMROOT=`echo $PVMROOT | sed -e "s+$SCIDIR+\\$(SCIDIR)+g" `
+
+      PVMLIB=`echo $PVMLIB | sed -e "s+$SCIDIR/pvm3+\\$(PVMROOT)+g" `
+      PVMGLIB=`echo $PVMGLIB | sed -e "s+$SCIDIR/pvm3+\\$(PVMROOT)+g" `
+      PVMINCLUDE=`echo $PVMINCLUDE | sed -e "s+$SCIDIR/pvm3+\\$(PVMROOT)+g" ` 
+    ;;
+  esac
+
 fi
 
 fi
@@ -1691,6 +1715,16 @@ else
   AC_MSG_ERROR([TCL/TK not found. Use --without-tk])
 fi
 
+TKBASE=
+case "$host" in
+  *-*-mingw32*)
+       TKBASE=$SCIDIR
+       TK_INC_PATH=`echo $TK_INC_PATH | sed -e "s+$SCIDIR+\\$(TKBASE)+g" `
+       TCL_INC_PATH=`echo $TCL_INC_PATH | sed -e "s+$SCIDIR+\\$(TKBASE)+g" `
+       TCLTK_LIBS=`echo $TCLTK_LIBS | sed -e "s+$SCIDIR+\\$(TKBASE)+g" `
+    ;;
+esac
+
 fi
 
 #################
@@ -1776,6 +1810,7 @@ AC_SUBST(PVMINCLUDE)
 AC_SUBST(PVMHOSTERFILES)
 AC_SUBST(PVMHOSTER)
 
+AC_SUBST(TKBASE)
 AC_SUBST(TK_INC_PATH)
 AC_SUBST(TCL_INC_PATH)
 AC_SUBST(TCLTK_LIBS)
@@ -1822,6 +1857,8 @@ AC_SUBST(ZZLEDT)
 AC_SUBST(STRIP)
 AC_SUBST(HTMLFLAGS)
 AC_SUBST(GTKPLUGBUG)
+AC_SUBST(XXTXEXT)
+AC_SUBST(XX11)
 
 AC_OUTPUT(Makefile.OBJ Makefile.incl Makefile scripts/Makefile routines/Makefile routines/default/Makefile routines/sun/Makefile routines/graphics/Makefile routines/menusX/Makefile routines/xsci/Makefile routines/sparse/Makefile Makemex  config/Makeso.incl routines/control/Makefile routines/calelm/Makefile routines/xsci/jpc_SGraph.c  config/Makefile.aix config/Makefile.ultrix routines/lapack/Makefile scripts/scilab.g scripts/scilab-gtk.g examples/Makefile routines/version.h imp/Makefile routines/gtksci/Makefile pvm3/Makefile pvm3/Makefile.aimk pvm3/hoster/Makefile.aimk config/configuration macros/util/gettklib.sci routines/stack.h)