no longer using libtool; didn't really need it

[chaz/yoink] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5a7791d518e0a576833437990b10453f56b44e79..11fbb5524c87c2aa7984996c97a359876ba9d1f7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 
 AC_PREREQ([2.60])
 
-AC_INIT([Yoink], [0.1], [chaz@dogcows.com], [yoink])
+AC_INIT([Yoink], [0.1], [onefriedrice@brokenzipper.com], [yoink])
 
 AC_CANONICAL_TARGET
 
@@ -21,13 +21,11 @@ AM_INIT_AUTOMAKE
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 AC_PROG_CXX
-#AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
-#AC_PROG_LN_S
-#AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
+AC_PROG_RANLIB
+AM_PROG_CC_C_O
 
 
 #
@@ -83,30 +81,33 @@ AC_ARG_WITH([log-level],
 if test x$developer = xyes
 then
        debug=yes
-       profile=yes
-       extra_warnings=yes
        log_level=4
+
+       if test x$WIN32 != xyes
+       then
+               profile=yes
+       fi
 fi
 
 if test x$debug = xyes
 then
-   CFLAGS="$CFLAGS -Wall -O0 -g -DDEBUG"
-   CXXFLAGS="$CXXFLAGS -Wall -O0 -g -DDEBUG"
+       CFLAGS="$CFLAGS -Wall -O0 -gstabs -DDEBUG"
+       CXXFLAGS="$CXXFLAGS -Wall -O0 -gstabs -DDEBUG"
 else
-   CFLAGS="$CFLAGS -O2 -DNDEBUG"
-   CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
+       CFLAGS="$CFLAGS -O2 -DNDEBUG"
+       CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
 fi
 
 if test x$profile = xyes
 then
-   CFLAGS="$CFLAGS -pg"
-   CXXFLAGS="$CXXFLAGS -pg"
+       CFLAGS="$CFLAGS -pg"
+       CXXFLAGS="$CXXFLAGS -pg"
 fi
 
 if test x$extra_warnings = xyes
 then
-   CFLAGS="$CFLAGS -Wextra"
-   CXXFLAGS="$CXXFLAGS -Wextra"
+       CFLAGS="$CFLAGS -Wextra -Wno-unused-parameter"
+       CXXFLAGS="$CXXFLAGS -Wextra -Wno-unused-parameter"
 fi
 
 AC_DEFINE_UNQUOTED([YOINK_LOGLEVEL], [$log_level],
@@ -191,8 +192,8 @@ AC_CHECK_HEADERS([AL/al.h AL/alut.h],,
 AC_CHECK_HEADERS([SDL/SDL_image.h],,
                                 [missing="$missing SDL_image"])
 
-AC_CHECK_HEADERS([SDL/SDL_sound.h],,
-                                [missing="$missing SDL_sound"])
+AC_CHECK_HEADERS([vorbis/codec.h vorbis/vorbisfile.h],,
+                                [missing="$missing libvorbis"])
 
 if test "x$missing" != x
 then
@@ -209,31 +210,31 @@ fi
 # Checks for libraries.
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-AC_SEARCH_LIBS([IMG_Load], [SDL_image],,
-                          [missing="$missing SDL_image"])
-
-AC_SEARCH_LIBS([Sound_Init], [SDL_sound],,
-                          [missing="$missing SDL_sound"])
-
 if test x$WIN32 == xyes
 then
 # autoconf library search macro doesn't find opengl32 on windows because it uses
 # different name hashing, but it links fine; assume it's there
        LIBS="$LIBS -lglu32 -lopengl32"
 else
-       AC_SEARCH_LIBS([gluPerspective], [GLU MesaGLU],,
+       AC_SEARCH_LIBS([gluDisk], [GLU MesaGLU],,
                                   [missing="$missing GLU"])
 
-       AC_SEARCH_LIBS([glBegin], [GL MesaGL],,
+       AC_SEARCH_LIBS([glEnable], [GL MesaGL],,
                                   [missing="$missing OpenGL"])
 fi
 
-AC_SEARCH_LIBS([alGenBuffers], [openal openal32],,
+AC_SEARCH_LIBS([alEnable], [openal openal32],,
                           [missing="$missing OpenAL"])
 
 AC_SEARCH_LIBS([alutInit], [alut],,
                           [missing="$missing ALUT"])
 
+AC_SEARCH_LIBS([IMG_Load], [SDL_image],,
+                          [missing="$missing SDL_image"])
+
+AC_SEARCH_LIBS([ov_open], [vorbisfile],,
+                          [missing="$missing libvorbis"])
+
 AC_SEARCH_LIBS([clock_gettime], [rt],
                           [AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
                                                  [Define to 1 if you have the 'clock_gettime' function.])])
@@ -272,8 +273,8 @@ AC_CONFIG_FILES([Makefile
                                 doc/yoink.6
                                 extra/Makefile
                                 extra/yoink.spec
-                 src/Makefile
-                                yajl/Makefile])
+                 src/Makefile])
+                                #src/Moof/yajl/Makefile])
 
 AC_CONFIG_HEADERS([src/config.h])