Further unify the configure.in scripts.
This commit is contained in:
parent
e6b25a4e20
commit
8aca824c0f
|
|
@ -12,7 +12,7 @@ autoconf
|
||||||
for dir in vpip vvp tgt-vvp tgt-fpga libveriuser cadpli
|
for dir in vpip vvp tgt-vvp tgt-fpga libveriuser cadpli
|
||||||
do
|
do
|
||||||
echo "Autoconf in $dir..."
|
echo "Autoconf in $dir..."
|
||||||
( cd ./$dir ; autoconf )
|
( cd ./$dir ; autoconf --include=.. )
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Precompiling lexor_keyword.gperf"
|
echo "Precompiling lexor_keyword.gperf"
|
||||||
|
|
|
||||||
|
|
@ -133,81 +133,14 @@ AC_MSG_RESULT($EXTRALIBS)
|
||||||
## in order to know the name of the start symbol for the .vpi module.
|
## in order to know the name of the start symbol for the .vpi module.
|
||||||
#######################
|
#######################
|
||||||
|
|
||||||
AC_CYGWIN
|
AX_C_UNDERSCORES_LEADING
|
||||||
AC_EXEEXT
|
AX_C_UNDERSCORES_TRAILING
|
||||||
AC_MINGW32
|
|
||||||
|
|
||||||
|
|
||||||
WIN32=no
|
|
||||||
AC_MSG_CHECKING("Checking for windows")
|
|
||||||
if test "$CYGWIN" = "yes" -o "$MINGW32" = "yes"
|
|
||||||
then
|
|
||||||
WIN32=yes
|
|
||||||
fi
|
|
||||||
AC_SUBST(WIN32)
|
|
||||||
AC_MSG_RESULT($WIN32)
|
|
||||||
AC_SUBST(EXEEXT)
|
|
||||||
|
|
||||||
|
|
||||||
AC_MSG_CHECKING("for leading and/or trailing underscores")
|
|
||||||
cat << EOF > underscore.c
|
|
||||||
void underscore(void){}
|
|
||||||
EOF
|
|
||||||
$CC -shared -c underscore.c > /dev/null 2>&1
|
|
||||||
|
|
||||||
CC_LEADING_UNDERSCORE=no
|
|
||||||
CC_TRAILING_UNDERSCORE=no
|
|
||||||
|
|
||||||
output=`nm underscore.o|grep _underscore 2>&1`
|
|
||||||
if test ! -z "$output" -a "$CYGWIN" != "yes" -a "$MINGW32" != "yes"; then
|
|
||||||
CC_LEADING_UNDERSCORE=yes
|
|
||||||
AC_DEFINE(NEED_LU)
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
output=`nm underscore.o|grep underscore_ 2>&1`
|
|
||||||
if test ! -z "$output"; then
|
|
||||||
CC_TRAILING_UNDERSCORE=yes
|
|
||||||
AC_DEFINE(NEED_TU)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$CC_LEADING_UNDERSCORE" = yes; then
|
|
||||||
AC_DEFINE(WLU)
|
|
||||||
fi
|
|
||||||
if test "$CC_TRAILING_UNDERSCORE" = yes; then
|
|
||||||
AC_DEFINE(WTU)
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm underscore.c underscore.o
|
|
||||||
|
|
||||||
AC_MSG_RESULT("$CC_LEADING_UNDERSCORE $CC_TRAILING_UNDERSCORE")
|
|
||||||
|
|
||||||
#######################
|
#######################
|
||||||
## end of test for underscores
|
## end of test for underscores
|
||||||
#######################
|
#######################
|
||||||
|
|
||||||
|
AX_CPP_IDENT
|
||||||
|
|
||||||
AC_MSG_CHECKING("for ident support in C compiler")
|
|
||||||
ident_support='-DHAVE_CVS_IDENT=1'
|
|
||||||
case "${host}" in
|
|
||||||
|
|
||||||
*-*-cygwin*)
|
|
||||||
ident_support=
|
|
||||||
;;
|
|
||||||
|
|
||||||
*-*-darwin*)
|
|
||||||
ident_support=
|
|
||||||
;;
|
|
||||||
|
|
||||||
*-*-machten*)
|
|
||||||
ident_support=
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
AC_SUBST(ident_support)
|
|
||||||
AC_MSG_RESULT($ident_support)
|
|
||||||
|
|
||||||
# where to put vpi subdirectories
|
# where to put vpi subdirectories
|
||||||
AC_MSG_CHECKING(for VPI subdirectories)
|
AC_MSG_CHECKING(for VPI subdirectories)
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
# 59 Temple Place - Suite 330
|
# 59 Temple Place - Suite 330
|
||||||
# Boston, MA 02111-1307, USA
|
# Boston, MA 02111-1307, USA
|
||||||
#
|
#
|
||||||
#ident "$Id: Makefile.in,v 1.31 2003/10/10 02:57:45 steve Exp $"
|
#ident "$Id: Makefile.in,v 1.32 2004/01/15 20:52:32 steve Exp $"
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
|
|
@ -34,13 +34,11 @@ libdir64 = @libdir64@
|
||||||
includedir = $(prefix)/include
|
includedir = $(prefix)/include
|
||||||
|
|
||||||
CC = @CC@ -I. -I.. -I$(srcdir) -I$(srcdir)/..
|
CC = @CC@ -I. -I.. -I$(srcdir) -I$(srcdir)/..
|
||||||
CXX = @CXX@ -I. -I.. -I$(srcdir) -I$(srcdir)/..
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
|
||||||
CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@
|
CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@
|
||||||
CXXFLAGS = @CXXFLAGS@
|
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
LDFLAGS = @LDFLAGS@
|
LDFLAGS = @LDFLAGS@
|
||||||
STRIP = @STRIP@
|
STRIP = @STRIP@
|
||||||
|
|
@ -86,7 +84,7 @@ dep:
|
||||||
mkdir dep
|
mkdir dep
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
$(CC) -Wall $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
|
$(CC) -Wall @ident_support@ $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
|
||||||
mv $*.d dep
|
mv $*.d dep
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ AC_PROG_RANLIB
|
||||||
|
|
||||||
AC_CYGWIN
|
AC_CYGWIN
|
||||||
AC_EXEEXT
|
AC_EXEEXT
|
||||||
|
AX_CPP_IDENT
|
||||||
|
|
||||||
# vvp32 is by default disabled
|
# vvp32 is by default disabled
|
||||||
#enable_vvp32=no
|
#enable_vvp32=no
|
||||||
|
|
|
||||||
|
|
@ -75,26 +75,6 @@ esac
|
||||||
AC_SUBST(WIN32)
|
AC_SUBST(WIN32)
|
||||||
AC_MSG_RESULT($WIN32)
|
AC_MSG_RESULT($WIN32)
|
||||||
|
|
||||||
|
AX_CPP_IDENT
|
||||||
AC_MSG_CHECKING("for ident support in C compiler")
|
|
||||||
ident_support='-DHAVE_CVS_IDENT=1'
|
|
||||||
case "${host}" in
|
|
||||||
|
|
||||||
*-*-cygwin*)
|
|
||||||
ident_support=
|
|
||||||
;;
|
|
||||||
|
|
||||||
*-*-darwin*)
|
|
||||||
ident_support=
|
|
||||||
;;
|
|
||||||
|
|
||||||
*-*-machten*)
|
|
||||||
ident_support=
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
AC_SUBST(ident_support)
|
|
||||||
AC_MSG_RESULT($ident_support)
|
|
||||||
|
|
||||||
|
|
||||||
AC_OUTPUT(Makefile)
|
AC_OUTPUT(Makefile)
|
||||||
|
|
|
||||||
|
|
@ -82,26 +82,6 @@ esac
|
||||||
AC_SUBST(WIN32)
|
AC_SUBST(WIN32)
|
||||||
AC_MSG_RESULT($WIN32)
|
AC_MSG_RESULT($WIN32)
|
||||||
|
|
||||||
|
AX_CPP_IDENT
|
||||||
AC_MSG_CHECKING("for ident support in C compiler")
|
|
||||||
ident_support='-DHAVE_CVS_IDENT=1'
|
|
||||||
case "${host}" in
|
|
||||||
|
|
||||||
*-*-cygwin*)
|
|
||||||
ident_support=
|
|
||||||
;;
|
|
||||||
|
|
||||||
*-*-darwin*)
|
|
||||||
ident_support=
|
|
||||||
;;
|
|
||||||
|
|
||||||
*-*-machten*)
|
|
||||||
ident_support=
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
AC_SUBST(ident_support)
|
|
||||||
AC_MSG_RESULT($ident_support)
|
|
||||||
|
|
||||||
|
|
||||||
AC_OUTPUT(Makefile)
|
AC_OUTPUT(Makefile)
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
# 59 Temple Place - Suite 330
|
# 59 Temple Place - Suite 330
|
||||||
# Boston, MA 02111-1307, USA
|
# Boston, MA 02111-1307, USA
|
||||||
#
|
#
|
||||||
#ident "$Id: Makefile.in,v 1.49 2003/10/30 03:43:19 steve Exp $"
|
#ident "$Id: Makefile.in,v 1.50 2004/01/15 20:52:32 steve Exp $"
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
|
|
@ -61,7 +61,7 @@ dep:
|
||||||
mkdir dep
|
mkdir dep
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
$(CC) -Wall -I$(srcdir)/.. -I$(srcdir) -I.. $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
|
$(CC) -Wall @ident_support@ -I$(srcdir)/.. -I$(srcdir) -I.. $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
|
||||||
mv $*.d dep
|
mv $*.d dep
|
||||||
|
|
||||||
O = sys_table.o sys_convert.o sys_deposit.o sys_display.o sys_fileio.o \
|
O = sys_table.o sys_convert.o sys_deposit.o sys_display.o sys_fileio.o \
|
||||||
|
|
|
||||||
|
|
@ -127,81 +127,14 @@ AC_MSG_RESULT($EXTRALIBS)
|
||||||
## in order to know the name of the start symbol for the .vpi module.
|
## in order to know the name of the start symbol for the .vpi module.
|
||||||
#######################
|
#######################
|
||||||
|
|
||||||
AC_CYGWIN
|
AX_C_UNDERSCORES_LEADING
|
||||||
AC_EXEEXT
|
AX_C_UNDERSCORES_TRAILING
|
||||||
AC_MINGW32
|
|
||||||
|
|
||||||
|
|
||||||
WIN32=no
|
|
||||||
AC_MSG_CHECKING("Checking for windows")
|
|
||||||
if test "$CYGWIN" = "yes" -o "$MINGW32" = "yes"
|
|
||||||
then
|
|
||||||
WIN32=yes
|
|
||||||
fi
|
|
||||||
AC_SUBST(WIN32)
|
|
||||||
AC_MSG_RESULT($WIN32)
|
|
||||||
AC_SUBST(EXEEXT)
|
|
||||||
|
|
||||||
|
|
||||||
AC_MSG_CHECKING("for leading and/or trailing underscores")
|
|
||||||
cat << EOF > underscore.c
|
|
||||||
void underscore(void){}
|
|
||||||
EOF
|
|
||||||
$CC -shared -c underscore.c > /dev/null 2>&1
|
|
||||||
|
|
||||||
CC_LEADING_UNDERSCORE=no
|
|
||||||
CC_TRAILING_UNDERSCORE=no
|
|
||||||
|
|
||||||
output=`nm underscore.o|grep _underscore 2>&1`
|
|
||||||
if test ! -z "$output" -a "$CYGWIN" != "yes" -a "$MINGW32" != "yes"; then
|
|
||||||
CC_LEADING_UNDERSCORE=yes
|
|
||||||
AC_DEFINE(NEED_LU)
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
output=`nm underscore.o|grep underscore_ 2>&1`
|
|
||||||
if test ! -z "$output"; then
|
|
||||||
CC_TRAILING_UNDERSCORE=yes
|
|
||||||
AC_DEFINE(NEED_TU)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$CC_LEADING_UNDERSCORE" = yes; then
|
|
||||||
AC_DEFINE(WLU)
|
|
||||||
fi
|
|
||||||
if test "$CC_TRAILING_UNDERSCORE" = yes; then
|
|
||||||
AC_DEFINE(WTU)
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm underscore.c underscore.o
|
|
||||||
|
|
||||||
AC_MSG_RESULT("$CC_LEADING_UNDERSCORE $CC_TRAILING_UNDERSCORE")
|
|
||||||
|
|
||||||
#######################
|
#######################
|
||||||
## end of test for underscores
|
## end of test for underscores
|
||||||
#######################
|
#######################
|
||||||
|
|
||||||
|
AX_CPP_IDENT
|
||||||
|
|
||||||
AC_MSG_CHECKING("for ident support in C compiler")
|
|
||||||
ident_support='-DHAVE_CVS_IDENT=1'
|
|
||||||
case "${host}" in
|
|
||||||
|
|
||||||
*-*-cygwin*)
|
|
||||||
ident_support=
|
|
||||||
;;
|
|
||||||
|
|
||||||
*-*-darwin*)
|
|
||||||
ident_support=
|
|
||||||
;;
|
|
||||||
|
|
||||||
*-*-machten*)
|
|
||||||
ident_support=
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
AC_SUBST(ident_support)
|
|
||||||
AC_MSG_RESULT($ident_support)
|
|
||||||
|
|
||||||
# If not otherwise specified, set the libdir64 variable
|
# If not otherwise specified, set the libdir64 variable
|
||||||
# to the same as libdir.
|
# to the same as libdir.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue