*** SConstruct.orig	2007-01-18 02:13:21 +0500

--- SConstruct	2007-02-03 01:07:17 +0500

***************

*** 81,87 ****

                     DISTFILES = [ ],

                     DISTTREE  = '#ardour-' + ardour_version,

                     DISTCHECKDIR = '#ardour-' + ardour_version + '/check'

!                    )

  env.ENV_update(os.environ)

--- 81,89 ----

                     DISTFILES = [ ],

                     DISTTREE  = '#ardour-' + ardour_version,

                     DISTCHECKDIR = '#ardour-' + ardour_version + '/check'

! 		   )

! 

! env.Append(LINKFLAGS = ['-Wl,-rpath,@libdir@/ardour2'])

  env.ENV_update(os.environ)

***************

*** 452,457 ****

--- 454,468 ----

  #libraries['sndfile'] = LibraryInfo()

  #libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile')

+ libraries['alsa'] = LibraryInfo()

+ libraries['alsa'].ParseConfig('pkg-config --cflags --libs alsa')

+ 

+ libraries['gtk+-2.0'] = LibraryInfo()

+ libraries['gtk+-2.0'].ParseConfig('pkg-config --cflags --libs gtk+-2.0')

+ 

+ libraries['glib-2.0'] = LibraryInfo()

+ libraries['glib-2.0'].ParseConfig('pkg-config --cflags --libs glib-2.0')

+ 

  libraries['lrdf'] = LibraryInfo()

  libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf')

***************

*** 868,875 ****

      gtk_subdirs = [

  #        'libs/flowcanvas',

          'libs/gtkmm2ext',

!         'gtk2_ardour',

!         'libs/clearlooks'

          ]

  else:

--- 879,886 ----

      gtk_subdirs = [

  #        'libs/flowcanvas',

          'libs/gtkmm2ext',

!         'gtk2_ardour'

! #       'libs/clearlooks'

          ]

  else:

***************

*** 939,946 ****

  	'libs/libgnomecanvasmm',

  #	'libs/flowcanvas',

          'libs/gtkmm2ext',

!         'gtk2_ardour',

!         'libs/clearlooks'

          ]

  #

--- 950,957 ----

  	'libs/libgnomecanvasmm',

  #	'libs/flowcanvas',

          'libs/gtkmm2ext',

!         'gtk2_ardour'

! #       'libs/clearlooks'

          ]

  #

*** libs/midi++2/SConscript.orig	2007-01-04 00:34:58 +0500

--- libs/midi++2/SConscript	2007-02-02 16:50:39 +0500

***************

*** 7,13 ****

  Import('env libraries install_prefix')

  midi2 = env.Copy()

! midi2.Merge([ libraries['sigc2'], libraries['xml'], libraries['glib2'], libraries['pbd'] ])

  domain = 'midipp'

--- 7,13 ----

  Import('env libraries install_prefix')

  midi2 = env.Copy()

! midi2.Merge([ libraries['sigc2'], libraries['xml'], libraries['glib2'], libraries['pbd'], libraries['alsa'], libraries['sndfile-ardour'] ])

  domain = 'midipp'

*** libs/ardour/SConscript.orig	2007-02-03 12:37:35 +0500

--- libs/ardour/SConscript	2007-02-03 14:23:39 +0500

***************

*** 24,30 ****

  # explicitly reference the control protocol LGPL library for includes

  # 

! ardour.Append(CPPPATH = '#libs/surfaces/control_protocol')

  ardour_files=Split("""

  diskstream.cc

--- 24,30 ----

  # explicitly reference the control protocol LGPL library for includes

  # 

! #ardour.Append(LIBPATH='#libs/surfaces/control_protocol', CPPPATH = '#libs/surfaces/control_protocol')

  ardour_files=Split("""

  diskstream.cc

***************

*** 254,259 ****

--- 254,260 ----

  	     libraries['core'],

  	     libraries['xml'],

  	     libraries['sndfile-ardour'],

+ 	     libraries['ardour_cp'],

  	     libraries['raptor'],

  	     libraries['lrdf'],

  	     libraries['samplerate'],

*** libs/surfaces/control_protocol/SConscript.orig	2007-02-03 14:41:29 +0500

--- libs/surfaces/control_protocol/SConscript	2007-02-03 15:00:51 +0500

***************

*** 30,38 ****

  cp.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")

  cp.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")

  cp.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")

  cp.Merge ([

!     libraries['ardour'],

      libraries['sndfile-ardour'],

      libraries['sigc2'],

      libraries['pbd'],

--- 30,39 ----

  cp.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")

  cp.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")

  cp.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")

+ cp.Append(LIBPATH='#libs/ardour', CPPPATH='#libs/ardour')

  cp.Merge ([

! #   libraries['ardour'],

      libraries['sndfile-ardour'],

      libraries['sigc2'],

      libraries['pbd'],