Move icons into a synfigstudio subdirectory of the pixmaps directory. Suggestion...

[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 636f19b..f4d1c57 100755 (executable)
--- a/synfig-studio/trunk/config/configure.ac
+++ b/synfig-studio/trunk/config/configure.ac
@@ -86,8 +86,8 @@ PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 gthread-2.0,[],[
 AC_SUBST(GTKMM_CFLAGS)
 AC_SUBST(GTKMM_LIBS)
 
-PKG_CHECK_MODULES(SYNFIG, synfig ETL sigc++-2.0,,[
-       AC_MSG_ERROR([ ** Unable to set up dependent libraries])
+PKG_CHECK_MODULES(SYNFIG, [synfig >= 0.61.06] [ETL >= 0.04.09] sigc++-2.0,,[
+       AC_MSG_ERROR([ ** Unable to set up dependent libraries (synfig >= 0.61.06, ETL >= 0.04.09)])
 ])
 AC_SUBST(SYNFIG_CFLAGS)
 AC_SUBST(SYNFIG_LIBS)
@@ -107,7 +107,7 @@ case "$host" in
                with_userdir="Library/Synfig"
        ;;
        *)
-               with_userdir="Synfig"
+               with_userdir=".synfig"
        ;;
 esac
 ])
@@ -168,20 +168,11 @@ 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/synfigstudio"
+AC_SUBST(imagedir)
 
 AC_OUTPUT(
 Makefile
@@ -206,7 +197,6 @@ Configuration Summary
 - - - - - -
 
 Install Prefix -------------------> $prefix
-Data Prefix ----------------------> $datadir
 Host Platform --------------------> $host
 Icon Format ----------------------> $imageext
 Debug Mode -----------------------> $debug