Added src-libs subdirectory for keeping source code to extra libs. These

[simgear.git] / configure.in

diff --git a/configure.in b/configure.in
index e857a2fb287c1db019311fdc7d1578955b3a81b5..94e04ef7621fda14be1691439d8b128f2f7ebffd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,8 +5,11 @@ dnl $Id$
 
 AC_INIT(simgear/bucket/newbucket.cxx)
 
 
 AC_INIT(simgear/bucket/newbucket.cxx)
 

+# Require at least automake 2.13
+AC_PREREQ(2.13)
+

 dnl Initialize the automake stuff
 dnl Initialize the automake stuff

-AM_INIT_AUTOMAKE(SimGear, 0.0.17)
+AM_INIT_AUTOMAKE(SimGear, 0.0.18pre1)

 
 dnl Specify KAI C++ compiler and flags.
 dnl Borrowed with slight modification from blitz distribution.
 
 dnl Specify KAI C++ compiler and flags.
 dnl Borrowed with slight modification from blitz distribution.


@@ -103,8 +106,8 @@ AC_EGREP_CPP(yes,
  #endif
 ],is_mingw=yes, is_mingw=no)
 
  #endif
 ],is_mingw=yes, is_mingw=no)
 

-echo "IS_MINGW = "$is_mingw
-AM_CONDITIONAL(IS_MINGW, test $is_mingw="yes")
+echo "IS_MINGW = $is_mingw"
+AM_CONDITIONAL(IS_MINGW, test "x$is_mingw" = "xyes")

 
 AC_EGREP_CPP(yes,
 [#ifdef __CYGWIN__
 
 AC_EGREP_CPP(yes,
 [#ifdef __CYGWIN__


@@ -112,8 +115,8 @@ AC_EGREP_CPP(yes,
  #endif
 ],is_cygwin=yes, is_cygwin=no)
 
  #endif
 ],is_cygwin=yes, is_cygwin=no)
 

-echo "IS_CYGWIN = "$is_cygwin
-AM_CONDITIONAL(IS_CYGWIN, test $is_cygwin="yes")
+echo "IS_CYGWIN = $is_cygwin"
+AM_CONDITIONAL(IS_CYGWIN, test "x$is_cygwin" = "xyes")

 
 if test "x$HOSTTYPE" != "xmacintosh" -a "x$is_mingw" != "xyes"; then
     dnl extra library and include directories
 
 if test "x$HOSTTYPE" != "xmacintosh" -a "x$is_mingw" != "xyes"; then
     dnl extra library and include directories


@@ -195,8 +198,8 @@ elif test "x$ac_cv_header_windows_h" != "xyes" ; then
 
     dnl if using mesa, check for xmesa.h
     if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then
 
     dnl if using mesa, check for xmesa.h
     if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then

-       AC_CHECK_HEADER(GL/xmesa.h)
-       if test "x$ac_cv_header_GL_xmesa_h" = "xyes"; then
+       AC_CHECK_HEADER(GL/fxmesa.h)
+       if test "x$ac_cv_header_GL_fxmesa_h" = "xyes"; then

            AC_DEFINE( XMESA )
             AC_DEFINE( FX )
         fi
            AC_DEFINE( XMESA )
             AC_DEFINE( FX )
         fi


@@ -289,6 +292,7 @@ fi
 dnl Check for system installed metakit
 AC_CHECK_HEADER(mk4.h)
 if test "x$ac_cv_header_mk4_h" != "xyes"; then
 dnl Check for system installed metakit
 AC_CHECK_HEADER(mk4.h)
 if test "x$ac_cv_header_mk4_h" != "xyes"; then

+    echo 

     echo "Metakit not found, you will need to install this first."
     echo "Please read the README.metakit for more information."
     exit
     echo "Metakit not found, you will need to install this first."
     echo "Please read the README.metakit for more information."
     exit


@@ -300,11 +304,24 @@ dnl Specify if we want logging (testing build) or not (release build)
 dnl Check for system installed zlib
 AC_CHECK_HEADER(zlib.h)
 if test "x$ac_cv_header_zlib_h" != "xyes"; then
 dnl Check for system installed zlib
 AC_CHECK_HEADER(zlib.h)
 if test "x$ac_cv_header_zlib_h" != "xyes"; then

+    echo 

     echo "zlib not found, you will need to install this first."
     echo "Please read the README.zlib for more information."
     exit
 fi
 
     echo "zlib not found, you will need to install this first."
     echo "Please read the README.zlib for more information."
     exit
 fi
 

+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+dnl Check for installed boost headers
+AC_CHECK_HEADER(boost/config.hpp)
+if test "x$ac_cv_header_boost_config_hpp" != "xyes"; then
+    echo 
+    echo "Boost not found, you will need to install this first."
+    echo "Please read the README.boost for more information."
+    exit
+fi
+AC_LANG_RESTORE
+

 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS( \
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS( \


@@ -332,6 +349,7 @@ AM_CONFIG_HEADER(simgear/simgear_config.h)
 AC_OUTPUT( \
        Makefile \
        SimGear.spec \
 AC_OUTPUT( \
        Makefile \
        SimGear.spec \

+       src-libs/Makefile \

        simgear/Makefile \
        simgear/version.h \
        simgear/bucket/Makefile \
        simgear/Makefile \
        simgear/version.h \
        simgear/bucket/Makefile \