--- gigedit/trunk/configure.ac	2007/09/04 11:04:56	1322
+++ gigedit/trunk/configure.ac	2008/01/19 20:07:39	1645
@@ -1,5 +1,13 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(gigedit,0.0.3)
+AC_INIT(configure.ac)
+AC_CONFIG_AUX_DIR([.])
+
+#------------------------------------------------------------------------------------
+# The following is the current, official release version of gigedit:
+
+GIGEDIT_VER_MAJOR=0
+GIGEDIT_VER_MINOR=1
+GIGEDIT_VER_RELEASE=1
 
 #------------------------------------------------------------------------------------
 # The following is the libtool / shared library version. This doesn't have to
@@ -18,13 +26,19 @@
 #  6. If any interfaces have been removed since the last public release, then set age
 #     to 0.
 
-LIBGIGEDIT_LT_CURRENT=0
+LIBGIGEDIT_LT_CURRENT=1
 LIBGIGEDIT_LT_REVISION=0
 LIBGIGEDIT_LT_AGE=0
+
 SHARED_VERSION_INFO="$LIBGIGEDIT_LT_CURRENT:$LIBGIGEDIT_LT_REVISION:$LIBGIGEDIT_LT_AGE"
+AC_LANG_CPLUSPLUS
+AC_PROG_CXX
 AC_PROG_LIBTOOL
 AC_SUBST(SHLIB_VERSION_ARG)
 AC_SUBST(SHARED_VERSION_INFO)
+AC_SUBST(GIGEDIT_VER_MAJOR)
+AC_SUBST(GIGEDIT_VER_MINOR)
+AC_SUBST(GIGEDIT_VER_RELEASE)
 
 # configure checks for the following file's existence to make sure that
 # the directory that it is told contains the source code in fact does.
@@ -32,20 +46,20 @@
 # `--srcdir'; this is a safety check.
 AC_CONFIG_SRCDIR(src/gigedit/main.cpp)
 
-AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE
-
 GETTEXT_PACKAGE=gigedit
 AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
 
+# the libgig header files need this
+AC_C_BIGENDIAN
+
 AC_PROG_CXX
 
 IT_PROG_INTLTOOL(0.35.0)
 AM_GLIB_GNU_GETTEXT
 
-PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4.11 gthread-2.0)
-PKG_CHECK_MODULES(GIG, gig >= 3.1.1)
+PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4.10 gthread-2.0)
+PKG_CHECK_MODULES(GIG, gig >= 3.2.0)
 
 # check for presence of libsndfile
 PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.2)
@@ -63,7 +77,7 @@
 CFLAGS=$gigedit_save_CFLAGS
 
 # check for (optional) presence of liblinuxsampler
-liblinuxsampler_version="0.4.0.5cvs"
+liblinuxsampler_version="0.5.0"
 PKG_CHECK_MODULES(
     LINUXSAMPLER, linuxsampler >= $liblinuxsampler_version,
     have_linuxsampler=1, have_linuxsampler=0
@@ -88,8 +102,21 @@
         # convert absolute LS plugin dir into relative dir
         # (see ch 27.10 of the automake manual,
         #  "Installing to Hard-Coded Locations")
-        LINUXSAMPLER_PLUGIN_DIR=`echo "${LINUXSAMPLER_PLUGIN_DIR}" | sed 's/^.*\/lib\//\${libdir}\//g'`
-        echo "Relative plugin dir: ${LINUXSAMPLER_PLUGIN_DIR}"
+        # this one is extended to work with digit postfixed lib directories
+        # (e.g. "/usr/lib64/linuxsampler") as well
+        LINUXSAMPLER_PLUGIN_DIR=`echo "${LINUXSAMPLER_PLUGIN_DIR}" | sed 's/^.*\/lib[[0-9]]*\//\${libdir}\//g'`
+        if echo "${LINUXSAMPLER_PLUGIN_DIR}" | grep "\${libdir}" > /dev/null; then
+            echo "Relative plugin dir: ${LINUXSAMPLER_PLUGIN_DIR}"
+        else
+            echo "*********************************************************"
+            echo "* ! WARNING ! : Could not resolve LinuxSampler's plugin"
+            echo "* directory as relative path. This is probably not an"
+            echo "* issue if you're just going to install gigedit by"
+            echo "* 'make install', but it IS a problem if you're"
+            echo "* installing to a certain destination directory and/or"
+            echo "* compile in sandbox (e.g. Debian package or Gentoo emerge)"
+            echo "*********************************************************"
+        fi
     fi
 fi
 AC_SUBST(LINUXSAMPLER_CFLAGS)
@@ -101,14 +128,22 @@
     [Define to 1 if you have LinuxSampler installed.]
 )
 
+AC_CONFIG_HEADERS(config.h)
+AM_INIT_AUTOMAKE(gigedit, "$GIGEDIT_VER_MAJOR.$GIGEDIT_VER_MINOR.$GIGEDIT_VER_RELEASE")
+
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
 	src/gigedit/Makefile
 	src/plugin/Makefile
+	gfx/Makefile
 	po/Makefile.in
 	debian/Makefile
-        doc/Makefile
-        doc/quickstart/Makefile
+	doc/Makefile
+	doc/quickstart/Makefile
+	win32/libgigedit.dev
+	win32/gigedit.dev
+	win32/gigedit.nsi
+	win32/Makefile
 ])
 AC_OUTPUT