diff --git a/autogen.sh b/autogen.sh index 96c67178..ae2800fc 100755 --- a/autogen.sh +++ b/autogen.sh @@ -16,31 +16,29 @@ if [ $AUTO_MAKE_VERSION -ge 14 ]; then fi fi echo "Running aclocal $ACLOCAL_OPTS" -aclocal $ACLOCAL_OPTS 2> autogen.err +aclocal $ACLOCAL_OPTS echo "Running autoheader" -autoheader 2>> autogen.err +autoheader if [ ! -e simgear/simgear_config.h.in ]; then echo "ERROR: autoheader didn't create simgear/simgear_config.h.in!" - echo "Aborting ... consulte autogen.err for details." exit 1 fi echo -n "Running automake" if [ $OSTYPE = "IRIX" -o $OSTYPE = "IRIX64" ]; then echo " --add-missing --include-deps" - automake --add-missing --include-deps 2>> autogen.err + automake --add-missing --include-deps else echo " --add-missing" - automake --add-missing 2>> autogen.err + automake --add-missing fi echo "Running autoconf" -autoconf 2>> autogen.err +autoconf if [ ! -e configure ]; then echo "ERROR: configure was not created!" - echo "Aborting ... consulte autogen.err for details." exit 1 fi @@ -66,5 +64,3 @@ fi echo "Now you are ready to run './configure'" echo "======================================" - -rm -f autogen.err diff --git a/configure.in b/configure.in index aa443d51..9cc86b96 100644 --- a/configure.in +++ b/configure.in @@ -192,8 +192,8 @@ elif test "x$ac_cv_header_windows_h" != "xyes" ; then if test "x$ac_cv_lib_MesaGL_glNewList" = "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 ) + AC_DEFINE(XMESA) + AC_DEFINE(FX) fi fi @@ -309,7 +309,7 @@ AC_CHECK_HEADERS( \ sys/stat.h sys/time.h sys/timeb.h unistd.h windows.h winbase.h values.h ) if test "x$ac_cv_header_stdint_h" = "xyes"; then - AC_DEFINE( HAVE_STDINT_H ) + AC_DEFINE(HAVE_STDINT_H) fi dnl Checks for typedefs, structures, and compiler characteristics.