Index: m4/valknut-qt4.m4
===================================================================
--- m4/valknut-qt4.m4	(revision 2707)
+++ m4/valknut-qt4.m4	(working copy)
@@ -9,11 +9,13 @@
     [ USE_FRAMEWORKS="$enableval" ],
     [ USE_FRAMEWORKS="no" ]
   )
+  AM_CONDITIONAL([USE_FRAMEWORKS], [test x$USE_FRAMEWORKS = "xyes"])
   
   AC_ARG_WITH([framework-dir],
     [AS_HELP_STRING([--with-framework-dir=DIR],[Specify the directory containing QtCore.framework (default=/Library/Frameworks)])],
     [ FRAMEWORK_DIR="$withval" ],
-    [ FRAMEWORK_DIR="/Library/Frameworks" ]
+    [ FRAMEWORK_DIR="/Library/Frameworks" ],
+    AC_SUBST(FRAMEWORK_DIR)
   )
   
   AC_MSG_CHECKING([how to find QT4 libraries])
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 2707)
+++ Makefile.am	(working copy)
@@ -33,7 +33,7 @@
 $(shell /usr/bin/install_name_tool -change $(linked_dylibs_2) \@executable_path/$(notdir $(linked_dylibs_2)) $(OSX_MACOS_TARGET)/$(notdir $(dylib)))
 endef
 
-install-osx: install-osx-app-bundle install-osx-standalone-app install-osx-disk-image
+install-osx: install-osx-disk-image
 
 install-osx-app-bundle:
 	/bin/rm -rf "$(abs_builddir)/$(OSX_APP_DIR)"
@@ -46,13 +46,38 @@
 	$(INSTALL_DIR) $(OSX_RSC_TARGET)
 	$(INSTALL_DATA) $(ICONS_DIR)/icon_128x128.icns $(OSX_RSC_TARGET)/$(OSX_BUNDLE_NAME).icns
 
-install-osx-standalone-app: install-osx-app-bundle
-	$(foreach dylib,$(shell $(OTOOL) -L $(OSX_MACOS_TARGET)/$(PACKAGE) | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+install-osx-frameworks: install-osx-app-bundle
+if USE_FRAMEWORKS
+	/bin/rm -rf "$(abs_builddir)/$(OSX_CNT_TARGET)/Frameworks"
+	$(INSTALL_DIR) "$(abs_builddir)/$(OSX_CNT_TARGET)/Frameworks"
+	/bin/cp -R $(FRAMEWORK_DIR)/Qt{Core,Gui,Network,3Support,Sql,Xml}.framework "$(abs_builddir)/$(OSX_CNT_TARGET)/Frameworks"
+	/usr/bin/install_name_tool -id @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore $(OSX_CNT_TARGET)/Frameworks/QtCore.framework/Versions/4/QtCore
+	/usr/bin/install_name_tool -id @executable_path/../Frameworks/QtGui.framework/Versions/4/QtGui $(OSX_CNT_TARGET)/Frameworks/QtGui.framework/Versions/4/QtGui
+	/usr/bin/install_name_tool -id @executable_path/../Frameworks/QtNetwork.framework/Versions/4/QtNetwork $(OSX_CNT_TARGET)/Frameworks/QtNetwork.framework/Versions/4/QtNetwork
+	/usr/bin/install_name_tool -id @executable_path/../Frameworks/Qt3Support.framework/Versions/4/Qt3Support $(OSX_CNT_TARGET)/Frameworks/Qt3Support.framework/Versions/4/Qt3Support
+	/usr/bin/install_name_tool -id @executable_path/../Frameworks/QtSql.framework/Versions/4/QtSql $(OSX_CNT_TARGET)/Frameworks/QtSql.framework/Versions/4/QtSql
+	/usr/bin/install_name_tool -id @executable_path/../Frameworks/QtXml.framework/Versions/4/QtXml $(OSX_CNT_TARGET)/Frameworks/QtXml.framework/Versions/4/QtXml
+	/usr/bin/install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore $(OSX_CNT_TARGET)/Frameworks/QtGui.framework/Versions/4/QtGui
+	/usr/bin/install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore $(OSX_CNT_TARGET)/Frameworks/QtNetwork.framework/Versions/4/QtNetwork
+	/usr/bin/install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore $(OSX_CNT_TARGET)/Frameworks/Qt3Support.framework/Versions/4/Qt3Support
+	/usr/bin/install_name_tool -change QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/4/QtGui $(OSX_CNT_TARGET)/Frameworks/Qt3Support.framework/Versions/4/Qt3Support
+	/usr/bin/install_name_tool -change QtNetwork.framework/Versions/4/QtNetwork @executable_path/../Frameworks/QtNetwork.framework/Versions/4/QtNetwork $(OSX_CNT_TARGET)/Frameworks/Qt3Support.framework/Versions/4/Qt3Support
+	/usr/bin/install_name_tool -change QtSql.framework/Versions/4/QtSql @executable_path/../Frameworks/QtSql.framework/Versions/4/QtSql $(OSX_CNT_TARGET)/Frameworks/Qt3Support.framework/Versions/4/Qt3Support
+	/usr/bin/install_name_tool -change QtXml.framework/Versions/4/QtXml @executable_path/../Frameworks/QtXml.framework/Versions/4/QtXml $(OSX_CNT_TARGET)/Frameworks/Qt3Support.framework/Versions/4/Qt3Support
+	/usr/bin/install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore $(OSX_CNT_TARGET)/Frameworks/QtSql.framework/Versions/4/QtSql
+	/usr/bin/install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore $(OSX_CNT_TARGET)/Frameworks/QtXml.framework/Versions/4/QtXml
+	$(foreach dylib,$(shell $(OTOOL) -L $(OSX_MACOS_TARGET)/$(PACKAGE) | grep version | cut -f 1 -d ' ' | grep framework | grep -v \/System\/Library),$(shell /usr/bin/install_name_tool -change $(dylib) \@executable_path/../Frameworks/$(dylib) $(OSX_MACOS_TARGET)/$(PACKAGE)))
+else
+	@echo "Frameworks were not used"
+endif
 
-install-osx-disk-image: install-osx-app-bundle install-osx-standalone-app
+install-osx-standalone-app: install-osx-frameworks
+	$(foreach dylib,$(shell $(OTOOL) -L $(OSX_MACOS_TARGET)/$(PACKAGE) | grep version | cut -f 1 -d ' ' | grep -v \.framework | grep -v \/usr\/lib),$(install_osx_libraries))
+
+install-osx-disk-image: install-osx-standalone-app
 	/bin/rm -f $(PACKAGE)-$(PACKAGE_VERSION).sparseimage
 	/bin/rm -f $(PACKAGE)-$(PACKAGE_VERSION)-`uname -p`.dmg
-	$(HDIUTIL) create -type SPARSE -size 50m -fs HFS+ -volname $(OSX_DMG_TARGET) -attach $(PACKAGE)-$(PACKAGE_VERSION).sparseimage
+	$(HDIUTIL) create -type SPARSE -size 55m -fs HFS+ -volname $(OSX_DMG_TARGET) -attach $(PACKAGE)-$(PACKAGE_VERSION).sparseimage
 	/bin/cp -R $(OSX_APP_DIR) /Volumes/$(OSX_DMG_TARGET)
 	/bin/cp $(PACKAGE)/icons/$(OSX_BUNDLE_NAME)VolumeIcon.icns /Volumes/$(OSX_DMG_TARGET)/.VolumeIcon.icns
 	/Developer/Tools/SetFile -a C /Volumes/$(OSX_DMG_TARGET)/.VolumeIcon.icns /Volumes/$(OSX_DMG_TARGET)