From 8a189b67787e177d539bbcf630a55d76384bfb8c Mon Sep 17 00:00:00 2001 From: curt Date: Thu, 6 Jul 2000 12:31:18 +0000 Subject: [PATCH] ... --- aclocal.m4 | 21 +++++++++++++++------ simgear/config.h.in | 13 ++++++------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 78a4037e..df0bfb9e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,7 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4 +dnl aclocal.m4 generated automatically by aclocal 1.3 -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation +dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +dnl This Makefile.in is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -20,7 +20,7 @@ dnl Usage: dnl AM_INIT_AUTOMAKE(package,version, [no-define]) AC_DEFUN(AM_INIT_AUTOMAKE, -[AC_REQUIRE([AC_PROG_INSTALL]) +[AC_REQUIRE([AM_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] @@ -30,8 +30,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") +AC_DEFINE_UNQUOTED(VERSION, "$VERSION")) AC_REQUIRE([AM_SANITY_CHECK]) AC_REQUIRE([AC_ARG_PROGRAM]) dnl FIXME This is truly gross. @@ -43,6 +43,15 @@ AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) AC_REQUIRE([AC_PROG_MAKE_SET])]) + +# serial 1 + +AC_DEFUN(AM_PROG_INSTALL, +[AC_REQUIRE([AC_PROG_INSTALL]) +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +AC_SUBST(INSTALL_SCRIPT)dnl +]) + # # Check to make sure that the build environment is sane. # diff --git a/simgear/config.h.in b/simgear/config.h.in index 410fd7a8..425f8173 100644 --- a/simgear/config.h.in +++ b/simgear/config.h.in @@ -50,6 +50,9 @@ /* Define if you have zlib installed system wide. */ #undef HAVE_ZLIB +/* Define to package name */ +#undef PACKAGE + /* Define as the return type of signal handlers (int or void). */ #undef RETSIGTYPE @@ -65,6 +68,9 @@ /* Define if your declares struct tm. */ #undef TM_IN_SYS_TIME +/* Define to version number */ +#undef VERSION + /* Define if compiling on a Winbloze (95, NT, etc.) platform */ #undef WIN32 @@ -199,10 +205,3 @@ /* Define if you have the socket library (-lsocket). */ #undef HAVE_LIBSOCKET - -/* Name of package */ -#undef PACKAGE - -/* Version number of package */ -#undef VERSION - -- 2.39.5