Code reorganizations. Added a Lib/ directory for more general libraries.
This commit is contained in:
curt
parent
725877b751
commit
fc3910d194
6 changed files with 237 additions and 80 deletions
|
|
@ -1,4 +1,4 @@
|
|||
SUBDIRS = Simulator Tools
|
||||
SUBDIRS = Include Lib Simulator Tools
|
||||
|
||||
EXTRA_DIST = Makefile.extra README.Win32 README.autoconf README.running Thanks
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,10 @@ ROOT=fg-$(VERSION)
|
|||
|
||||
# clean up dependencies
|
||||
clean-deps:
|
||||
rm -rf .deps Src/.deps Src/*/.deps Src/*/*/.deps
|
||||
rm -rf .deps \
|
||||
Lib/.deps Simulator/.deps Tools/.deps \
|
||||
Lib/*/.deps Simulator/*/.deps Tools/*/.deps \
|
||||
Lib/*/*/.deps Simulator/*/*/.deps Tools/*/*/.deps
|
||||
|
||||
clean-libs:
|
||||
rm -rf .libs Src/.libs Src/*/.libs Src/*/*/.libs
|
||||
|
|
|
|||
|
|
@ -71,12 +71,12 @@ PACKAGE = @PACKAGE@
|
|||
RANLIB = @RANLIB@
|
||||
VERSION = @VERSION@
|
||||
|
||||
SUBDIRS = Simulator Tools
|
||||
SUBDIRS = Include Lib Simulator Tools
|
||||
|
||||
EXTRA_DIST = Makefile.extra README.Win32 README.autoconf README.running Thanks
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = ./Simulator/Include/config.h
|
||||
CONFIG_HEADER = ./Include/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
|
||||
Makefile.in NEWS aclocal.m4 config.guess config.sub configure \
|
||||
|
|
|
|||
4
Thanks
4
Thanks
|
|
@ -41,6 +41,10 @@ Didier Chauveau <chauveau@math.univ-mlv.fr>
|
|||
http://edcwww.cr.usgs.gov/landdaac/gtopo30/gtopo30.html
|
||||
|
||||
|
||||
Jeff Goeke-Smith <jgoeke@voyager.net>
|
||||
Contributed our first autopilot.
|
||||
|
||||
|
||||
Michael I. Gold <gold@puck.asd.sgi.com> -- Patiently answered my endless
|
||||
"newbie" OpenGL questions. His effort alone has made me a great SGI
|
||||
fan.
|
||||
|
|
|
|||
285
configure
vendored
285
configure
vendored
|
|
@ -703,7 +703,7 @@ fi
|
|||
|
||||
PACKAGE=FlightGear
|
||||
|
||||
VERSION=0.41
|
||||
VERSION=0.42
|
||||
|
||||
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
|
||||
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
|
||||
|
|
@ -1316,7 +1316,7 @@ echo "configure:1316: checking for ld used by GCC" >&5
|
|||
ac_prog=`($CC -print-prog-name=ld) 2>&5`
|
||||
case "$ac_prog" in
|
||||
# Accept absolute paths.
|
||||
/* | [A-Za-z]:\\*)
|
||||
/* | A-Za-z:\\*)
|
||||
test -z "$LD" && LD="$ac_prog"
|
||||
;;
|
||||
"")
|
||||
|
|
@ -2817,8 +2817,149 @@ else
|
|||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for IceOpenConnection in -lICE""... $ac_c" 1>&6
|
||||
echo "configure:2822: checking for IceOpenConnection in -lICE" >&5
|
||||
ac_lib_var=`echo ICE'_'IceOpenConnection | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lICE $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2830 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char IceOpenConnection();
|
||||
|
||||
int main() {
|
||||
IceOpenConnection()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ac_tr_lib=HAVE_LIB`echo ICE | sed -e 's/[^a-zA-Z0-9_]/_/g' \
|
||||
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
|
||||
cat >> confdefs.h <<EOF
|
||||
#define $ac_tr_lib 1
|
||||
EOF
|
||||
|
||||
LIBS="-lICE $LIBS"
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6
|
||||
echo "configure:2869: checking for SmcOpenConnection in -lSM" >&5
|
||||
ac_lib_var=`echo SM'_'SmcOpenConnection | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lSM $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2877 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char SmcOpenConnection();
|
||||
|
||||
int main() {
|
||||
SmcOpenConnection()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ac_tr_lib=HAVE_LIB`echo SM | sed -e 's/[^a-zA-Z0-9_]/_/g' \
|
||||
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
|
||||
cat >> confdefs.h <<EOF
|
||||
#define $ac_tr_lib 1
|
||||
EOF
|
||||
|
||||
LIBS="-lSM $LIBS"
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for XtMalloc in -lXt""... $ac_c" 1>&6
|
||||
echo "configure:2916: checking for XtMalloc in -lXt" >&5
|
||||
ac_lib_var=`echo Xt'_'XtMalloc | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXt $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2924 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char XtMalloc();
|
||||
|
||||
int main() {
|
||||
XtMalloc()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ac_tr_lib=HAVE_LIB`echo Xt | sed -e 's/[^a-zA-Z0-9_]/_/g' \
|
||||
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
|
||||
cat >> confdefs.h <<EOF
|
||||
#define $ac_tr_lib 1
|
||||
EOF
|
||||
|
||||
LIBS="-lXt $LIBS"
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for XmuLookupStandardColormap in -lXmu""... $ac_c" 1>&6
|
||||
echo "configure:2822: checking for XmuLookupStandardColormap in -lXmu" >&5
|
||||
echo "configure:2963: checking for XmuLookupStandardColormap in -lXmu" >&5
|
||||
ac_lib_var=`echo Xmu'_'XmuLookupStandardColormap | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2826,7 +2967,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXmu $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2830 "configure"
|
||||
#line 2971 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -2837,7 +2978,7 @@ int main() {
|
|||
XmuLookupStandardColormap()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -2866,7 +3007,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for glNewList in -lGLcore""... $ac_c" 1>&6
|
||||
echo "configure:2870: checking for glNewList in -lGLcore" >&5
|
||||
echo "configure:3011: checking for glNewList in -lGLcore" >&5
|
||||
ac_lib_var=`echo GLcore'_'glNewList | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2874,7 +3015,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lGLcore $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2878 "configure"
|
||||
#line 3019 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -2885,7 +3026,7 @@ int main() {
|
|||
glNewList()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -2914,7 +3055,7 @@ fi
|
|||
|
||||
if test "x$ac_cv_lib_GLcore_glNewList" = "xno" ; then
|
||||
echo $ac_n "checking for glNewList in -lGL""... $ac_c" 1>&6
|
||||
echo "configure:2918: checking for glNewList in -lGL" >&5
|
||||
echo "configure:3059: checking for glNewList in -lGL" >&5
|
||||
ac_lib_var=`echo GL'_'glNewList | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2922,7 +3063,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lGL $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2926 "configure"
|
||||
#line 3067 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -2933,7 +3074,7 @@ int main() {
|
|||
glNewList()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -2962,7 +3103,7 @@ fi
|
|||
|
||||
if test "x$ac_cv_lib_GL_glNewList" = "xno" ; then
|
||||
echo $ac_n "checking for glNewList in -lMesaGL""... $ac_c" 1>&6
|
||||
echo "configure:2966: checking for glNewList in -lMesaGL" >&5
|
||||
echo "configure:3107: checking for glNewList in -lMesaGL" >&5
|
||||
ac_lib_var=`echo MesaGL'_'glNewList | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2970,7 +3111,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lMesaGL $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2974 "configure"
|
||||
#line 3115 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -2981,7 +3122,7 @@ int main() {
|
|||
glNewList()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -3011,7 +3152,7 @@ fi
|
|||
fi
|
||||
else
|
||||
echo $ac_n "checking for glXCreateContext in -lGL""... $ac_c" 1>&6
|
||||
echo "configure:3015: checking for glXCreateContext in -lGL" >&5
|
||||
echo "configure:3156: checking for glXCreateContext in -lGL" >&5
|
||||
ac_lib_var=`echo GL'_'glXCreateContext | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3019,7 +3160,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lGL $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3023 "configure"
|
||||
#line 3164 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -3030,7 +3171,7 @@ int main() {
|
|||
glXCreateContext()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -3060,7 +3201,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for gluLookAt in -lGLU""... $ac_c" 1>&6
|
||||
echo "configure:3064: checking for gluLookAt in -lGLU" >&5
|
||||
echo "configure:3205: checking for gluLookAt in -lGLU" >&5
|
||||
ac_lib_var=`echo GLU'_'gluLookAt | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3068,7 +3209,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lGLU $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3072 "configure"
|
||||
#line 3213 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -3079,7 +3220,7 @@ int main() {
|
|||
gluLookAt()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -3108,7 +3249,7 @@ fi
|
|||
|
||||
if test "x$ac_cv_lib_GLU_gluLookAt" = "xno" ; then
|
||||
echo $ac_n "checking for gluLookAt in -lMesaGLU""... $ac_c" 1>&6
|
||||
echo "configure:3112: checking for gluLookAt in -lMesaGLU" >&5
|
||||
echo "configure:3253: checking for gluLookAt in -lMesaGLU" >&5
|
||||
ac_lib_var=`echo MesaGLU'_'gluLookAt | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3116,7 +3257,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lMesaGLU $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3120 "configure"
|
||||
#line 3261 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -3127,7 +3268,7 @@ int main() {
|
|||
gluLookAt()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -3157,7 +3298,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for glutGetModifiers in -lglut""... $ac_c" 1>&6
|
||||
echo "configure:3161: checking for glutGetModifiers in -lglut" >&5
|
||||
echo "configure:3302: checking for glutGetModifiers in -lglut" >&5
|
||||
ac_lib_var=`echo glut'_'glutGetModifiers | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3165,7 +3306,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lglut $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3169 "configure"
|
||||
#line 3310 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -3176,7 +3317,7 @@ int main() {
|
|||
glutGetModifiers()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -3238,12 +3379,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
|
||||
echo "configure:3242: checking for ANSI C header files" >&5
|
||||
echo "configure:3383: checking for ANSI C header files" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3247 "configure"
|
||||
#line 3388 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
|
|
@ -3251,7 +3392,7 @@ else
|
|||
#include <float.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:3255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:3396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -3268,7 +3409,7 @@ rm -f conftest*
|
|||
if test $ac_cv_header_stdc = yes; then
|
||||
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3272 "configure"
|
||||
#line 3413 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <string.h>
|
||||
EOF
|
||||
|
|
@ -3286,7 +3427,7 @@ fi
|
|||
if test $ac_cv_header_stdc = yes; then
|
||||
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3290 "configure"
|
||||
#line 3431 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
EOF
|
||||
|
|
@ -3307,7 +3448,7 @@ if test "$cross_compiling" = yes; then
|
|||
:
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3311 "configure"
|
||||
#line 3452 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <ctype.h>
|
||||
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
||||
|
|
@ -3318,7 +3459,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
|
|||
exit (0); }
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:3322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:3463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -3346,17 +3487,17 @@ for ac_hdr in fcntl.h getopt.h malloc.h stdlib.h sys/time.h sys/timeb.h \
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:3350: checking for $ac_hdr" >&5
|
||||
echo "configure:3491: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3355 "configure"
|
||||
#line 3496 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:3360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:3501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -3384,12 +3525,12 @@ done
|
|||
|
||||
|
||||
echo $ac_n "checking for working const""... $ac_c" 1>&6
|
||||
echo "configure:3388: checking for working const" >&5
|
||||
echo "configure:3529: checking for working const" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3393 "configure"
|
||||
#line 3534 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
|
@ -3438,7 +3579,7 @@ ccp = (char const *const *) p;
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:3583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_c_const=yes
|
||||
else
|
||||
|
|
@ -3459,12 +3600,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for size_t""... $ac_c" 1>&6
|
||||
echo "configure:3463: checking for size_t" >&5
|
||||
echo "configure:3604: checking for size_t" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3468 "configure"
|
||||
#line 3609 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#if STDC_HEADERS
|
||||
|
|
@ -3492,12 +3633,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
|
||||
echo "configure:3496: checking whether time.h and sys/time.h may both be included" >&5
|
||||
echo "configure:3637: checking whether time.h and sys/time.h may both be included" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3501 "configure"
|
||||
#line 3642 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
|
|
@ -3506,7 +3647,7 @@ int main() {
|
|||
struct tm *tp;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:3651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_header_time=yes
|
||||
else
|
||||
|
|
@ -3527,12 +3668,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
|
||||
echo "configure:3531: checking whether struct tm is in sys/time.h or time.h" >&5
|
||||
echo "configure:3672: checking whether struct tm is in sys/time.h or time.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3536 "configure"
|
||||
#line 3677 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <time.h>
|
||||
|
|
@ -3540,7 +3681,7 @@ int main() {
|
|||
struct tm *tp; tp->tm_sec;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:3685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_struct_tm=time.h
|
||||
else
|
||||
|
|
@ -3562,12 +3703,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
|
||||
echo "configure:3566: checking return type of signal handlers" >&5
|
||||
echo "configure:3707: checking return type of signal handlers" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3571 "configure"
|
||||
#line 3712 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <signal.h>
|
||||
|
|
@ -3584,7 +3725,7 @@ int main() {
|
|||
int i;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:3729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_type_signal=void
|
||||
else
|
||||
|
|
@ -3603,12 +3744,12 @@ EOF
|
|||
|
||||
|
||||
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
|
||||
echo "configure:3607: checking for vprintf" >&5
|
||||
echo "configure:3748: checking for vprintf" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3612 "configure"
|
||||
#line 3753 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char vprintf(); below. */
|
||||
|
|
@ -3631,7 +3772,7 @@ vprintf();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_vprintf=yes"
|
||||
else
|
||||
|
|
@ -3655,12 +3796,12 @@ fi
|
|||
|
||||
if test "$ac_cv_func_vprintf" != yes; then
|
||||
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
|
||||
echo "configure:3659: checking for _doprnt" >&5
|
||||
echo "configure:3800: checking for _doprnt" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3664 "configure"
|
||||
#line 3805 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char _doprnt(); below. */
|
||||
|
|
@ -3683,7 +3824,7 @@ _doprnt();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func__doprnt=yes"
|
||||
else
|
||||
|
|
@ -3711,12 +3852,12 @@ for ac_func in ftime gettimeofday mktime strstr rand random \
|
|||
setitimer getitimer signal GetLocalTime
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:3715: checking for $ac_func" >&5
|
||||
echo "configure:3856: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3720 "configure"
|
||||
#line 3861 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -3739,7 +3880,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:3884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
|
|
@ -3877,29 +4018,31 @@ ac_given_INSTALL="$INSTALL"
|
|||
|
||||
trap 'rm -fr `echo "\
|
||||
Makefile \
|
||||
Include/Makefile \
|
||||
Lib/Makefile \
|
||||
Lib/Bucket/Makefile \
|
||||
Lib/DEM/Makefile \
|
||||
Lib/XGL/Makefile \
|
||||
Simulator/Makefile \
|
||||
Simulator/Aircraft/Makefile \
|
||||
Simulator/Astro/Makefile \
|
||||
Simulator/Autopilot/Makefile \
|
||||
Simulator/Cockpit/Makefile \
|
||||
Simulator/Controls/Makefile \
|
||||
Simulator/Flight/LaRCsim/Makefile \
|
||||
Simulator/Flight/Slew/Makefile \
|
||||
Simulator/Flight/Makefile \
|
||||
Simulator/Include/Makefile \
|
||||
Simulator/Joystick/Makefile \
|
||||
Simulator/Main/Makefile \
|
||||
Simulator/Main/runfg \
|
||||
Simulator/Main/runfg.bat \
|
||||
Simulator/Makefile \
|
||||
Simulator/Math/Makefile \
|
||||
Simulator/Scenery/Bucket/Makefile \
|
||||
Simulator/Scenery/Makefile \
|
||||
Simulator/Time/Makefile \
|
||||
Simulator/Weather/Makefile \
|
||||
Simulator/XGL/Makefile \
|
||||
Tools/Makefile \
|
||||
Tools/AssemTris/Makefile \
|
||||
Tools/DEM/Makefile \
|
||||
Tools/Dem2node/Makefile \
|
||||
Tools/FixNode/Makefile \
|
||||
Tools/FixObj/Makefile \
|
||||
|
|
@ -3907,7 +4050,7 @@ trap 'rm -fr `echo "\
|
|||
Tools/Stripe_u/Makefile \
|
||||
Tools/Tri2obj/Makefile \
|
||||
Tools/Triangle/Makefile \
|
||||
Simulator/Include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
|
||||
Include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
|
||||
EOF
|
||||
cat >> $CONFIG_STATUS <<EOF
|
||||
|
||||
|
|
@ -4009,29 +4152,31 @@ cat >> $CONFIG_STATUS <<EOF
|
|||
|
||||
CONFIG_FILES=\${CONFIG_FILES-"\
|
||||
Makefile \
|
||||
Include/Makefile \
|
||||
Lib/Makefile \
|
||||
Lib/Bucket/Makefile \
|
||||
Lib/DEM/Makefile \
|
||||
Lib/XGL/Makefile \
|
||||
Simulator/Makefile \
|
||||
Simulator/Aircraft/Makefile \
|
||||
Simulator/Astro/Makefile \
|
||||
Simulator/Autopilot/Makefile \
|
||||
Simulator/Cockpit/Makefile \
|
||||
Simulator/Controls/Makefile \
|
||||
Simulator/Flight/LaRCsim/Makefile \
|
||||
Simulator/Flight/Slew/Makefile \
|
||||
Simulator/Flight/Makefile \
|
||||
Simulator/Include/Makefile \
|
||||
Simulator/Joystick/Makefile \
|
||||
Simulator/Main/Makefile \
|
||||
Simulator/Main/runfg \
|
||||
Simulator/Main/runfg.bat \
|
||||
Simulator/Makefile \
|
||||
Simulator/Math/Makefile \
|
||||
Simulator/Scenery/Bucket/Makefile \
|
||||
Simulator/Scenery/Makefile \
|
||||
Simulator/Time/Makefile \
|
||||
Simulator/Weather/Makefile \
|
||||
Simulator/XGL/Makefile \
|
||||
Tools/Makefile \
|
||||
Tools/AssemTris/Makefile \
|
||||
Tools/DEM/Makefile \
|
||||
Tools/Dem2node/Makefile \
|
||||
Tools/FixNode/Makefile \
|
||||
Tools/FixObj/Makefile \
|
||||
|
|
@ -4120,7 +4265,7 @@ ac_eD='%g'
|
|||
if test "${CONFIG_HEADERS+set}" != set; then
|
||||
EOF
|
||||
cat >> $CONFIG_STATUS <<EOF
|
||||
CONFIG_HEADERS="Simulator/Include/config.h"
|
||||
CONFIG_HEADERS="Include/config.h"
|
||||
EOF
|
||||
cat >> $CONFIG_STATUS <<\EOF
|
||||
fi
|
||||
|
|
@ -4211,7 +4356,7 @@ cat >> $CONFIG_STATUS <<EOF
|
|||
|
||||
EOF
|
||||
cat >> $CONFIG_STATUS <<\EOF
|
||||
test -z "$CONFIG_HEADERS" || echo timestamp > Simulator/Include/stamp-h
|
||||
test -z "$CONFIG_HEADERS" || echo timestamp > Include/stamp-h
|
||||
|
||||
exit 0
|
||||
EOF
|
||||
|
|
|
|||
17
configure.in
17
configure.in
|
|
@ -5,7 +5,7 @@ dnl
|
|||
AC_INIT(Simulator/Aircraft/aircraft.c)
|
||||
|
||||
dnl Initialize the automake stuff
|
||||
AM_INIT_AUTOMAKE(FlightGear, 0.41)
|
||||
AM_INIT_AUTOMAKE(FlightGear, 0.42)
|
||||
|
||||
dnl Checks for programs.
|
||||
|
||||
|
|
@ -42,6 +42,9 @@ AC_CHECK_LIB(socket, socket)
|
|||
AC_CHECK_LIB(X11, XCreateWindow)
|
||||
AC_CHECK_LIB(Xext, XShmCreateImage)
|
||||
AC_CHECK_LIB(Xi, XGetExtensionVersion)
|
||||
AC_CHECK_LIB(ICE, IceOpenConnection)
|
||||
AC_CHECK_LIB(SM, SmcOpenConnection)
|
||||
AC_CHECK_LIB(Xt, XtMalloc)
|
||||
AC_CHECK_LIB(Xmu, XmuLookupStandardColormap)
|
||||
|
||||
AC_CHECK_LIB(GLcore, glNewList)
|
||||
|
|
@ -122,33 +125,35 @@ if test "x$ac_cv_lib_glut_glutGetModifiers" = "xno"; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
AM_CONFIG_HEADER(Simulator/Include/config.h)
|
||||
AM_CONFIG_HEADER(Include/config.h)
|
||||
|
||||
AC_OUTPUT( \
|
||||
Makefile \
|
||||
Include/Makefile \
|
||||
Lib/Makefile \
|
||||
Lib/Bucket/Makefile \
|
||||
Lib/DEM/Makefile \
|
||||
Lib/XGL/Makefile \
|
||||
Simulator/Makefile \
|
||||
Simulator/Aircraft/Makefile \
|
||||
Simulator/Astro/Makefile \
|
||||
Simulator/Autopilot/Makefile \
|
||||
Simulator/Cockpit/Makefile \
|
||||
Simulator/Controls/Makefile \
|
||||
Simulator/Flight/LaRCsim/Makefile \
|
||||
Simulator/Flight/Slew/Makefile \
|
||||
Simulator/Flight/Makefile \
|
||||
Simulator/Include/Makefile \
|
||||
Simulator/Joystick/Makefile \
|
||||
Simulator/Main/Makefile \
|
||||
Simulator/Main/runfg \
|
||||
Simulator/Main/runfg.bat \
|
||||
Simulator/Makefile \
|
||||
Simulator/Math/Makefile \
|
||||
Simulator/Scenery/Bucket/Makefile \
|
||||
Simulator/Scenery/Makefile \
|
||||
Simulator/Time/Makefile \
|
||||
Simulator/Weather/Makefile \
|
||||
Simulator/XGL/Makefile \
|
||||
Tools/Makefile \
|
||||
Tools/AssemTris/Makefile \
|
||||
Tools/DEM/Makefile \
|
||||
Tools/Dem2node/Makefile \
|
||||
Tools/FixNode/Makefile \
|
||||
Tools/FixObj/Makefile \
|
||||
|
|
|
|||
Loading…
Reference in a new issue