projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r7938: more amd64 fixes
[ctsim.git]
/
configure
diff --git
a/configure
b/configure
index fc903ac365fc309e98482658ae1dc2b4287aa8c4..8390af63a39c5c965828e4625844b25b6ea3983f 100755
(executable)
--- a/
configure
+++ b/
configure
@@
-308,7
+308,7
@@
ac_includes_default="\
# include <unistd.h>
#endif"
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE wxconfig build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPP EGREP INCLUDED_GETOPT_LONG_TRUE INCLUDED_GETOPT_LONG_FALSE DEBUG_TRUE DEBUG_FALSE lamdir mpienable cgibindir cgibinurl webdatadir webdataurl htmldir cgiprograms htmldata USE_HTML_TRUE USE_HTML_FALSE webenabled USE_LAM_TRUE USE_LAM_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_TOOLKIT_LIBS X_BASIC_LIBS NO_X_TRUE NO_X_FALSE my_includes HAVE_SGP_TRUE HAVE_SGP_FALSE
HAVE_WXWINDOWS_TRUE HAVE_WXWINDOWS_FALSE wxcflags wxlibs
ctlibs lamprograms lamdefs LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE wxconfig build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPP EGREP INCLUDED_GETOPT_LONG_TRUE INCLUDED_GETOPT_LONG_FALSE DEBUG_TRUE DEBUG_FALSE lamdir mpienable cgibindir cgibinurl webdatadir webdataurl htmldir cgiprograms htmldata USE_HTML_TRUE USE_HTML_FALSE webenabled USE_LAM_TRUE USE_LAM_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_TOOLKIT_LIBS X_BASIC_LIBS NO_X_TRUE NO_X_FALSE my_includes HAVE_SGP_TRUE HAVE_SGP_FALSE
wxcflags wxlibs HAVE_WXWINDOWS_TRUE HAVE_WXWINDOWS_FALSE
ctlibs lamprograms lamdefs LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
ac_subst_files=''
# Initialize some variables set by options.
@@
-1600,7
+1600,7
@@
fi
# Define the identity of the package.
PACKAGE=ctsim
# Define the identity of the package.
PACKAGE=ctsim
- VERSION=4.2.
6
+ VERSION=4.2.
8
cat >>confdefs.h <<_ACEOF
cat >>confdefs.h <<_ACEOF
@@
-6524,7
+6524,7
@@
if test "${ac_cv_lib_GL_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGL -L/usr/X11R6/lib -lXt -lXext $LIBS"
+LIBS="-lGL -L/usr/X11R6/lib -
L/usr/X11R6/lib64 -
lXt -lXext $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@
-8076,7
+8076,7
@@
_ACEOF
fi
fi
-if test
$GETOPTLONG==1
; then
+if test
"$GETOPTLONG"="1"
; then
INCLUDED_GETOPT_LONG_TRUE=
INCLUDED_GETOPT_LONG_FALSE='#'
else
INCLUDED_GETOPT_LONG_TRUE=
INCLUDED_GETOPT_LONG_FALSE='#'
else
@@
-9718,7
+9718,7
@@
cat >>confdefs.h <<\_ACEOF
#define HAVE_X11 1
_ACEOF
#define HAVE_X11 1
_ACEOF
- LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib"
+ LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib
-L/usr/X11R6/lib64
"
my_includes="$my_includes -I/usr/X11R6/include"
ctlib_graphics="$ctlibs_base -lctgraphics"
echo "$as_me:$LINENO: result: yes" >&5
my_includes="$my_includes -I/usr/X11R6/include"
ctlib_graphics="$ctlibs_base -lctgraphics"
echo "$as_me:$LINENO: result: yes" >&5
@@
-9741,9
+9741,15
@@
cat >>confdefs.h <<\_ACEOF
#define HAVE_SGP 1
_ACEOF
#define HAVE_SGP 1
_ACEOF
+ fi
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
-if test
1==1
; then
+if test
"$wxwin" = "true"
; then
HAVE_SGP_TRUE=
HAVE_SGP_FALSE='#'
else
HAVE_SGP_TRUE=
HAVE_SGP_FALSE='#'
else
@@
-9751,11
+9757,6
@@
else
HAVE_SGP_FALSE=
fi
HAVE_SGP_FALSE=
fi
- fi
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
if test "$png" = "true" ; then
ctlibs_tools="$ctlibs_tools -lpng"
if test "$png" = "true" ; then
ctlibs_tools="$ctlibs_tools -lpng"
@@
-9956,9
+9957,12
@@
if test "$wxwin" = "true" ; then
fi
CFLAGS="$CFLAGS -I../include $wxcflags"
ctlib_graphics="$ctlib_graphics $wxlibs"
fi
CFLAGS="$CFLAGS -I../include $wxcflags"
ctlib_graphics="$ctlib_graphics $wxlibs"
+fi
+
+
-if test
1==1
; then
+if test
"$wxwin"="true"
; then
HAVE_WXWINDOWS_TRUE=
HAVE_WXWINDOWS_FALSE='#'
else
HAVE_WXWINDOWS_TRUE=
HAVE_WXWINDOWS_FALSE='#'
else
@@
-9966,9
+9970,6
@@
else
HAVE_WXWINDOWS_FALSE=
fi
HAVE_WXWINDOWS_FALSE=
fi
-fi
-
-
LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim"
ctlibs="$ctlibs_base -lctsim $ctlib_graphics -lctsupport $ctlibs_tools"
LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim"
ctlibs="$ctlibs_base -lctsim $ctlib_graphics -lctsupport $ctlibs_tools"
@@
-10787,10
+10788,10
@@
s,@NO_X_FALSE@,$NO_X_FALSE,;t t
s,@my_includes@,$my_includes,;t t
s,@HAVE_SGP_TRUE@,$HAVE_SGP_TRUE,;t t
s,@HAVE_SGP_FALSE@,$HAVE_SGP_FALSE,;t t
s,@my_includes@,$my_includes,;t t
s,@HAVE_SGP_TRUE@,$HAVE_SGP_TRUE,;t t
s,@HAVE_SGP_FALSE@,$HAVE_SGP_FALSE,;t t
-s,@HAVE_WXWINDOWS_TRUE@,$HAVE_WXWINDOWS_TRUE,;t t
-s,@HAVE_WXWINDOWS_FALSE@,$HAVE_WXWINDOWS_FALSE,;t t
s,@wxcflags@,$wxcflags,;t t
s,@wxlibs@,$wxlibs,;t t
s,@wxcflags@,$wxcflags,;t t
s,@wxlibs@,$wxlibs,;t t
+s,@HAVE_WXWINDOWS_TRUE@,$HAVE_WXWINDOWS_TRUE,;t t
+s,@HAVE_WXWINDOWS_FALSE@,$HAVE_WXWINDOWS_FALSE,;t t
s,@ctlibs@,$ctlibs,;t t
s,@lamprograms@,$lamprograms,;t t
s,@lamdefs@,$lamdefs,;t t
s,@ctlibs@,$ctlibs,;t t
s,@lamprograms@,$lamprograms,;t t
s,@lamdefs@,$lamdefs,;t t