Renamed "configure.in" to the officially preferred "configure.ac".

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@535 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/ChangeLog b/ChangeLog
index d7fa247..3ce0350 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -719,3 +719,6 @@ caught. This makes sense and is more compatible with GLUT.
 
 (190) Added eMbedded Visual Tools project/workspace files to
 distribution.
+
+(191) Renamed "configure.in" to the officially preferred
+"configure.ac".

diff --git a/INSTALL b/INSTALL
index 02a4a07..1966f09 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -19,8 +19,8 @@ diffs or instructions to the address given in the `README' so they can
 be considered for the next release.  If at some point `config.cache'
 contains results you don't want to keep, you may remove or edit it.
 
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
+   The file `configure.ac' is used to create `configure' by a program
+called `autoconf'.  You only need `configure.ac' if you want to change
 it or regenerate `configure' using a newer version of `autoconf'.
 
 The simplest way to compile this package is:

diff --git a/configure.ac b/configure.ac
new file mode 100644 (file)
index 0000000..e0b811f
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,74 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT(Makefile.am)
+
+AM_INIT_AUTOMAKE(freeglut,2.2.0)
+AM_CONFIG_HEADER(config.h)
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_C_CONST
+AC_EXEEXT
+AC_LIBTOOL_DLOPEN
+AM_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
+
+dnl Checks for libraries.
+AC_PATH_XTRA
+
+AC_CHECK_LIB(Xxf86vm,XF86VidModeSwitchToMode,
+       LIBXXF86VM=-lXxf86vm,LIBXXF86VM=,$X_LIBS -lXext -lX11)
+AC_SUBST(LIBXXF86VM)
+
+dnl Checks for header files.
+AC_STDC_HEADERS
+AC_HAVE_HEADERS( GL/gl.h GL/glu.h GL/glx.h )
+
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $X_CFLAGS"
+AC_CHECK_HEADERS(X11/extensions/xf86vmode.h,,,[#include <X11/Xlib.h>])
+CFLAGS="$save_CFLAGS"
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+
+dnl Checks for library functions.
+
+AC_CHECK_LIBM
+AC_SUBST(LIBM)
+
+dnl Build time configuration
+
+AC_ARG_ENABLE(replace-glut,
+[  --disable-replace-glut  Coexist with existing glut library])
+if test "x$enable_replace_glut" != xno
+then
+ LIBRARY=glut
+ HEADER=glut.h
+else
+ LIBRARY=freeglut
+ HEADER=
+fi
+AC_SUBST(LIBRARY)
+AC_SUBST(HEADER)
+
+AC_ARG_ENABLE(warnings,
+[  --enable-warnings       Enable gcc compiler warnings],
+if test "x$GCC" == xyes
+then
+ CFLAGS="$CFLAGS -Wall -Wno-parentheses -Werror"
+fi)
+
+AC_OUTPUT(\
+       Makefile \
+       doc/Makefile \
+       progs/Makefile \
+       progs/demos/Makefile \
+       progs/demos/CallbackMaker/Makefile \
+       progs/demos/Fractals/Makefile \
+       progs/demos/Fractals_random/Makefile \
+       progs/demos/Lorenz/Makefile \
+       progs/demos/One/Makefile \
+       progs/demos/shapes/Makefile \
+       src/Makefile \
+       include/Makefile \
+       include/GL/Makefile \
+       )

diff --git a/configure.in b/configure.in
deleted file mode 100644 (file)
index e0b811f..0000000
--- a/configure.in
+++ /dev/null
@@ -1,74 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(Makefile.am)
-
-AM_INIT_AUTOMAKE(freeglut,2.2.0)
-AM_CONFIG_HEADER(config.h)
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_C_CONST
-AC_EXEEXT
-AC_LIBTOOL_DLOPEN
-AM_PROG_LIBTOOL
-AC_SUBST(LIBTOOL_DEPS)
-
-dnl Checks for libraries.
-AC_PATH_XTRA
-
-AC_CHECK_LIB(Xxf86vm,XF86VidModeSwitchToMode,
-       LIBXXF86VM=-lXxf86vm,LIBXXF86VM=,$X_LIBS -lXext -lX11)
-AC_SUBST(LIBXXF86VM)
-
-dnl Checks for header files.
-AC_STDC_HEADERS
-AC_HAVE_HEADERS( GL/gl.h GL/glu.h GL/glx.h )
-
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $X_CFLAGS"
-AC_CHECK_HEADERS(X11/extensions/xf86vmode.h,,,[#include <X11/Xlib.h>])
-CFLAGS="$save_CFLAGS"
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-
-dnl Checks for library functions.
-
-AC_CHECK_LIBM
-AC_SUBST(LIBM)
-
-dnl Build time configuration
-
-AC_ARG_ENABLE(replace-glut,
-[  --disable-replace-glut  Coexist with existing glut library])
-if test "x$enable_replace_glut" != xno
-then
- LIBRARY=glut
- HEADER=glut.h
-else
- LIBRARY=freeglut
- HEADER=
-fi
-AC_SUBST(LIBRARY)
-AC_SUBST(HEADER)
-
-AC_ARG_ENABLE(warnings,
-[  --enable-warnings       Enable gcc compiler warnings],
-if test "x$GCC" == xyes
-then
- CFLAGS="$CFLAGS -Wall -Wno-parentheses -Werror"
-fi)
-
-AC_OUTPUT(\
-       Makefile \
-       doc/Makefile \
-       progs/Makefile \
-       progs/demos/Makefile \
-       progs/demos/CallbackMaker/Makefile \
-       progs/demos/Fractals/Makefile \
-       progs/demos/Fractals_random/Makefile \
-       progs/demos/Lorenz/Makefile \
-       progs/demos/One/Makefile \
-       progs/demos/shapes/Makefile \
-       src/Makefile \
-       include/Makefile \
-       include/GL/Makefile \
-       )