Modernized configure.ac a bit and added a rule to Makefile.am to
update libtool. Note that all gcc compiler warnings are now on by default. git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@538 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
spanne
parent
a38edbb898
commit
90652ea32b
@ -724,3 +724,7 @@ distribution.
|
||||
"configure.ac".
|
||||
|
||||
(192) Make "gcc -Wall -pedantic -Werror" happy.
|
||||
|
||||
(193) Modernized configure.ac a bit and added a rule to Makefile.am to
|
||||
update libtool. Note that all gcc compiler warnings are now on by
|
||||
default.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
## Process this file with automake to produce makefile.im
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
SUBDIRS = src include progs doc
|
||||
AUTOMAKE_OPTIONS = gnu
|
||||
@ -11,3 +11,5 @@ EXTRA_DIST = \
|
||||
freeglut_static.dsp \
|
||||
freeglut_evc4.vcp freeglut_evc4.vcw
|
||||
|
||||
libtool: $(LIBTOOL_DEPS)
|
||||
$(SHELL) ./config.status --recheck
|
||||
|
||||
@ -1,74 +1,72 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
AC_INIT(Makefile.am)
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
AM_INIT_AUTOMAKE(freeglut,2.2.0)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
AC_INIT([freeglut library], [2.2.0], [freeglut-bugs@lists.sourceforge.net], [freeglut])
|
||||
AM_INIT_AUTOMAKE
|
||||
AC_PREREQ([2.59])
|
||||
AC_CONFIG_SRCDIR([AUTHORS])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
dnl Checks for programs.
|
||||
# Checks for programs.
|
||||
AC_PROG_CC
|
||||
AC_C_CONST
|
||||
AC_EXEEXT
|
||||
AC_LIBTOOL_DLOPEN
|
||||
AM_PROG_LIBTOOL
|
||||
AC_SUBST(LIBTOOL_DEPS)
|
||||
AC_PROG_LIBTOOL
|
||||
AC_SUBST([LIBTOOL_DEPS])
|
||||
|
||||
dnl Checks for libraries.
|
||||
# Checks for libraries.
|
||||
AC_PATH_XTRA
|
||||
AC_CHECK_LIB([Xxf86vm], [XF86VidModeSwitchToMode],
|
||||
[LIBXXF86VM=-lXxf86vm], [LIBXXF86VM=],
|
||||
[$X_LIBS -lXext -lX11])
|
||||
AC_SUBST([LIBXXF86VM])
|
||||
|
||||
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 )
|
||||
# Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
AC_CHECK_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>])
|
||||
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.
|
||||
|
||||
# Checks for library functions.
|
||||
AC_CHECK_LIBM
|
||||
AC_SUBST(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
|
||||
# Build time configuration.
|
||||
AC_ARG_ENABLE([replace-glut],
|
||||
[AS_HELP_STRING([--enable-replace-glut],
|
||||
[be a replacement for GLUT @<:@default=yes@:>@])])
|
||||
if test "x$enable_replace_glut" != xno; then
|
||||
LIBRARY=glut
|
||||
HEADER=glut.h
|
||||
else
|
||||
LIBRARY=freeglut
|
||||
HEADER=
|
||||
LIBRARY=freeglut
|
||||
HEADER=
|
||||
fi
|
||||
AC_SUBST(LIBRARY)
|
||||
AC_SUBST(HEADER)
|
||||
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_ARG_ENABLE([warnings],
|
||||
[AS_HELP_STRING([--enable-warnings],
|
||||
[use all gcc compiler warnings @<:@default=yes@:>@])])
|
||||
if test "x$enable_warnings" != xno -a "x$GCC" = xyes; then
|
||||
CFLAGS="$CFLAGS -Wall -pedantic -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 \
|
||||
)
|
||||
# Generate output.
|
||||
AC_CONFIG_FILES([Makefile
|
||||
doc/Makefile
|
||||
include/GL/Makefile
|
||||
include/Makefile
|
||||
progs/Makefile
|
||||
progs/demos/CallbackMaker/Makefile
|
||||
progs/demos/Fractals/Makefile
|
||||
progs/demos/Fractals_random/Makefile
|
||||
progs/demos/Lorenz/Makefile
|
||||
progs/demos/Makefile
|
||||
progs/demos/One/Makefile
|
||||
progs/demos/shapes/Makefile
|
||||
src/Makefile])
|
||||
AC_OUTPUT
|
||||
|
||||
Reference in New Issue
Block a user