[Libprime-devel-cvs] CVS: libprime configure,1.9,1.10 configure.in,1.10,1.11
Status: Inactive
Brought to you by:
simmo
|
From: Andrew S. <si...@us...> - 2001-12-06 10:07:00
|
Update of /cvsroot/libprime/libprime
In directory usw-pr-cvs1:/tmp/cvs-serv11308
Modified Files:
configure configure.in
Log Message:
fixed configure so that tests can be disabled with --disable-tests
Index: configure
===================================================================
RCS file: /cvsroot/libprime/libprime/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure 2001/12/06 08:57:48 1.9
+++ configure 2001/12/06 10:06:57 1.10
@@ -537,14 +537,14 @@
ac_env_target_alias_value=$target_alias
ac_cv_env_target_alias_set=${target_alias+set}
ac_cv_env_target_alias_value=$target_alias
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
[...1954 lines suppressed...]
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -2511,7 +3351,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:2514: error: cannot find input file: $f" >&5
+ { { echo "$as_me:3354: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -2528,6 +3368,7 @@
s,@configure_input@,$configure_input,;t t
s,@srcdir@,$ac_srcdir,;t t
s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
rm -f $tmp/stdin
if test x"$ac_file" != x-; then
Index: configure.in
===================================================================
RCS file: /cvsroot/libprime/libprime/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- configure.in 2001/12/06 08:57:48 1.10
+++ configure.in 2001/12/06 10:06:57 1.11
@@ -1,27 +1,42 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(INSTALL)
+AC_PROG_CC
AC_PROG_CXX
AC_PROG_RANLIB
-dnl AC_PROG_INSTALL
+AC_PROG_INSTALL
+AC_PATH_PROGS(AS, as, $CC)
+AC_PATH_PROGS(AR, ar, :)
+AC_PATH_PROGS(LD, ld, :)
+AC_PATH_PROGS(MAKE, gmake make, :)
+AC_PROG_LN_S
+
AC_LANG_CPLUSPLUS
AC_REQUIRE_CPP
-
AC_CHECK_LIB(stdc++, main,,AC_MSG_ERROR(Requires libstdc++))
AC_CHECK_HEADERS(iostream,,AC_MSG_ERROR(STL class 'iostream' missing))
AC_CHECK_HEADERS(string,,AC_MSG_ERROR(STL classe 'string' missing))
AC_CHECK_HEADERS(vector,,AC_MSG_ERROR(STL class 'vector' missing))
AC_CHECK_HEADERS(deque,,AC_MSG_ERROR(STL class 'deque' missing))
-AC_ARG_ENABLE( tests, [ --disable-tests disable test building],, enable_tests="yes")
+AC_ARG_ENABLE( tests, [ --disable-tests disable test building], , enable_tests="yes")
if test "$enable_tests" = "yes"; then
- LIBPRIME_TESTS="1"
- AC_DEFINE(LIBPRIME_TESTS)
+ LIBPRIME_TESTS=1
+ AC_SUBST(LIBPRIME_TESTS)
fi
+DLL_SUFFIX=so
+OBJ_SUFFIX=o
+LIB_SUFFIX=a
+ASM_SUFFIX=s
+AC_SUBST(DLL_SUFFIX)
+AC_SUBST(OBJ_SUFFIX)
+AC_SUBST(LIB_SUFFIX)
+AC_SUBST(ASM_SUFFIX)
+
AC_OUTPUT(
Makefile
src/Makefile
@@ -33,5 +48,3 @@
build/rules.mk
build/autoconf.mk
)
-
-
|