Commit 0870d877 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

fix configure conflicts

parents e8aa1fe4 1984f21c
......@@ -562,15 +562,6 @@ ACROREAD
GV
DOT
GNUPLOT
<<<<<<< HEAD
WIN32LIB
NOCYGWIN
LINKER
LDL
LIB_GC
PIXMAP_DIR
=======
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
OBJEXT
EXEEXT
ac_ct_CC
......@@ -578,30 +569,16 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
<<<<<<< HEAD
SCADE_INSTALL_DIR
SCADE2LUSTRE
SCADE
SCADE_CG
LUSTRE2C
S2L
SCADE2LUSTREBIN
=======
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
EC2C
LUS2EC
LUS2LIC
MORE_LIB
MORE_INCLUDE
<<<<<<< HEAD
SCADE_OS_NAME
=======
WIN32LIB
NOCYGWIN
LINKER
LDL
LIB_GC
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
LURETTEPATH
HOST_TYPE
target_alias
......@@ -1871,11 +1848,7 @@ unset LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
case `./config.guess` in
i*86-pc-linux-*) HOST_TYPE=linux ;;
sparc-sun-solaris2.*) HOST_TYPE=sparc-sun ;;
<<<<<<< HEAD
i*86-*-cygwin) HOST_TYPE=cygwin ;;
=======
i*86-*-cygwin) HOST_TYPE=win32 ;;
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
i*86-apple*) HOST_TYPE=mac ;;
*) as_fn_error $? "Unsupported architecture" "$LINENO" 5 ;;
esac
......@@ -1982,10 +1955,6 @@ CYGWIN*)
esac
<<<<<<< HEAD
SCADE_OS_NAME=$V_WHOAMI
=======
#-----------------------------------------------------------------------------#
EXE=
......@@ -2025,7 +1994,6 @@ case "$HOST_TYPE" in
esac
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
......@@ -2056,418 +2024,7 @@ fi
LUS2LIC=lus2lic$EXE
LUS2EC=lus2ec$EXE
<<<<<<< HEAD
EC2C=ec2c$ EXE
#-----------------------------------------------------------------------------#
# Scade tools
case "$HOST_TYPE" in
win32|cygwin)
# Extract the first word of "SCADE2LUSTRE.EXE", so it can be a program name with args.
set dummy SCADE2LUSTRE.EXE; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_SCADE2LUSTREBIN+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$SCADE2LUSTREBIN"; then
ac_cv_prog_SCADE2LUSTREBIN="$SCADE2LUSTREBIN" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_SCADE2LUSTREBIN="SCADE2LUSTRE.EXE"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_prog_SCADE2LUSTREBIN" && ac_cv_prog_SCADE2LUSTREBIN="no"
fi
fi
SCADE2LUSTREBIN=$ac_cv_prog_SCADE2LUSTREBIN
if test -n "$SCADE2LUSTREBIN"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SCADE2LUSTREBIN" >&5
$as_echo "$SCADE2LUSTREBIN" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "$SCADE2LUSTREBIN" = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find SCADE2LUSTRE.EXE the scade to lustre compiler." >&5
$as_echo "$as_me: WARNING: *** Cannot find SCADE2LUSTRE.EXE the scade to lustre compiler." >&2;}
fi
SCADE2LUSTRE=SCADE2LUSTRE.EXE
# Extract the first word of "scade2lustre_bin.exe", so it can be a program name with args.
set dummy scade2lustre_bin.exe; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_S2L+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $S2L in
[\\/]* | ?:[\\/]*)
ac_cv_path_S2L="$S2L" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_S2L="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
S2L=$ac_cv_path_S2L
if test -n "$S2L"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $S2L" >&5
$as_echo "$S2L" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
SCADE_INSTALL_DIR=`echo $S2L | sed 's/bin\/scade2lustre_bin.exe//'`
# Extract the first word of "LUSTRE2C.EXE", so it can be a program name with args.
set dummy LUSTRE2C.EXE; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_LUSTRE2C+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$LUSTRE2C"; then
ac_cv_prog_LUSTRE2C="$LUSTRE2C" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_LUSTRE2C="LUSTRE2C.EXE"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_prog_LUSTRE2C" && ac_cv_prog_LUSTRE2C="no"
fi
fi
LUSTRE2C=$ac_cv_prog_LUSTRE2C
if test -n "$LUSTRE2C"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LUSTRE2C" >&5
$as_echo "$LUSTRE2C" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "$LUSTRE2C" = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find lustre2C the scade/lustre to c compiler." >&5
$as_echo "$as_me: WARNING: *** Cannot find lustre2C the scade/lustre to c compiler." >&2;}
fi
LUSTRE2C=LUSTRE2C.EXE
# Extract the first word of "SCADE_CG.EXE", so it can be a program name with args.
set dummy SCADE_CG.EXE; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_SCADE_CG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$SCADE_CG"; then
ac_cv_prog_SCADE_CG="$SCADE_CG" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_SCADE_CG="SCADE_CG.EXE"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_prog_SCADE_CG" && ac_cv_prog_SCADE_CG="no"
fi
fi
SCADE_CG=$ac_cv_prog_SCADE_CG
if test -n "$SCADE_CG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SCADE_CG" >&5
$as_echo "$SCADE_CG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "$SCADE_CG" = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find SCADE_CG.EXE the scade compiler." >&5
$as_echo "$as_me: WARNING: *** Cannot find SCADE_CG.EXE the scade compiler." >&2;}
fi
SCADE_CG=SCADE_CG.EXE
# Extract the first word of "SCADE.EXE", so it can be a program name with args.
set dummy SCADE.EXE; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_SCADE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$SCADE"; then
ac_cv_prog_SCADE="$SCADE" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_SCADE="SCADE.EXE"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_prog_SCADE" && ac_cv_prog_SCADE="no"
fi
fi
SCADE=$ac_cv_prog_SCADE
if test -n "$SCADE"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SCADE" >&5
$as_echo "$SCADE" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "$SCADE" = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find SCADE.EXE the scade compiler." >&5
$as_echo "$as_me: WARNING: *** Cannot find SCADE.EXE the scade compiler." >&2;}
fi
SCADE=SCADE.EXE
;;
*)
# Extract the first word of "scade2lustre", so it can be a program name with args.
set dummy scade2lustre; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_SCADE2LUSTRE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$SCADE2LUSTRE"; then
ac_cv_prog_SCADE2LUSTRE="$SCADE2LUSTRE" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_SCADE2LUSTRE="scade2lustre"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_prog_SCADE2LUSTRE" && ac_cv_prog_SCADE2LUSTRE="no"
fi
fi
SCADE2LUSTRE=$ac_cv_prog_SCADE2LUSTRE
if test -n "$SCADE2LUSTRE"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SCADE2LUSTRE" >&5
$as_echo "$SCADE2LUSTRE" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "$SCADE2LUSTRE" = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find scade2lustre the scade to lustre compiler." >&5
$as_echo "$as_me: WARNING: *** Cannot find scade2lustre the scade to lustre compiler." >&2;}
SCADE2LUSTRE=$SCADE2LUSTRE
fi
# Extract the first word of "scade2lustre", so it can be a program name with args.
set dummy scade2lustre; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_S2L+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $S2L in
[\\/]* | ?:[\\/]*)
ac_cv_path_S2L="$S2L" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_S2L="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
S2L=$ac_cv_path_S2L
if test -n "$S2L"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $S2L" >&5
$as_echo "$S2L" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
SCADE_INSTALL_DIR=`echo $S2L | sed 's/bin\/scade2lustre//'`
# Extract the first word of "lustre2C", so it can be a program name with args.
set dummy lustre2C; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_LUSTRE2C+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$LUSTRE2C"; then
ac_cv_prog_LUSTRE2C="$LUSTRE2C" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_LUSTRE2C="lustre2C"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_prog_LUSTRE2C" && ac_cv_prog_LUSTRE2C="no"
fi
fi
LUSTRE2C=$ac_cv_prog_LUSTRE2C
if test -n "$LUSTRE2C"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LUSTRE2C" >&5
$as_echo "$LUSTRE2C" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "$LUSTRE2C" = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find lustre2C the scade/lustre to c compiler." >&5
$as_echo "$as_me: WARNING: *** Cannot find lustre2C the scade/lustre to c compiler." >&2;}
LUSTRE2C=$LUSTRE2C
fi
# Extract the first word of "scade_cg", so it can be a program name with args.
set dummy scade_cg; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_SCADE_CG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$SCADE_CG"; then
ac_cv_prog_SCADE_CG="$SCADE_CG" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_SCADE_CG="scade_cg"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_prog_SCADE_CG" && ac_cv_prog_SCADE_CG="no"
fi
fi
SCADE_CG=$ac_cv_prog_SCADE_CG
if test -n "$SCADE_CG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SCADE_CG" >&5
$as_echo "$SCADE_CG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "$SCADE_CG" = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find scade_cg the scade compiler." >&5
$as_echo "$as_me: WARNING: *** Cannot find scade_cg the scade compiler." >&2;}
SCADE_CG=$SCADE_CG
fi
;;
esac
=======
EC2C=ec2c$EXE
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
......@@ -3522,70 +3079,6 @@ fi
#AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))
# AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
<<<<<<< HEAD
#-----------------------------------------------------------------------------#
PIXMAP_DIR="$LURETTEPATH"/bin/pixmaps/
case "$HOST_TYPE" in
win32)
# gtk is compiled in native windows ...
# ??? ougth to work ???
#PIXMAP_DIR=`cygpath -w $PIXMAP_DIR | sed s/'\\'/'\\\\'/g`
PIXMAP_DIR=`echo $PIXMAP_DIR | sed s/'\/cygdrive\/'// | sed s/'\/'/':\/'/ | sed s/'\/'/'\\\\\\\\'/g`
echo "PIXMAP_DIR = $PIXMAP_DIR"
;;
esac
#-----------------------------------------------------------------------------#
case "$HOST_TYPE" in
sparc-sun)
LIB_GC=$SCADE_INSTALL_DIR/lib/$SCADE_OS_NAME/libgc.so
LDL="-lsocket -lnsl -ldl -lstdc++"
NOCYGWIN=
WIN32LIB=
LINKER=gcc
;;
cygwin)
LIB_GC=$SCADE_INSTALL_DIR/bin/gc.dll
LDL="-ldl -lstdc++"
NOCYGWIN=
WIN32LIB=
LINKER=gcc
;;
win32)
LIB_GC=$SCADE_INSTALL_DIR/bin/gc.dll
LDL="-ldl -lstdc++"
NOCYGWIN=-mno-cygwin
WIN32LIB=-lws2_32
LINKER=gcc
;;
mac)
LIB_GC=
LDL=-ldl
NOCYGWIN=
WIN32LIB=
LINKER=g++
;;
*)
LIB_GC=
LDL="-ldl -lstdc++"
NOCYGWIN=
WIN32LIB=
LINKER=gcc
esac
=======
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
#-----------------------------------------------------------------------------#
# Misc tools
......@@ -5066,10 +4559,6 @@ fi
# if the user ask to install files in a other place.
test -d $LURETTEPATH/bin/ || (echo "Creating $LURETTEPATH/bin/..." && mkdir $LURETTEPATH/bin)
<<<<<<< HEAD
test -d $LURETTEPATH/bin/pixmaps || (echo "Creating $LURETTEPATH/bin/pixmaps..." && mkdir $LURETTEPATH/bin/pixmaps)
=======
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
test -d $LURETTEPATH/lib/ || (echo "Creating $LURETTEPATH/lib/..." && mkdir $LURETTEPATH/lib)
test -d $LURETTEPATH/include/ || (echo "Creating $LURETTEPATH/include/..." && mkdir $LURETTEPATH/include )
......@@ -6264,11 +5753,6 @@ install -m a+x,a+r,u+w ./lurettetop.sh "$LURETTEPATH/bin/lurettetop"
install -m a+x,a+r,u+w ./show_luc.sh "$LURETTEPATH/bin/show_luc"
install -m a+x,a+r,u+w ./xlurette.sh "$LURETTEPATH/bin/xlurette"
install -m a+x,a+r,u+w ./gen_stubs.sh "$LURETTEPATH/bin/gen_stubs"
<<<<<<< HEAD
install -D -v ./pixmaps/* "$PIXMAP_DIR"
=======
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
install ./set_env_var "$LURETTEPATH/bin"
......
Supports Markdown
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