cleaned up configure some

This commit is contained in:
Ken Martin 2001-05-09 13:22:20 -04:00
parent 4d2e6c8394
commit 54dcf6932a
7 changed files with 123 additions and 213 deletions

View File

@ -4,18 +4,18 @@ CMAKE_LIB_EXT = @CMAKE_LIB_EXT@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Include all variable settings # Include all variable settings
@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeVariables.make@MAKEQUOTE@ include @CMAKE_CONFIG_DIR@/CMake/CMakeVariables.make
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Include generated rules # Include generated rules
@MAKEINCLUDE@ @MAKEQUOTE@CMakeTargets.make@MAKEQUOTE@ include CMakeTargets.make
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Include user-editable defines. # Include user-editable defines.
@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMakeLocal.make@MAKEQUOTE@ include @CMAKE_CONFIG_DIR@/CMakeLocal.make
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Include General Build Rules # Include General Build Rules
@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeRules.make@MAKEQUOTE@ include @CMAKE_CONFIG_DIR@/CMake/CMakeRules.make

View File

@ -1,5 +1,5 @@
# rules for building .o files from source files # rules for building .o files from source files
@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeSimpleRules.make@MAKEQUOTE@ include @CMAKE_CONFIG_DIR@/CMake/CMakeSimpleRules.make
# #
# Makefile for # Makefile for

View File

@ -2,8 +2,10 @@
# CMakeLocal.make.in should be in the directory where you run configure # CMakeLocal.make.in should be in the directory where you run configure
# in, which need not be the source directory # in, which need not be the source directory
# #
SET (WORDS_BIGENDIAN @CMAKE_WORDS_BIGENDIAN@) SET (CMAKE_WORDS_BIGENDIAN @CMAKE_WORDS_BIGENDIAN@)
SET (CMAKE_USE_SPROC @CMAKE_USE_SPROC@) SET (CMAKE_USE_SPROC @CMAKE_USE_SPROC@)
SET (CMAKE_USE_PTHREADS @CMAKE_USE_PTHREADS@) SET (CMAKE_USE_PTHREADS @CMAKE_USE_PTHREADS@)
SET (CMAKE_HP_PTHREADS @CMAKE_HP_PTHREADS@) SET (CMAKE_HP_PTHREADS @CMAKE_HP_PTHREADS@)
SET (CXX @CXX@) SET (CXX @CXX@)
SET (CMAKE_THREAD_LIBS @CMAKE_THREAD_LIBS@)
SET (CMAKE_DL_LIBS @CMAKE_DL_LIBS@)

View File

@ -5,4 +5,4 @@ topall:
cd . ; ${MAKE} -${MAKEFLAGS} CMakeTargets.make cd . ; ${MAKE} -${MAKEFLAGS} CMakeTargets.make
cd . ; ${MAKE} -${MAKEFLAGS} all cd . ; ${MAKE} -${MAKEFLAGS} all
@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeMaster.make@MAKEQUOTE@ include @CMAKE_CONFIG_DIR@/CMake/CMakeMaster.make

View File

@ -49,15 +49,7 @@ CC = @CC@
CFLAGS = @CMAKE_SHLIB_CFLAGS@ @ANSI_CFLAGS@ CFLAGS = @CMAKE_SHLIB_CFLAGS@ @ANSI_CFLAGS@
CXX = @CXX@ CXX = @CXX@
CXXFLAGS = @CMAKE_SHLIB_CFLAGS@ @EXTRA_GCC_FLAG@ @CMAKE_TEMPLATE_FLAGS@ CXXFLAGS = @CMAKE_SHLIB_CFLAGS@ @CMAKE_TEMPLATE_FLAGS@
JAVA = @JAVACOMMAND@
JRE = @JAVACOMMAND@
JAVAC = @JAVAC@
JAR = @JAR@
JAVADOC = @JAVADOC@
TCLSH = @TCLSHCOMMAND@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
@ -66,26 +58,12 @@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
LIB_RUNTIME_DIR = @exec_prefix@/lib LIB_RUNTIME_DIR = @exec_prefix@/lib
TOOLKIT_DEPENDS = @TOOLKIT_DEPENDS@
CMAKE_TCL_SHLIB_TARGET = @CMAKE_TCL_SHLIB_TARGET@
CMAKE_SHLIB_BUILD_FLAGS = @CMAKE_SHLIB_BUILD_FLAGS@ CMAKE_SHLIB_BUILD_FLAGS = @CMAKE_SHLIB_BUILD_FLAGS@
CMAKE_SHLIB_LINK_FLAGS = @CMAKE_SHLIB_LINK_FLAGS@ CMAKE_SHLIB_LINK_FLAGS = @CMAKE_SHLIB_LINK_FLAGS@
DL_LIBS = @DL_LIBS@ DL_LIBS = @CMAKE_DL_LIBS@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ SHLIB_LD_LIBS = @CMAKE_SHLIB_LD_LIBS@
SHLIB_SUFFIX = @SHLIB_SUFFIX@ SHLIB_SUFFIX = @CMAKE_SHLIB_SUFFIX@
THREAD_LIBS = @CMAKE_THREAD_LIBS@
THREAD_LIBS = @THREAD_LIBS@
GRAPHICS_API_OBJ = @GRAPHICS_API_OBJ@
GRAPHICS_API_FLAGS = @GRAPHICS_API_FLAGS@ @X_CFLAGS@
GRAPHICS_API_LIBS = @GRAPHICS_API_LIBS@
CONTROLLER_API_OBJ = @CONTROLLER_API_OBJ@
CONTROLLER_API_FLAGS = @CONTROLLER_API_FLAGS@
CONTROLLER_API_LIBS = @CONTROLLER_API_LIBS@
# install support # install support
# #
@ -95,22 +73,17 @@ CONTROLLER_API_LIBS = @CONTROLLER_API_LIBS@
# run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix # run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
# when installing files. # when installing files.
INSTALL_ROOT = INSTALL_ROOT =
INSTALL = @INSTALL@ INSTALL = @CMAKE_INSTALL@
LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
# set up the path to the rulesgen program # set up the path to the rulesgen program
CMAKE = @CMAKE_CONFIG_DIR@/CMake/Source/CMakeBuildTargets CMAKE = @CMAKE_CONFIG_DIR@/CMake/Source/CMakeBuildTargets
KIT_OBJ = ${EXTRA_KIT_OBJ}
# C++ compile flags, INCLUDE_FLAGS is set in CMakeTargets.make which # C++ compile flags, INCLUDE_FLAGS is set in CMakeTargets.make which
# is generated by CMakeBuildTargets, see CMake/Source # is generated by CMakeBuildTargets, see CMake/Source
CXX_FLAGS = ${CPPFLAGS} ${USER_CXXFLAGS} ${CXXFLAGS} \ CXX_FLAGS = ${CPPFLAGS} ${USER_CXXFLAGS} ${CXXFLAGS} ${INCLUDE_FLAGS}
${KIT_FLAGS} ${INCLUDE_FLAGS}
# C compile flags, INCLUDE_FLAGS is set in CMakeTargets.make which # C compile flags, INCLUDE_FLAGS is set in CMakeTargets.make which
# is generated by CMakeBuildTargets, see CMake/Source # is generated by CMakeBuildTargets, see CMake/Source

View File

@ -8,8 +8,8 @@ VPATH = @srcdir@
# let cmake know that this was done with autoconf # let cmake know that this was done with autoconf
KIT_FLAGS = -DCMAKE_HAS_AUTOCONF -I${CMAKE_CONFIG_DIR}/CMake/Source KIT_FLAGS = -DCMAKE_HAS_AUTOCONF -I${CMAKE_CONFIG_DIR}/CMake/Source
@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeVariables.make@MAKEQUOTE@ include @CMAKE_CONFIG_DIR@/CMake/CMakeVariables.make
@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeSimpleRules.make@MAKEQUOTE@ include @CMAKE_CONFIG_DIR@/CMake/CMakeSimpleRules.make
OBJS = \ OBJS = \
CMakeBuildTargets.o \ CMakeBuildTargets.o \

View File

@ -26,9 +26,9 @@ fi
# some stuff Tcl uses # some stuff Tcl uses
# #
AC_CHECK_HEADER(limits.h, HAVE_LIMITS_H=-DHAVE_LIMITS_H,HAVE_LIMITS_H="") AC_CHECK_HEADER(limits.h, HAVE_LIMITS_H=-DHAVE_LIMITS_H,HAVE_LIMITS_H="")
AC_SUBST(HAVE_LIMITS_H) AC_SUBST(CMAKE_HAVE_LIMITS_H)
AC_HAVE_HEADERS(unistd.h, HAVE_UNISTD_H=-DHAVE_UNISTD_H,HAVE_UNISTD_H="") AC_HAVE_HEADERS(unistd.h, HAVE_UNISTD_H=-DHAVE_UNISTD_H,HAVE_UNISTD_H="")
AC_SUBST(HAVE_UNISTD_H) AC_SUBST(CMAKE_HAVE_UNISTD_H)
# Step 1: set the variable "system" to hold the name and version number # Step 1: set the variable "system" to hold the name and version number
# for the system. This can usually be done via the "uname" command, but # for the system. This can usually be done via the "uname" command, but
@ -53,8 +53,6 @@ else
fi fi
fi fi
# #
# use shared libs # use shared libs
# #
@ -64,35 +62,7 @@ AC_ARG_WITH(shared,
INSTALL_TARGET="install" INSTALL_TARGET="install"
AC_SUBST(CMAKE_INSTALL_TARGET)
AC_SUBST(INSTALL_TARGET)
BUILD_TOOLKITS=""
CLEAN_TOOLKITS=""
DEPEND_TOOLKITS=""
INSTALL_TOOLKITS=""
# --with-kits goes here
AC_SUBST(BUILD_TOOLKITS)
AC_SUBST(INSTALL_TOOLKITS)
AC_SUBST(DEPEND_TOOLKITS)
AC_SUBST(CLEAN_TOOLKITS)
# option for handling BSD style makefile includes
#
AC_ARG_WITH(bsdmake,
[ --with-bsdmake uses bsd style makefile includes],
if test "$withval" = yes; then
MAKEINCLUDE=".include"
MAKEQUOTE='"'
fi,
MAKEINCLUDE="include"
MAKEQUOTE='')
AC_SUBST(MAKEINCLUDE)
AC_SUBST(MAKEQUOTE)
# the following is an excerpt from the tcl7.5b2 configure.in # the following is an excerpt from the tcl7.5b2 configure.in
@ -100,10 +70,10 @@ AC_SUBST(MAKEQUOTE)
# The statements below define a collection of symbols related to # The statements below define a collection of symbols related to
# dynamic loading and shared libraries: # dynamic loading and shared libraries:
# #
# SHLIB_CFLAGS - Flags to pass to cc when compiling the components # CMAKE_SHLIB_CFLAGS - Flags to pass to cc when compiling the components
# of a shared library (may request position-independent # of a shared library (may request position-independent
# code, among other things). # code, among other things).
# SHLIB_LD_LIBS - Dependent libraries for the linker to scan when # CMAKE_SHLIB_LD_LIBS - Dependent libraries for the linker to scan when
# creating shared libraries. This symbol typically # creating shared libraries. This symbol typically
# goes at the end of the "ld" commands that build # goes at the end of the "ld" commands that build
# shared libraries. The value of the symbol if # shared libraries. The value of the symbol if
@ -114,7 +84,7 @@ AC_SUBST(MAKEQUOTE)
# general if Tcl and Tk aren't themselves shared # general if Tcl and Tk aren't themselves shared
# libraries), then this symbol has an empty string # libraries), then this symbol has an empty string
# as its value. # as its value.
# SHLIB_SUFFIX - Suffix to use for the name of the shared library. An # CMAKE_SHLIB_SUFFIX - Suffix to use for the name of the shared library. An
# empty string means we don't know how to use shared # empty string means we don't know how to use shared
# libraries on this platform. # libraries on this platform.
# CMAKE_SHLIB_BUILD_FLAGS - # CMAKE_SHLIB_BUILD_FLAGS -
@ -139,18 +109,18 @@ case $system in
AIX-*) AIX-*)
# AIX: can't link shared library extensions unless Tcl and Tk are # AIX: can't link shared library extensions unless Tcl and Tk are
# also shared libraries. # also shared libraries.
SHLIB_CFLAGS="" CMAKE_SHLIB_CFLAGS=""
SHLIB_LD_LIBS='${LIBS}' CMAKE_SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX="..o" CMAKE_SHLIB_SUFFIX="..o"
DL_LIBS="" CMAKE_DL_LIBS=""
AC_CHECK_LIB(ld,printf, DL_LIBS="-lld") AC_CHECK_LIB(ld,printf, CMAKE_DL_LIBS="-lld")
CMAKE_SHLIB_LINK_FLAGS="" CMAKE_SHLIB_LINK_FLAGS=""
;; ;;
HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*) HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
SHLIB_CFLAGS="+z" CMAKE_SHLIB_CFLAGS="+z"
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".sl" CMAKE_SHLIB_SUFFIX=".sl"
DL_LIBS="-ldld" CMAKE_DL_LIBS="-ldld"
CMAKE_SHLIB_BUILD_FLAGS='+Z -Wl,-E -Wl,-b' CMAKE_SHLIB_BUILD_FLAGS='+Z -Wl,-E -Wl,-b'
CMAKE_SHLIB_LINK_FLAGS='-Wl,+s -Wl,+b,${LIB_RUNTIME_DIR}' CMAKE_SHLIB_LINK_FLAGS='-Wl,+s -Wl,+b,${LIB_RUNTIME_DIR}'
if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
@ -159,139 +129,139 @@ case $system in
fi fi
;; ;;
IRIX-5.*) IRIX-5.*)
SHLIB_CFLAGS="" CMAKE_SHLIB_CFLAGS=""
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" CMAKE_SHLIB_SUFFIX=".so"
DL_LIBS="" CMAKE_DL_LIBS=""
CMAKE_SHLIB_BUILD_FLAGS="-shared -rdata_shared" CMAKE_SHLIB_BUILD_FLAGS="-shared -rdata_shared"
;; ;;
IRIX-6* | IRIX64-6* | IRIX-64-6*) IRIX-6* | IRIX64-6* | IRIX-64-6*)
SHLIB_CFLAGS="" CMAKE_SHLIB_CFLAGS=""
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" CMAKE_SHLIB_SUFFIX=".so"
DL_LIBS="" CMAKE_DL_LIBS=""
CMAKE_SHLIB_BUILD_FLAGS="-shared -rdata_shared" CMAKE_SHLIB_BUILD_FLAGS="-shared -rdata_shared"
;; ;;
Linux*) Linux*)
SHLIB_CFLAGS="-fPIC" CMAKE_SHLIB_CFLAGS="-fPIC"
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" CMAKE_SHLIB_SUFFIX=".so"
CMAKE_SHLIB_BUILD_FLAGS="-shared" CMAKE_SHLIB_BUILD_FLAGS="-shared"
if test "$have_dl" = yes; then if test "$have_dl" = yes; then
DL_LIBS="-ldl" CMAKE_DL_LIBS="-ldl"
CMAKE_SHLIB_LINK_FLAGS="-rdynamic" CMAKE_SHLIB_LINK_FLAGS="-rdynamic"
else else
AC_CHECK_HEADER(dld.h, [ AC_CHECK_HEADER(dld.h, [
DL_LIBS="-ldld" CMAKE_DL_LIBS="-ldld"
CMAKE_SHLIB_LINK_FLAGS=""]) CMAKE_SHLIB_LINK_FLAGS=""])
fi fi
;; ;;
CYGWIN_NT*) CYGWIN_NT*)
SHLIB_CFLAGS="" CMAKE_SHLIB_CFLAGS=""
DL_LIBS="-lgdi32" CMAKE_DL_LIBS="-lgdi32"
SHLIB_SUFFIX=".dll" CMAKE_SHLIB_SUFFIX=".dll"
CMAKE_SHLIB_LINK_FLAGS="-shared" CMAKE_SHLIB_LINK_FLAGS="-shared"
;; ;;
MP-RAS-02*) MP-RAS-02*)
SHLIB_CFLAGS="-K PIC" CMAKE_SHLIB_CFLAGS="-K PIC"
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" CMAKE_SHLIB_SUFFIX=".so"
DL_LIBS="-ldl" CMAKE_DL_LIBS="-ldl"
CMAKE_SHLIB_LINK_FLAGS="" CMAKE_SHLIB_LINK_FLAGS=""
;; ;;
MP-RAS-*) MP-RAS-*)
SHLIB_CFLAGS="-K PIC" CMAKE_SHLIB_CFLAGS="-K PIC"
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" CMAKE_SHLIB_SUFFIX=".so"
DL_LIBS="-ldl" CMAKE_DL_LIBS="-ldl"
CMAKE_SHLIB_LINK_FLAGS="-Wl,-Bexport" CMAKE_SHLIB_LINK_FLAGS="-Wl,-Bexport"
;; ;;
NetBSD-*|FreeBSD-*) NetBSD-*|FreeBSD-*)
# Not available on all versions: check for include file. # Not available on all versions: check for include file.
if test -f /usr/include/dlfcn.h; then if test -f /usr/include/dlfcn.h; then
SHLIB_CFLAGS="-fpic" CMAKE_SHLIB_CFLAGS="-fpic"
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" CMAKE_SHLIB_SUFFIX=".so"
DL_LIBS="" CMAKE_DL_LIBS=""
CMAKE_SHLIB_LINK_FLAGS="-shared" CMAKE_SHLIB_LINK_FLAGS="-shared"
else else
SHLIB_CFLAGS="" CMAKE_SHLIB_CFLAGS=""
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX="..o" CMAKE_SHLIB_SUFFIX="..o"
DL_LIBS="" CMAKE_DL_LIBS=""
CMAKE_SHLIB_LINK_FLAGS="" CMAKE_SHLIB_LINK_FLAGS=""
fi fi
;; ;;
NEXTSTEP-*) NEXTSTEP-*)
SHLIB_CFLAGS="" CMAKE_SHLIB_CFLAGS=""
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" CMAKE_SHLIB_SUFFIX=".so"
DL_LIBS="" CMAKE_DL_LIBS=""
CMAKE_SHLIB_LINK_FLAGS="" CMAKE_SHLIB_LINK_FLAGS=""
;; ;;
OSF1-1.[012]) OSF1-1.[012])
# OSF/1 1.[012] from OSF, and derivatives, including Paragon OSF/1 # OSF/1 1.[012] from OSF, and derivatives, including Paragon OSF/1
SHLIB_CFLAGS="" CMAKE_SHLIB_CFLAGS=""
# Hack: make package name same as library name # Hack: make package name same as library name
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" CMAKE_SHLIB_SUFFIX=".so"
DL_LIBS="" CMAKE_DL_LIBS=""
CMAKE_SHLIB_LINK_FLAGS="" CMAKE_SHLIB_LINK_FLAGS=""
;; ;;
OSF1-1.*) OSF1-1.*)
# OSF/1 1.3 from OSF using ELF, and derivatives, including AD2 # OSF/1 1.3 from OSF using ELF, and derivatives, including AD2
SHLIB_CFLAGS="-fpic" CMAKE_SHLIB_CFLAGS="-fpic"
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" CMAKE_SHLIB_SUFFIX=".so"
DL_LIBS="" CMAKE_DL_LIBS=""
CMAKE_SHLIB_LINK_FLAGS="" CMAKE_SHLIB_LINK_FLAGS=""
;; ;;
OSF1-V*) OSF1-V*)
# Digital OSF/1 # Digital OSF/1
SHLIB_CFLAGS="" CMAKE_SHLIB_CFLAGS=""
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" CMAKE_SHLIB_SUFFIX=".so"
DL_LIBS="" CMAKE_DL_LIBS=""
CMAKE_SHLIB_BUILD_FLAGS='-shared -Wl,-expect_unresolved,"*"' CMAKE_SHLIB_BUILD_FLAGS='-shared -Wl,-expect_unresolved,"*"'
CMAKE_SHLIB_LINK_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' CMAKE_SHLIB_LINK_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
;; ;;
RISCos-*) RISCos-*)
SHLIB_CFLAGS="-G 0" CMAKE_SHLIB_CFLAGS="-G 0"
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX="..o" CMAKE_SHLIB_SUFFIX="..o"
DL_LIBS="" CMAKE_DL_LIBS=""
CMAKE_SHLIB_LINK_FLAGS="-Wl,-D,08000000" CMAKE_SHLIB_LINK_FLAGS="-Wl,-D,08000000"
;; ;;
SCO_SV-3.2*) SCO_SV-3.2*)
# Note, dlopen is available only on SCO 3.2.5 and greater. However, # Note, dlopen is available only on SCO 3.2.5 and greater. However,
# this test works, since "uname -s" was non-standard in 3.2.4 and # this test works, since "uname -s" was non-standard in 3.2.4 and
# below. # below.
SHLIB_CFLAGS="-Kpic -belf" CMAKE_SHLIB_CFLAGS="-Kpic -belf"
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" CMAKE_SHLIB_SUFFIX=".so"
DL_LIBS="" CMAKE_DL_LIBS=""
CMAKE_SHLIB_LINK_FLAGS="-belf -Wl,-Bexport" CMAKE_SHLIB_LINK_FLAGS="-belf -Wl,-Bexport"
;; ;;
SINIX*5.4*) SINIX*5.4*)
SHLIB_CFLAGS="-K PIC" CMAKE_SHLIB_CFLAGS="-K PIC"
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" CMAKE_SHLIB_SUFFIX=".so"
DL_LIBS="-ldl" CMAKE_DL_LIBS="-ldl"
CMAKE_SHLIB_LINK_FLAGS="" CMAKE_SHLIB_LINK_FLAGS=""
;; ;;
SunOS-4*) SunOS-4*)
SHLIB_CFLAGS="-PIC" CMAKE_SHLIB_CFLAGS="-PIC"
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" CMAKE_SHLIB_SUFFIX=".so"
DL_LIBS="-ldl" CMAKE_DL_LIBS="-ldl"
CMAKE_SHLIB_BUILD_FLAGS='-shared -Wl,-r -nostdlib' CMAKE_SHLIB_BUILD_FLAGS='-shared -Wl,-r -nostdlib'
CMAKE_SHLIB_LINK_FLAGS='-Wl,-L${LIB_RUNTIME_DIR}' CMAKE_SHLIB_LINK_FLAGS='-Wl,-L${LIB_RUNTIME_DIR}'
;; ;;
SunOS-5*) SunOS-5*)
SHLIB_CFLAGS="-KPIC" CMAKE_SHLIB_CFLAGS="-KPIC"
SHLIB_LD_LIBS='${LIBS}' CMAKE_SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so" CMAKE_SHLIB_SUFFIX=".so"
DL_LIBS="-ldl" CMAKE_DL_LIBS="-ldl"
CMAKE_SHLIB_BUILD_FLAGS='-G' CMAKE_SHLIB_BUILD_FLAGS='-G'
CMAKE_SHLIB_LINK_FLAGS='-R ${LIB_RUNTIME_DIR}' CMAKE_SHLIB_LINK_FLAGS='-R ${LIB_RUNTIME_DIR}'
if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
@ -300,88 +270,56 @@ case $system in
fi fi
;; ;;
ULTRIX-4.*) ULTRIX-4.*)
SHLIB_CFLAGS="-G 0" CMAKE_SHLIB_CFLAGS="-G 0"
SHLIB_SUFFIX="..o" CMAKE_SHLIB_SUFFIX="..o"
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
DL_LIBS="" CMAKE_DL_LIBS=""
CMAKE_SHLIB_LINK_FLAGS="-Wl,-D,08000000" CMAKE_SHLIB_LINK_FLAGS="-Wl,-D,08000000"
;; ;;
UNIX_SV*) UNIX_SV*)
SHLIB_CFLAGS="-K PIC" CMAKE_SHLIB_CFLAGS="-K PIC"
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" CMAKE_SHLIB_SUFFIX=".so"
DL_LIBS="-ldl" CMAKE_DL_LIBS="-ldl"
CMAKE_SHLIB_LINK_FLAGS="-Wl,-Bexport" CMAKE_SHLIB_LINK_FLAGS="-Wl,-Bexport"
;; ;;
esac esac
export SHLIB_SUFFIX export CMAKE_SHLIB_SUFFIX
# If we're running gcc, then change the C flags for compiling shared # If we're running gcc, then change the C flags for compiling shared
# libraries to the right flags for gcc, instead of those for the # libraries to the right flags for gcc, instead of those for the
# standard manufacturer compiler. # standard manufacturer compiler.
if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
SHLIB_CFLAGS="-fPIC" CMAKE_SHLIB_CFLAGS="-fPIC"
fi fi
# if running on cygwin remove -fPIC flag # if running on cygwin remove -fPIC flag
case $system in case $system in
CYGWIN_NT*) CYGWIN_NT*)
SHLIB_CFLAGS="" CMAKE_SHLIB_CFLAGS=""
;; ;;
esac esac
if test "$CMAKE_shared_ok" = "yes"; then if test "$CMAKE_shared_ok" = "yes"; then
CMAKE_SHLIB_CFLAGS="${SHLIB_CFLAGS}" CMAKE_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
CMAKE_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}" CMAKE_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
CMAKE_TCL_SHLIB_TARGET="CMAKEtcl"
RANLIB=":" RANLIB=":"
TOOLKIT_DEPENDS="" TOOLKIT_DEPENDS=""
CMAKE_LIB_EXT="${SHLIB_SUFFIX}" CMAKE_LIB_EXT="${CMAKE_SHLIB_SUFFIX}"
else else
CMAKE_LIB_EXT=".a" CMAKE_LIB_EXT=".a"
SHLIB_LD_LIBS="" CMAKE_SHLIB_LD_LIBS=""
CMAKE_SHLIB_CFLAGS="" CMAKE_SHLIB_CFLAGS=""
CMAKE_LD_SEARCH_FLAGS="" CMAKE_LD_SEARCH_FLAGS=""
fi fi
export CMAKE_LIB_EXT export CMAKE_LIB_EXT
AC_SUBST(CMAKE_TCL_SHLIB_TARGET)
AC_SUBST(TOOLKIT_DEPENDS)
AC_SUBST(CMAKE_SHLIB_LINK_FLAGS) AC_SUBST(CMAKE_SHLIB_LINK_FLAGS)
AC_SUBST(CMAKE_SHLIB_BUILD_FLAGS) AC_SUBST(CMAKE_SHLIB_BUILD_FLAGS)
AC_SUBST(CMAKE_SHLIB_CFLAGS) AC_SUBST(CMAKE_SHLIB_CFLAGS)
AC_SUBST(CMAKE_LIB_EXT) AC_SUBST(CMAKE_LIB_EXT)
AC_SUBST(DL_LIBS) AC_SUBST(CMAKE_DL_LIBS)
AC_SUBST(SHLIB_LD_LIBS) AC_SUBST(CMAKE_SHLIB_LD_LIBS)
AC_SUBST(SHLIB_SUFFIX) AC_SUBST(CMAKE_SHLIB_SUFFIX)
#--------------------------------------------------------------------
# Include sys/select.h if it exists and if it supplies things
# that appear to be useful and aren't already in sys/types.h.
# This appears to be true only on the RS/6000 under AIX. Some
# systems like OSF/1 have a sys/select.h that's of no use, and
# other systems like SCO UNIX have a sys/select.h that's
# pernicious. If "fd_set" isn't defined anywhere then set a
# special flag.
#--------------------------------------------------------------------
AC_MSG_CHECKING([fd_set and sys/select])
AC_TRY_COMPILE([#include <sys/types.h>],
[fd_set readMask, writeMask;], tk_ok=yes, tk_ok=no)
if test $tk_ok = no; then
AC_HEADER_EGREP(fd_mask, sys/select.h, tk_ok=yes)
if test $tk_ok = yes; then
AC_DEFINE(HAVE_SYS_SELECT_H)
fi
fi
AC_MSG_RESULT($tk_ok)
if test $tk_ok = no; then
AC_DEFINE(NO_FD_SET)
fi
########################## ##########################
@ -468,8 +406,7 @@ fi
AC_SUBST(CMAKE_USE_SPROC) AC_SUBST(CMAKE_USE_SPROC)
AC_SUBST(CMAKE_USE_PTHREADS) AC_SUBST(CMAKE_USE_PTHREADS)
AC_SUBST(CMAKE_HP_PTHREADS) AC_SUBST(CMAKE_HP_PTHREADS)
AC_SUBST(CMAKE_THREAD_LIBS)
AC_SUBST(THREAD_LIBS)
@ -489,7 +426,7 @@ case $system in
;; ;;
esac esac
fi fi
AC_SUBST(ANSI_CFLAGS) AC_SUBST(CMAKE_ANSI_CFLAGS)
# if we are not running g++ then we might need some other flags # if we are not running g++ then we might need some other flags
# to get the templates compiled correctly # to get the templates compiled correctly
@ -564,8 +501,6 @@ else
touch CMakeLocal.make touch CMakeLocal.make
fi fi
AC_SUBST(EXTRA_GCC_FLAG)
# find make to use to build cmake, prefer gmake # find make to use to build cmake, prefer gmake
AC_PATH_PROGS(RUNMAKE, gmake make) AC_PATH_PROGS(RUNMAKE, gmake make)