*** empty log message ***
This commit is contained in:
Bill Hoffman
parent
1cd9ce6f6e
commit
b9cfc413fc
|
|
@ -19,8 +19,9 @@ AC_PATH_XTRA
|
|||
# get byte swapping info
|
||||
AC_C_BIGENDIAN
|
||||
if test $ac_cv_c_bigendian = yes; then
|
||||
AC_DEFINE(CMAKE_WORDS_BIGENDIAN)
|
||||
CMAKE_WORDS_BIGENDIAN=1
|
||||
fi
|
||||
AC_SUBST(CMAKE_WORDS_BIGENDIAN)
|
||||
|
||||
|
||||
# some stuff Tcl uses
|
||||
|
|
@ -56,15 +57,9 @@ fi
|
|||
#
|
||||
# use shared libs
|
||||
#
|
||||
AC_ARG_WITH(shared,
|
||||
[ --with-shared create shared libraries],
|
||||
[CMAKE_shared_ok=$withval], [CMAKE_shared_ok=no])
|
||||
|
||||
INSTALL_TARGET="install"
|
||||
|
||||
AC_SUBST(CMAKE_INSTALL_TARGET)
|
||||
|
||||
|
||||
CMAKE_shared_ok="yes"
|
||||
# the following is an excerpt from the tcl7.5b2 configure.in
|
||||
#--------------------------------------------------------------------
|
||||
# The statements below define a collection of symbols related to
|
||||
|
|
@ -299,19 +294,9 @@ case $system in
|
|||
;;
|
||||
esac
|
||||
|
||||
if test "$CMAKE_shared_ok" = "yes"; then
|
||||
CMAKE_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
|
||||
CMAKE_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
|
||||
RANLIB=":"
|
||||
TOOLKIT_DEPENDS=""
|
||||
CMAKE_LIB_EXT="${CMAKE_SHLIB_SUFFIX}"
|
||||
else
|
||||
CMAKE_LIB_EXT=".a"
|
||||
CMAKE_SHLIB_LD_LIBS=""
|
||||
CMAKE_SHLIB_CFLAGS=""
|
||||
CMAKE_LD_SEARCH_FLAGS=""
|
||||
fi
|
||||
export CMAKE_LIB_EXT
|
||||
CMAKE_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
|
||||
CMAKE_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
|
||||
|
||||
|
||||
AC_SUBST(CMAKE_SHLIB_LINK_FLAGS)
|
||||
AC_SUBST(CMAKE_SHLIB_BUILD_FLAGS)
|
||||
|
|
@ -328,8 +313,7 @@ AC_SUBST(CMAKE_SHLIB_SUFFIX)
|
|||
## ##
|
||||
##########################
|
||||
# initialize thread vars
|
||||
THREAD_LIBS=""
|
||||
THREAD_FLAGS=""
|
||||
CMAKE_THREAD_LIBS=""
|
||||
use_sproc=no
|
||||
CMAKE_USE_SPROC=0
|
||||
CMAKE_USE_PTHREADS=0
|
||||
|
|
@ -369,14 +353,14 @@ use_pthreads=no
|
|||
AC_CHECK_HEADERS(pthread.h, [use_pthreads=yes])
|
||||
if test "$use_pthreads" = "yes"; then
|
||||
if test "$use_sproc" = "no"; then
|
||||
AC_CHECK_LIB(pthreads, pthread_create, THREAD_LIBS="-lpthreads")
|
||||
AC_CHECK_LIB(pthread, pthread_create, THREAD_LIBS="-lpthread")
|
||||
AC_CHECK_LIB(pthreads, pthread_create, CMAKE_THREAD_LIBS="-lpthreads")
|
||||
AC_CHECK_LIB(pthread, pthread_create, CMAKE_THREAD_LIBS="-lpthread")
|
||||
# Work around Solaris 5.6 and 5.7 bug:
|
||||
if test "`uname -s -r`" = "SunOS 5.6"; then
|
||||
AC_CHECK_LIB(thread, thr_create, THREAD_LIBS="$THREAD_LIBS -lthread")
|
||||
AC_CHECK_LIB(thread, thr_create, CMAKE_THREAD_LIBS="$CMAKE_THREAD_LIBS -lthread")
|
||||
fi
|
||||
if test "`uname -s -r`" = "SunOS 5.7"; then
|
||||
AC_CHECK_LIB(thread, thr_create, THREAD_LIBS="$THREAD_LIBS -lthread")
|
||||
AC_CHECK_LIB(thread, thr_create, CMAKE_THREAD_LIBS="$CMAKE_THREAD_LIBS -lthread")
|
||||
fi
|
||||
CMAKE_USE_PTHREADS=1
|
||||
fi
|
||||
|
|
@ -387,17 +371,17 @@ fi
|
|||
if test "$use_pthreads" = "yes"; then
|
||||
case $system in
|
||||
HP-UX-*.10.*)
|
||||
THREAD_LIBS="-lcma"
|
||||
CMAKE_THREAD_LIBS="-lcma"
|
||||
CMAKE_USE_PTHREADS=1
|
||||
CMAKE_HP_PTHREADS=1
|
||||
;;
|
||||
OSF1-V*)
|
||||
CMAKE_USE_PTHREADS=0
|
||||
THREAD_LIBS=""
|
||||
CMAKE_THREAD_LIBS=""
|
||||
;;
|
||||
FreeBSD*)
|
||||
CMAKE_USE_PTHREADS=0
|
||||
THREAD_LIBS=""
|
||||
CMAKE_THREAD_LIBS=""
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
|
@ -409,7 +393,7 @@ AC_SUBST(CMAKE_HP_PTHREADS)
|
|||
AC_SUBST(CMAKE_THREAD_LIBS)
|
||||
|
||||
|
||||
|
||||
CMAKE_ANSI_CFLAGS=""
|
||||
# on hp use -Aa for ansi
|
||||
if test $ac_cv_prog_gxx = no; then
|
||||
case $system in
|
||||
|
|
@ -418,7 +402,7 @@ case $system in
|
|||
echo 'void f(){}' > conftest.c
|
||||
if test -z "`${CC} -Aa -c conftest.c 2>&1`"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ANSI_CFLAGS="-Aa"
|
||||
CMAKE_ANSI_CFLAGS="-Aa"
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
|
@ -491,32 +475,17 @@ if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
|
|||
SHLIB_CFLAGS="-fPIC"
|
||||
fi
|
||||
|
||||
if test -f $CMAKE_CONFIG_DIR/CMakeLocal.make.in; then
|
||||
echo "create CMakeLocal.make from $CMAKE_CONFIG_DIR/CMakeLocal.make.in"
|
||||
rm -f local.make
|
||||
cp $CMAKE_CONFIG_DIR/local.make.in local.make
|
||||
else
|
||||
echo "no $CMAKE_CONFIG_DIR/CMakeLocal.make.in creating an empty CMakeLocal.make file"
|
||||
rm -f CMakeLocal.make
|
||||
touch CMakeLocal.make
|
||||
fi
|
||||
|
||||
# find make to use to build cmake, prefer gmake
|
||||
AC_PATH_PROGS(RUNMAKE, gmake make)
|
||||
|
||||
AC_PATH_PROGS(CMAKE_AR, ar)
|
||||
AC_SUBST(CMAKE_AR)
|
||||
|
||||
# generate output files.
|
||||
# create mkdir files just to make some of the directories
|
||||
|
||||
AC_OUTPUT(
|
||||
CMakeSystemConfig.cmake:CMake/CMakeSystemConfig.cmake.in
|
||||
Makefile:CMake/CMakeTopMakefileTemplate.in
|
||||
CMakeTargets.make:CMake/CMakeTargets.make.in
|
||||
CMake/CMakeSimpleRules.make
|
||||
CMake/CMakeMaster.make
|
||||
CMake/CMakeVariables.make
|
||||
CMake/CMakeRules.make
|
||||
CMake/Source/CMakeTargets.make:CMake/dummy.in
|
||||
CMake/makedir:CMake/dummy.in
|
||||
CMake/Source/Makefile
|
||||
)
|
||||
|
||||
|
|
@ -531,10 +500,4 @@ CMake/Source/CMakeBuildTargets ${fullSrcDir}/CMakeLists.txt -MakeCache -S${fullS
|
|||
|
||||
echo CMakeCache.txt location: ${CMAKE_CONFIG_DIR}/CMakeCache.txt
|
||||
|
||||
# force a rebuild of CMakeBuildTargets which will rebuild CMakeTargets.make
|
||||
# this has to be done because CMakeBuildTargets -MakeCache generates stub CMakeTargets.make files
|
||||
# and make programs other than gnu do not like to include make file fragments
|
||||
# that do not exist, even if they know how to create them.
|
||||
rm -f CMake/Source/CMakeBuildTargets
|
||||
rm -f CMake/Source/CMakeBuildTargets.exe
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue