X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fconfig%2Fconfigure.ac;h=1d2565186b7323cc6a54c19d6c272c3c6016b2d4;hb=633c08b084b6ab9868e0c0f428903467e536afb9;hp=0357c9094f3d74003843dacffe6b0c7be2cc7209;hpb=2c43cbfff01496919316f600ee76112be551392d;p=synfig.git

diff --git a/synfig-studio/trunk/config/configure.ac b/synfig-studio/trunk/config/configure.ac
index 0357c90..1d25651 100755
--- a/synfig-studio/trunk/config/configure.ac
+++ b/synfig-studio/trunk/config/configure.ac
@@ -18,6 +18,8 @@ AM_MAINTAINER_MODE
 
 # -- V A R I A B L E S ----------------------------------------
 
+SVN_REPOSITORY=@SVN_REPOSITORY@
+
 # -- P R O G R A M S ------------------------------------------
 
 AC_PROG_CC
@@ -61,6 +63,20 @@ AC_LIBTOOL_PATCH
 
 dnl AC_PROG_INTLTOOL(0.11)
 
+case "$host" in
+	*mingw* | *cygwin*)
+		AM_CONDITIONAL(WIN32_PKG, true)
+		AM_CONDITIONAL(MACOSX_PKG, false)
+	;;
+	*darwin*)
+		AM_CONDITIONAL(WIN32_PKG, false)
+		AM_CONDITIONAL(MACOSX_PKG, true)
+	;;
+	*)
+		AM_CONDITIONAL(WIN32_PKG, false)
+		AM_CONDITIONAL(MACOSX_PKG, false)
+	;;
+esac
 # -- L I B R A R I E S ----------------------------------------
 
 PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 gthread-2.0,[],[
@@ -69,16 +85,32 @@ PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 gthread-2.0,[],[
 AC_SUBST(GTKMM_CFLAGS)
 AC_SUBST(GTKMM_LIBS)
 
-PKG_CHECK_MODULES(SINFG, synfig ETL sigc++-2.0,,[
+PKG_CHECK_MODULES(SYNFIG, synfig ETL sigc++-2.0,,[
 	AC_MSG_ERROR([ ** Unable to set up dependent libraries])
 ])
-AC_SUBST(SINFG_CFLAGS)
-AC_SUBST(SINFG_LIBS)
+AC_SUBST(SYNFIG_CFLAGS)
+AC_SUBST(SYNFIG_LIBS)
 
 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,[
@@ -102,7 +134,7 @@ if test $with_libfmod = "yes" ; then {
 # -- H E A D E R S --------------------------------------------
 
 AC_CHECK_HEADERS([unistd.h signal.h fcntl.h])
-AC_CHECK_HEADERS([sys/types.h sys/wait.h sys/stat.h sys/time.h sys/resource.h])
+AC_CHECK_HEADERS([sys/types.h sys/wait.h sys/stat.h sys/time.h sys/resource.h sys/errno.h])
 
 # -- T Y P E S & S T R U C T S --------------------------------
 
@@ -121,6 +153,7 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(LDFLAGS)
+AC_SUBST(SVN_REPOSITORY)
 
 VERSION_MAJ=@VERSION_MAJ@
 VERSION_MIN=@VERSION_MIN@
@@ -149,12 +182,14 @@ AC_DEFINE_UNQUOTED(IMAGE_DIR,"`echo echo $imagedir | sh`", [ Describes where the
 
 AC_OUTPUT(
 Makefile
-sinfgstudio.desktop
-sinfgstudio.mime
-sinfgstudio.keys
+synfigstudio.desktop
+synfigstudio.mime
+synfigstudio.keys
+synfigstudio.xml
+synfigstudio-thumbnailer.schemas
 src/Makefile
 src/gtkmm/Makefile
-src/sinfgapp/Makefile
+src/synfigapp/Makefile
 images/Makefile
 win32inst.nsi
 pkg-info/macosx/synfig-studio.info
@@ -180,8 +215,8 @@ FMOD Enabled ---------------------> $with_libfmod
 "'$'"CXX ------------------------------> '$CXX'
 "'$'"CXXFLAGS -------------------------> '$CXXFLAGS'
 "'$'"LDFLAGS --------------------------> '$LDFLAGS'
-"'$'"SINFG_CFLAGS ---------------------> '$SINFG_CFLAGS'
-"'$'"SINFG_LIBS -----------------------> '$SINFG_LIBS'
+"'$'"SYNFIG_CFLAGS ---------------------> '$SYNFIG_CFLAGS'
+"'$'"SYNFIG_LIBS -----------------------> '$SYNFIG_LIBS'
 "'$'"GTKMM_CFLAGS ---------------------> '$GTKMM_CFLAGS'
 "'$'"GTKMM_LIBS -----------------------> '$GTKMM_LIBS'
 "