Changeset 31

Timestamp:

08/09/07 02:38:23 (5 years ago)

Author:

mike

Message:

fixed makefile

Location:

trunk

Files:

• Makefile.in (modified) (23 diffs)
• configure (modified) (23 diffs)
• configure.in (modified) (5 diffs)
• install-sh (added)

trunk/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -16 +16 @@
 
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -36 +40 @@
 bin_PROGRAMS = lifeglut$(EXEEXT) lifeconsole$(EXEEXT) \
     lifebench$(EXEEXT)
-subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
     $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
     ChangeLog INSTALL NEWS config.guess config.sub depcomp \
     install-sh missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -46 +50 @@
     $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
+ configure.lineno configure.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
@@ -75 +79 @@
 lifeglut_OBJECTS = $(am_lifeglut_OBJECTS)
 lifeglut_DEPENDENCIES = liblife.a
-DEFAULT_INCLUDES = -I.@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -100 +104 @@
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -116 +122 @@
 ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -126 +131 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -140 +144 @@
 STRIP = @STRIP@
 VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -156 +158 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -184 +185 @@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 lib_LIBRARIES = liblife.a
 liblife_a_SOURCES = block.c  helpers.c 
@@ -236 +234 @@
 install-libLIBRARIES: $(lib_LIBRARIES)
     @$(NORMAL_INSTALL)
-    test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+    test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     @list='$(lib_LIBRARIES)'; for p in $$list; do \
       if test -f $$p; then \
@@ -269 +267 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
     @$(NORMAL_INSTALL)
-    test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+    test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
     @list='$(bin_PROGRAMS)'; for p in $$list; do \
       p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -292 +290 @@
 lifebench$(EXEEXT): $(lifebench_OBJECTS) $(lifebench_DEPENDENCIES) 
     @rm -f lifebench$(EXEEXT)
-    $(LINK) $(lifebench_OBJECTS) $(lifebench_LDADD) $(LIBS)
+    $(LINK) $(lifebench_LDFLAGS) $(lifebench_OBJECTS) $(lifebench_LDADD) $(LIBS)
 lifeconsole$(EXEEXT): $(lifeconsole_OBJECTS) $(lifeconsole_DEPENDENCIES) 
     @rm -f lifeconsole$(EXEEXT)
-    $(LINK) $(lifeconsole_OBJECTS) $(lifeconsole_LDADD) $(LIBS)
+    $(LINK) $(lifeconsole_LDFLAGS) $(lifeconsole_OBJECTS) $(lifeconsole_LDADD) $(LIBS)
 lifeglut$(EXEEXT): $(lifeglut_OBJECTS) $(lifeglut_DEPENDENCIES) 
     @rm -f lifeglut$(EXEEXT)
-    $(LINK) $(lifeglut_OBJECTS) $(lifeglut_LDADD) $(LIBS)
+    $(LINK) $(lifeglut_LDFLAGS) $(lifeglut_OBJECTS) $(lifeglut_LDADD) $(LIBS)
 
 mostlyclean-compile:
@@ -313 +311 @@
 
 .c.o:
-@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@    if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@   source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@   DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -320 +318 @@
 
 .c.obj:
-@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@    if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@   source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@   DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
+uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -376 +375 @@
 distdir: $(DISTFILES)
     $(am__remove_distdir)
-    test -d $(distdir) || mkdir $(distdir)
-    @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-    topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-    list='$(DISTFILES)'; \
-      dist_files=`for file in $$list; do echo $$file; done | \
-      sed -e "s|^$$srcdirstrip/||;t" \
-          -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-    case $$dist_files in \
-      */*) $(MKDIR_P) `echo "$$dist_files" | \
-               sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-               sort -u` ;; \
-    esac; \
-    for file in $$dist_files; do \
+    mkdir $(distdir)
+    @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+    topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+    list='$(DISTFILES)'; for file in $$list; do \
+      case $$file in \
+        $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+        $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+      esac; \
       if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+      dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+      if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+        dir="/$$dir"; \
+        $(mkdir_p) "$(distdir)$$dir"; \
+      else \
+        dir=''; \
+      fi; \
       if test -d $$d/$$file; then \
-        dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
         if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
           cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
@@ -405 +405 @@
       ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
       ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-      ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+      ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
     || chmod -R a+r $(distdir)
 dist-gzip: distdir
@@ -480 +480 @@
     @(echo "$(distdir) archives ready for distribution: "; \
       list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-      sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+      sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
 distuninstallcheck:
     @cd $(distuninstallcheck_dir) \
@@ -504 +504 @@
 installdirs:
     for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
-      test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+      test -z "$$dir" || $(mkdir_p) "$$dir"; \
     done
 install: install-am
@@ -554 +554 @@
 install-data-am:
 
-install-dvi: install-dvi-am
-
 install-exec-am: install-binPROGRAMS install-libLIBRARIES
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
 
 installcheck-am:
@@ -589 +581 @@
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-libLIBRARIES
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+    uninstall-libLIBRARIES
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
@@ -599 +590 @@
     distclean-tags distcleancheck distdir distuninstallcheck dvi \
     dvi-am html html-am info info-am install install-am \
-    install-binPROGRAMS install-data install-data-am install-dvi \
-    install-dvi-am install-exec install-exec-am install-html \
-    install-html-am install-info install-info-am \
-    install-libLIBRARIES install-man install-pdf install-pdf-am \
-    install-ps install-ps-am install-strip installcheck \
+    install-binPROGRAMS install-data install-data-am install-exec \
+    install-exec-am install-info install-info-am \
+    install-libLIBRARIES install-man install-strip installcheck \
     installcheck-am installdirs maintainer-clean \
     maintainer-clean-generic mostlyclean mostlyclean-compile \
     mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-    uninstall-am uninstall-binPROGRAMS uninstall-libLIBRARIES
+    uninstall-am uninstall-binPROGRAMS uninstall-info-am \
+    uninstall-libLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

trunk/configure

@@ -618 +618 @@
 INSTALL_SCRIPT
 INSTALL_DATA
-am__isrc
 CYGPATH_W
 PACKAGE
@@ -637 +636 @@
 am__tar
 am__untar
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
 RANLIB
 CC
@@ -662 +653 @@
 am__fastdepCC_TRUE
 am__fastdepCC_FALSE
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
 LIBOBJS
 LTLIBOBJS'
@@ -1686 +1685 @@
 
 
-am__api_version='1.10'
-
+am__api_version="1.9"
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1870 +1868 @@
 fi
 
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
-       { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-       case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-         'mkdir (GNU coreutils) '* | \
-         'mkdir (coreutils) '* | \
-         'mkdir (fileutils) '4.1*)
-           ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-           break 3;;
-       esac
-     done
-       done
-done
-IFS=$as_save_IFS
-
-fi
-
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
+  #   $(mkdir_p) $(somedir)
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
+else
+  # On NextStep and OpenStep, the `mkdir' command does not
+  # recognize any option.  It will interpret all options as
+  # directories to create, and then abort because `.' already
+  # exists.
+  for d in ./-p ./--version;
+  do
+    test -d $d && rmdir $d
+  done
+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+  if test -f "$ac_aux_dir/mkinstalldirs"; then
+    mkdir_p='$(mkinstalldirs)'
   else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
-    MKDIR_P="$ac_install_sh -d"
+    mkdir_p='$(install_sh) -d'
   fi
 fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
 
 for ac_prog in gawk mawk nawk awk
@@ -1999 +1982 @@
 rmdir .tst 2>/dev/null
 
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
+  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
-  fi
 fi
 
@@ -2051 +2030 @@
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
@@ -2155 +2134 @@
 
 fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
@@ -2170 +2149 @@
 
 
-CFLAGS="-Wall -O3"
+CFLAGS="-Wall -O3 -msse2"
 
 
@@ -2176 +2155 @@
 if test "${enable_debug+set}" = set; then
   enableval=$enable_debug; if test x$enableval = xyes; then
-    CFLAGS="-Wall -ggdb -O2"
+    CFLAGS="-Wall -ggdb -O2 -msse2"
 fi
 fi
@@ -2190 +2169 @@
 
 fi
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-if test x"$useopengl" = xtrue; then
-case $host_os in
-  darwin* )
-    echo Darwin
-    LDFLAGS="$LDFLAGS -framework OpenGL -framework GLUT"
-  ;;
-  *)
-    echo Not Darwin
-    LDFLAGS="$LDFLAGS -lgl -lglut"
-  ;;
-esac
-fi
-
 
 
@@ -3357 +3238 @@
   AMDEPBACKSLASH='\'
 fi
- if test "x$enable_dependency_tracking" != xno; then
+
+
+if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
@@ -3364 +3247 @@
   AMDEP_FALSE=
 fi
+
 
 
@@ -3434 +3318 @@
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
@@ -3464 +3347 @@
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
- if
+
+
+if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
@@ -3472 +3357 @@
   am__fastdepCC_TRUE='#'
   am__fastdepCC_FALSE=
+fi
+
+
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+if test "${ac_cv_build+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+if test "${ac_cv_host+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+if test x"$useopengl" = xtrue; then
+case $host_os in
+  darwin* )
+    echo Darwin
+    LDFLAGS="$LDFLAGS -framework OpenGL -framework GLUT"
+  ;;
+  *)
+    echo Not Darwin
+    LDFLAGS="$LDFLAGS -lGL -lglut"
+  ;;
+esac
 fi
 
@@ -3983 +3967 @@
 srcdir='$srcdir'
 INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
 _ACEOF
 
@@ -4180 +4163 @@
 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
 CYGPATH_W!$CYGPATH_W$ac_delim
 PACKAGE!$PACKAGE$ac_delim
@@ -4199 +4181 @@
 am__tar!$am__tar$ac_delim
 am__untar!$am__untar$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
 RANLIB!$RANLIB$ac_delim
 CC!$CC$ac_delim
@@ -4224 +4198 @@
 am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
 am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
     break
   elif $ac_last_try; then
@@ -4455 +4437 @@
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
 _ACEOF
 
@@ -4513 +4490 @@
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 " $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
@@ -4548 +4524 @@
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

trunk/configure.in

@@ -4 +4 @@
 AM_INIT_AUTOMAKE(lifeglut,0.1)
 
-CFLAGS="-Wall -O3"
+CFLAGS="-Wall -O3 -msse2"
 
 
@@ -10 +10 @@
 [  compiles with debugging info],
 [if test x$enableval = xyes; then
-    CFLAGS="-Wall -ggdb -O2"
+    CFLAGS="-Wall -ggdb -O2 -msse2"
 fi])
 
@@ -21 +21 @@
 )
 
+AC_PROG_RANLIB
+AC_PROG_CC
+
+
 AC_CANONICAL_HOST
 if test x"$useopengl" = xtrue; then
@@ -30 +34 @@
   *)
     echo Not Darwin
-    LDFLAGS="$LDFLAGS -lgl -lglut"
+    LDFLAGS="$LDFLAGS -lGL -lglut"
   ;;
 esac
@@ -36 +40 @@
 
 
-
-AC_PROG_RANLIB
-AC_PROG_CC
 
 if test x"$CC" = xicc; then