This commit is contained in:
Olivier Sirol 2001-05-18 16:07:48 +00:00
parent 47cec9a386
commit d19ebc5ca1
2 changed files with 44 additions and 42 deletions

View File

@ -1,6 +1,6 @@
#! /bin/sh
# From configure.in Revision: 1.22
# From configure.in Revision: 1.23
# Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.13
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
@ -3466,9 +3466,10 @@ MOTIF_LIB_LOC="-L$GUI_LIB_LOC -lXm"
# Try static link on Linux
# TODO: faire pareil pour Xpm, voir gvim???
# ERRORLinux !!!! ca marche pas Xm a besoin de -lXp (pb xfsm)
if test -f "$GUI_LIB_LOC/libXm.a"; then
if test "$ALLIANCE_OS" = Linux; then
if test "$ALLIANCE_OS" = ERRORLinux; then
MOTIF_LIB_LOC="$GUI_LIB_LOC/libXm.a"
fi
fi
@ -3488,9 +3489,9 @@ OLD_CFLAGS=$CFLAGS
LIBS="$OLD_LIBS $X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS -lXt -lX11"
CFLAGS="$OLD_CFLAGS $X_CFLAGS"
echo $ac_n "checking if you can link X11 app""... $ac_c" 1>&6
echo "configure:3492: checking if you can link X11 app" >&5
echo "configure:3493: checking if you can link X11 app" >&5
cat > conftest.$ac_ext <<EOF
#line 3494 "configure"
#line 3495 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <X11/Xlib.h>
@ -3498,7 +3499,7 @@ int main() {
XOpenDisplay (":0");
; return 0; }
EOF
if { (eval echo configure:3502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
@ -3520,11 +3521,11 @@ LIBS="$OLD_LIBS -L$GUI_LIB_LOC -lXm $X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS -lXt -lX11
CFLAGS="$OLD_CFLAGS $X_CFLAGS -I$GUI_INC_LOC"
echo "checking if you can link Motif/LessTif app" 1>&6
echo "configure:3524: checking if you can link Motif/LessTif app" >&5
echo "configure:3525: checking if you can link Motif/LessTif app" >&5
echo $ac_n "checking without additional libs""... $ac_c" 1>&6
echo "configure:3526: checking without additional libs" >&5
echo "configure:3527: checking without additional libs" >&5
cat > conftest.$ac_ext <<EOF
#line 3528 "configure"
#line 3529 "configure"
#include "confdefs.h"
# include <Xm/Xm.h>
# include <Xm/FileSB.h>
@ -3543,7 +3544,7 @@ int main() {
XtAppMainLoop( app );
; return 0; }
EOF
if { (eval echo configure:3547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
@ -3554,12 +3555,12 @@ else
# try with Xintl
echo $ac_n "checking with Xintl""... $ac_c" 1>&6
echo "configure:3558: checking with Xintl" >&5
echo "configure:3559: checking with Xintl" >&5
LIBS="$OLD_LIBS -L$GUI_LIB_LOC -lXm $X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS -lXintl -lXt -lX11"
CFLAGS="$OLD_CFLAGS $X_CFLAGS -I$GUI_INC_LOC"
cat > conftest.$ac_ext <<EOF
#line 3563 "configure"
#line 3564 "configure"
#include "confdefs.h"
# include <Xm/Xm.h>
# include <Xm/FileSB.h>
@ -3578,7 +3579,7 @@ int main() {
XtAppMainLoop( app );
; return 0; }
EOF
if { (eval echo configure:3582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; X_PRE_LIBS="$X_PRE_LIBS -lXintl"
else
@ -3589,12 +3590,12 @@ else
# try with Xp
echo $ac_n "checking with Xext and Xp""... $ac_c" 1>&6
echo "configure:3593: checking with Xext and Xp" >&5
echo "configure:3594: checking with Xext and Xp" >&5
LIBS="$OLD_LIBS -L$GUI_LIB_LOC -lXm $X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS -lXext -lXp -lXt -lX11"
CFLAGS="$OLD_CFLAGS $X_CFLAGS -I$GUI_INC_LOC"
cat > conftest.$ac_ext <<EOF
#line 3598 "configure"
#line 3599 "configure"
#include "confdefs.h"
# include <Xm/Xm.h>
# include <Xm/FileSB.h>
@ -3613,7 +3614,7 @@ int main() {
XtAppMainLoop( app );
; return 0; }
EOF
if { (eval echo configure:3617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; X_PRE_LIBS="$X_PRE_LIBS -lXext -lXp"
else
@ -3642,9 +3643,9 @@ OLD_CFLAGS=$CFLAGS
LIBS="$OLD_LIBS $XPM_LIBS_LOC $X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS -lXt -lX11"
CFLAGS="$OLD_CFLAGS $X_CFLAGS $XPM_CFLAGS_LOC"
echo $ac_n "checking for libXpm""... $ac_c" 1>&6
echo "configure:3646: checking for libXpm" >&5
echo "configure:3647: checking for libXpm" >&5
cat > conftest.$ac_ext <<EOF
#line 3648 "configure"
#line 3649 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@ -3653,7 +3654,7 @@ int main() {
XpmWriteFileFromPixmap( NULL, NULL, NULL, NULL, NULL );
; return 0; }
EOF
if { (eval echo configure:3657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; AUTO_HAS="$AUTO_HAS -DAUTO_HAS_XPM"
else
@ -3681,7 +3682,7 @@ SKIP_GNU=
if test -z "$SKIP_GNU"; then
gnu_includes="`echo $LD_LIBRARY_PATH | sed 's/:/ /g' | sed 's/lib/include/g'` /usr/local/include /usr/include $GNUHOME/include $GNU_INC_LOC"
echo $ac_n "checking for location of GNU readline include""... $ac_c" 1>&6
echo "configure:3685: checking for location of GNU readline include" >&5
echo "configure:3686: checking for location of GNU readline include" >&5
GNU_INC_LOC=
# echo $gnu_includes
for try in $gnu_includes; do
@ -3703,7 +3704,7 @@ fi
if test -z "$SKIP_GNU"; then
gnu_libs="`echo $LD_LIBRARY_PATH | sed 's/:/ /g'` `echo "$GNU_INC_LOC" | sed 's/include/lib/'` /usr/local/lib /usr/lib $GNUHOME/lib $GNU_LIB_LOC"
echo $ac_n "checking for location of GNU libs""... $ac_c" 1>&6
echo "configure:3707: checking for location of GNU libs" >&5
echo "configure:3708: checking for location of GNU libs" >&5
GNU_LIB_LOC=
# echo $gnu_libs
for try in $gnu_libs; do
@ -3725,12 +3726,12 @@ fi
################################################################### Headers...
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
echo "configure:3729: checking for ANSI C header files" >&5
echo "configure:3730: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3734 "configure"
#line 3735 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@ -3738,7 +3739,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:3743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@ -3755,7 +3756,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
#line 3759 "configure"
#line 3760 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@ -3773,7 +3774,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
#line 3777 "configure"
#line 3778 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@ -3794,7 +3795,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
#line 3798 "configure"
#line 3799 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@ -3805,7 +3806,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
if { (eval echo configure:3809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:3810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@ -3838,9 +3839,9 @@ fi
################################################################### OS specific...
echo $ac_n "checking SA_RESTART""... $ac_c" 1>&6
echo "configure:3842: checking SA_RESTART" >&5
echo "configure:3843: checking SA_RESTART" >&5
cat > conftest.$ac_ext <<EOF
#line 3844 "configure"
#line 3845 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@ -3851,7 +3852,7 @@ sgct.sa_flags = SA_RESTART;
sigaction( SIGCHLD, &sgct , NULL );
; return 0; }
EOF
if { (eval echo configure:3855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; AUTO_HAS="$AUTO_HAS -DAUTO_HAS_SA_RESTART"
else
@ -3863,9 +3864,9 @@ fi
rm -f conftest*
echo $ac_n "checking DRAND48""... $ac_c" 1>&6
echo "configure:3867: checking DRAND48" >&5
echo "configure:3868: checking DRAND48" >&5
cat > conftest.$ac_ext <<EOF
#line 3869 "configure"
#line 3870 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@ -3874,7 +3875,7 @@ int main() {
Proba = drand48();
; return 0; }
EOF
if { (eval echo configure:3878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; AUTO_HAS="$AUTO_HAS -DAUTO_HAS_DRAND48"
else
@ -3886,9 +3887,9 @@ fi
rm -f conftest*
echo $ac_n "checking VALUES_H""... $ac_c" 1>&6
echo "configure:3890: checking VALUES_H" >&5
echo "configure:3891: checking VALUES_H" >&5
cat > conftest.$ac_ext <<EOF
#line 3892 "configure"
#line 3893 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@ -3898,7 +3899,7 @@ int main() {
Proba = MAXFLOAT;
; return 0; }
EOF
if { (eval echo configure:3902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; AUTO_HAS="$AUTO_HAS -DAUTO_HAS_VALUES_H"
else
@ -3915,7 +3916,7 @@ rm -f conftest*
################################################################### Alliance ALLIANCE_TOP
echo $ac_n "checking where the Alliance package was installed""... $ac_c" 1>&6
echo "configure:3919: checking where the Alliance package was installed" >&5
echo "configure:3920: checking where the Alliance package was installed" >&5
# Avoid problems with soft links and builtin pwd...
ALLIANCE_TOP=`$PWDBIN | sed 's§share/etc$§archi§'`
ALLIANCE_TOP=`echo $ALLIANCE_TOP | sed 's§archi/Cygwin/etc$§archi§'`

View File

@ -6,14 +6,14 @@
# Copyright (C) 1997, 2000 Czo <Olivier.Sirol@lip6.fr>
# License: GPL (http://www.gnu.org/copyleft/gpl.html)
# Started: Feb 1997
# Last Change: Wednesday 24 January 2001, 18:40
# Edit Time: 5:03:59
# Last Change: Friday 18 May 2001, 18:01
# Edit Time: 5:05:26
# Description: Alliance CAD system configure.in
#
# $Id: configure.in,v 1.23 2001/01/24 17:43:06 czo Exp $
# $Id: configure.in,v 1.24 2001/05/18 16:07:48 czo Exp $
#
AC_REVISION($Revision: 1.23 $)dnl
AC_REVISION($Revision: 1.24 $)dnl
AC_INIT(configure.in)
@ -309,9 +309,10 @@ MOTIF_LIB_LOC="-L$GUI_LIB_LOC -lXm"
# Try static link on Linux
# TODO: faire pareil pour Xpm, voir gvim???
# ERRORLinux !!!! ca marche pas Xm a besoin de -lXp (pb xfsm)
if test -f "$GUI_LIB_LOC/libXm.a"; then
if test "$ALLIANCE_OS" = Linux; then
if test "$ALLIANCE_OS" = ERRORLinux; then
MOTIF_LIB_LOC="$GUI_LIB_LOC/libXm.a"
fi
fi