Really really fix 1568925, gawd I suck. This time I tested it, yes I did. YAY NEW...

[synfig.git] / synfig-studio / trunk / config / configure.ac

diff --git a/synfig-studio/trunk/config/configure.ac b/synfig-studio/trunk/config/configure.ac
index 11e9f28..567d071 100755 (executable)
--- a/synfig-studio/trunk/config/configure.ac
+++ b/synfig-studio/trunk/config/configure.ac
@@ -1,4 +1,4 @@
-# $Header: /opt/voria/cvs/studio/config/configure.ac,v 1.3 2005/01/17 05:20:08 darco Exp $
+# $Id$
 
 # -- I N I T --------------------------------------------------
 
@@ -15,9 +15,12 @@ dnl AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 
+API_VERSION=@API_VERSION@
 
 # -- V A R I A B L E S ----------------------------------------
 
+SVN_REPOSITORY=@SVN_REPOSITORY@
+
 # -- P R O G R A M S ------------------------------------------
 
 AC_PROG_CC
@@ -93,6 +96,22 @@ windowsys="gtkmm"
 AC_DEFINE(STUDIO_WINSYS_H,"gtkmm/winsys.h",[blah])
 AM_CONDITIONAL(WINDOWSYS_GTKMM,true)
 
+AC_ARG_WITH(userdir,[
+  --with-userdir=(dirname)         Relative path to user directory],[
+],[
+case "$host" in
+       *mingw* | *cygwin*)
+               with_userdir="Synfig"
+       ;;
+       *darwin*)
+               with_userdir="Library/Synfig"
+       ;;
+       *)
+               with_userdir=".synfig"
+       ;;
+esac
+])
+AC_DEFINE_UNQUOTED(SYNFIG_USER_APP_DIR,"$with_userdir",[Synfig User Data Directory])
 
 # --- FMOD CHECK -------------
 AC_ARG_WITH(libfmod,[
@@ -135,6 +154,9 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(LDFLAGS)
+AC_SUBST(SVN_REPOSITORY)
+
+AC_SUBST(API_VERSION)
 
 VERSION_MAJ=@VERSION_MAJ@
 VERSION_MIN=@VERSION_MIN@
@@ -146,26 +168,19 @@ AC_SUBST(VERSION_REV)
 # fmod stuff...
 AC_SUBST(FMOD_LIBS)
 
-imagedir=$datadir/pixmaps
-
 imageext=png
-
 AC_SUBST(imageext)
-AC_SUBST(imagedir)
 
-
-
-AC_DEFINE_UNQUOTED(IMAGE_EXT,"$imageext", [ Describes the file extension for images ] )
-
-[[ $prefix = NONE ]] && prefix=$ac_default_prefix
-export prefix
-AC_DEFINE_UNQUOTED(IMAGE_DIR,"`echo echo $imagedir | sh`", [ Describes where the icons and stuff will be ] )
+imagedir="${datadir}/pixmaps"
+AC_SUBST(imagedir)
 
 AC_OUTPUT(
 Makefile
 synfigstudio.desktop
 synfigstudio.mime
 synfigstudio.keys
+synfigstudio.xml
+synfigstudio-thumbnailer.schemas
 src/Makefile
 src/gtkmm/Makefile
 src/synfigapp/Makefile
@@ -182,7 +197,6 @@ Configuration Summary
 - - - - - -
 
 Install Prefix -------------------> $prefix
-Data Prefix ----------------------> $datadir
 Host Platform --------------------> $host
 Icon Format ----------------------> $imageext
 Debug Mode -----------------------> $debug