moved log level from configure to setting

[chaz/yoink] / configure.ac

diff --git a/configure.ac b/configure.ac
index fe599a8d8d443173cd846a740a3ef00ee38c9737..b52ea766b8a675162909a7165ac215d94e40f2ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_INIT([Yoink], [0.1], [chaz@dogcows.com], [yoink])
 
 AC_CANONICAL_TARGET
 
-AC_CONFIG_SRCDIR([src/GameLayer.cc])
+AC_CONFIG_SRCDIR([src/version.c])
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE
@@ -45,9 +45,7 @@ case "${host}" in
                then
                        AC_MSG_ERROR([windres could not be found])
                fi
-               AC_SUBST(WINDRES)
                AC_PATH_PROGS([MAKENSIS], [makensis])
-               AC_SUBST(MAKENSIS)
        ;;
        *cygwin*)
                CYGWIN=yes
@@ -57,12 +55,8 @@ case "${host}" in
                MACOSX=yes
                LIBS="$LIBS -Wl,-framework"
        ;;
-       *-linux-gnu*)
-               LINUX=yes
-       ;;
 esac
 
-AM_CONDITIONAL([LINUX], test "$LINUX" = "yes")
 AM_CONDITIONAL([WIN32], test "$WIN32" = "yes")
 
 
@@ -105,12 +99,6 @@ AC_ARG_ENABLE([qt4],
                          [qt4=$enableval],
                          [qt4=no])
 
-AC_ARG_WITH([log-level],
-                       [AS_HELP_STRING([--with-log-level=NUM],
-                                                       [0, none... 1, errors... 4, everything (default: 3)])],
-                       [log_level=$withval],
-                       [log_level=3])
-
 
 if test x$debug = xyes
 then
@@ -144,23 +132,18 @@ fi
 if test x$threads = xyes
 then
        AC_DEFINE([USE_THREADS], 1,
-                         [Define to 1 if you want to use threads for parallel tasks.])
+                         [Define to 1 if you want to use threads when applicable.])
 fi
 
 if test x$gtk = xyes
 then
        AC_DEFINE([USE_GTK], 1,
                          [Define to 1 if you want to use GTK+ info/error dialogs.])
-else
-if test x$qt4 = xyes
+elif test x$qt4 = xyes
 then
        AC_DEFINE([USE_QT4], 1,
-                         [Define to 1 if you want to use QT info/error dialogs.])
+                         [Define to 1 if you want to use QT4 info/error dialogs.])
 fi
-fi
-
-AC_DEFINE_UNQUOTED([YOINK_LOGLEVEL], [$log_level],
-                                  [Define to detail level of logging.])
 
 
 if test "x$prefix" = xNONE
@@ -251,7 +234,7 @@ website="http://www.mesa3d.org/"
 AC_CHECK_HEADERS([GL/gl.h GL/glu.h],,
                                 [missing=yes
                                  echo "***** Missing GL headers ($website) *****"])
-if test x$WIN32 == xyes
+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
@@ -274,14 +257,14 @@ AC_SEARCH_LIBS([alEnable], [openal OpenAL32],,
                           [missing=yes
                                echo "***** Missing libopenal ($website) *****"])
 
-##### SDL_image #####
-website="http://www.libsdl.org/projects/SDL_image/"
-AC_CHECK_HEADERS([SDL/SDL_image.h],,
+##### libpng #####
+website="http://www.libpng.org/pub/png/libpng.html"
+AC_CHECK_HEADERS([png.h],,
                                 [missing=yes
-                                 echo "***** Missing SDL_image header ($website) *****"])
-AC_SEARCH_LIBS([IMG_Load], [SDL_image],,
+                                 echo "***** Missing libpng header ($website) *****"])
+AC_SEARCH_LIBS([png_sig_cmp], [png],,
                           [missing=yes
-                               echo "***** Missing libSDL_image ($website) *****"])
+                               echo "***** Missing libpng ($website) *****"])
 
 ##### libvorbis #####
 website="http://www.xiph.org/downloads/"
@@ -333,19 +316,18 @@ AC_SEARCH_LIBS([clock_gettime], [rt],
 
 if test x$missing == xyes
 then
-       AC_MSG_ERROR([please install missing dependencies (see messages above)])
+       AC_MSG_WARN([You may be missing some dependencies--see messages above.])
 fi
 
 
 #
-# Find the data files to install.
+# Find the game resources to install.
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-DATA_FILES=$(echo $(cd data; \
-                                       find . -name "*.lua" \
-                                               -o -name "*.ogg" \
-                                               -o -name "*.png" \
-                                               -o -name "yoinkrc"))
+DATA_FILES=$(echo $(cd data && find . -name "*.lua" \
+                                                                  -o -name "*.ogg" \
+                                                                  -o -name "*.png" \
+                                                                  -o -name "yoinkrc"))
 AC_SUBST([DATA_FILES])
 
 
@@ -361,7 +343,7 @@ AC_CONFIG_FILES([Makefile
 
 if test x$WIN32 = xyes
 then
-       AC_CONFIG_FILES([win32/Makefile win32/build-installer.sh])
+       AC_CONFIG_FILES([win32/Makefile win32/mkpackage.sh win32/yoink.nsi])
 fi
 
 
@@ -380,7 +362,6 @@ echo ""
 echo "            Target: $target"
 echo "            Prefix: $prefix"
 echo "    Data Directory: $DATADIR"
-echo "         Log Level: $log_level"
 echo "             Debug: $debug"
 echo "  Double Precision: $double_precision"
 echo "           Profile: $profile"