1
0
Fork 0

Remove the last traces of metakit (hopefully) :-)

This commit is contained in:
curt 2003-08-29 04:42:43 +00:00
parent 314c324556
commit ff2740f085
2 changed files with 1 additions and 57 deletions

View file

@ -110,14 +110,6 @@ if test "x$with_plib" != "x" ; then
EXTRA_DIRS="${EXTRA_DIRS} $with_plib"
fi
# specify the metakit location
AC_ARG_WITH(metakit, [ --with-metakit=PREFIX Specify the prefix path to metakit])
if test "x$with_metakit" != "x" ; then
echo "metakit prefix is $with_metakit"
EXTRA_DIRS="${EXTRA_DIRS} $with_metakit"
fi
dnl Used by JSBSim to conditionally compile in fgfs interface code
AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])
@ -395,54 +387,6 @@ if test "x$have_plib_psl" = "xyes"; then
[Define if plib version is new enough to provide "PSL"])
fi
dnl Check for MetaKit
AC_CHECK_HEADER(mk4.h)
if test "x$ac_cv_header_mk4_h" != "xyes"; then
echo
echo "MetaKit library not found."
echo
echo "If your OS does not provide an installable package for MetaKit"
echo "you will have to compile and install it first yourself. A copy"
echo "of metakit-$(VERSION).tar.gz is included with SimGear. You will"
echo "have to untar this source code, and follow it's included instructions"
echo "to compile and install on your system."
echo
echo "configure aborted."
exit
fi
AC_MSG_CHECKING([for metakit 2.4.3 or newer])
saved_LIBS="$LIBS"
LIBS="$saved_LIBS -lmk4"
AC_TRY_RUN([
#include <mk4.h>
#define MIN_MK4_VERSION 243
int main() {
int major, minor, micro;
if ( d4_MetaKitLibraryVersion < MIN_MK4_VERSION ) {
return -1;
}
return 0;
}
],
AC_MSG_RESULT(yes),
[AC_MSG_RESULT(wrong version);
AC_MSG_ERROR([
Install metakit 2.4.3 or later first.
Or, the compiler may not be finding your libmk4.so library.
Please check the config.log file for specific details of the
failure if you believe you have the correct metakit version.
Also, look up this issue in the FlightGear FAQ.])],
AC_MSG_RESULT(yes)
)
dnl Check for the presence of SimGear
AC_CHECK_HEADER(simgear/version.h)
if test "x$ac_cv_header_simgear_version_h" != "xyes"; then

View file

@ -107,7 +107,7 @@ fgfs_LDADD = \
-lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
$(network_LIBS) \
$(PSL_LIBS) \
-lmk4 -lz \
-lz \
$(opengl_LIBS) \
$(audio_LIBS)